diff --git a/infrastructure/terraform/lambda/fast-api/main.tf b/infrastructure/terraform/lambda/fast-api/main.tf
index c87897c7..d9377b79 100644
--- a/infrastructure/terraform/lambda/fast-api/main.tf
+++ b/infrastructure/terraform/lambda/fast-api/main.tf
@@ -39,14 +39,13 @@ locals {
   db_credentials = jsondecode(data.aws_secretsmanager_secret_version.db_credentials.secret_string)
 }
 
+# data "aws_ssm_parameter" "certificate_arn" {
+#   name = "/ssl_certificate_arn"
+# }
 
-data "aws_ssm_parameter" "certificate_arn" {
-  name = "/ssl_certificate_arn"
-}
-
-data "aws_route53_zone" "this" {
-  name = var.domain_name
-}
+# data "aws_route53_zone" "this" {
+#   name = var.domain_name
+# }
 
 ############################################
 # Install Python requirements
@@ -84,9 +83,9 @@ module "fastapi" {
   timeout     = 600
   memory_size = 512
 
-  domain_name     = "api.${var.domain_name}"
-  certificate_arn = data.aws_ssm_parameter.certificate_arn.value
-  route53_zone_id = data.aws_route53_zone.this.zone_id
+  # domain_name     = "api.${var.domain_name}"
+  # certificate_arn = data.aws_ssm_parameter.certificate_arn.value
+  # route53_zone_id = data.aws_route53_zone.this.zone_id
 
   environment = {
     ENVIRONMENT    = var.stage
diff --git a/infrastructure/terraform/modules/lambda_with_api_gateway/main.tf b/infrastructure/terraform/modules/lambda_with_api_gateway/main.tf
index 23ccc4b1..61e24c32 100644
--- a/infrastructure/terraform/modules/lambda_with_api_gateway/main.tf
+++ b/infrastructure/terraform/modules/lambda_with_api_gateway/main.tf
@@ -71,33 +71,33 @@ resource "aws_lambda_permission" "apigw_invoke" {
 ############################################
 # Custom domain
 ############################################
-resource "aws_apigatewayv2_domain_name" "this" {
-  count       = var.domain_name != null ? 1 : 0
-  domain_name = var.domain_name
+# resource "aws_apigatewayv2_domain_name" "this" {
+#   count       = var.domain_name != null ? 1 : 0
+#   domain_name = var.domain_name
 
-  domain_name_configuration {
-    certificate_arn = var.certificate_arn
-    endpoint_type   = "REGIONAL"
-    security_policy = "TLS_1_2"
-  }
-}
+#   domain_name_configuration {
+#     certificate_arn = var.certificate_arn
+#     endpoint_type   = "REGIONAL"
+#     security_policy = "TLS_1_2"
+#   }
+# }
 
-resource "aws_apigatewayv2_api_mapping" "this" {
-  count       = var.domain_name != null ? 1 : 0
-  api_id      = aws_apigatewayv2_api.this.id
-  domain_name = aws_apigatewayv2_domain_name.this[0].id
-  stage       = aws_apigatewayv2_stage.this.id
-}
+# resource "aws_apigatewayv2_api_mapping" "this" {
+#   count       = var.domain_name != null ? 1 : 0
+#   api_id      = aws_apigatewayv2_api.this.id
+#   domain_name = aws_apigatewayv2_domain_name.this[0].id
+#   stage       = aws_apigatewayv2_stage.this.id
+# }
 
-resource "aws_route53_record" "this" {
-  count   = var.domain_name != null ? 1 : 0
-  name    = aws_apigatewayv2_domain_name.this[0].domain_name
-  type    = "A"
-  zone_id = var.route53_zone_id
+# resource "aws_route53_record" "this" {
+#   count   = var.domain_name != null ? 1 : 0
+#   name    = aws_apigatewayv2_domain_name.this[0].domain_name
+#   type    = "A"
+#   zone_id = var.route53_zone_id
 
-  alias {
-    name                   = aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].target_domain_name
-    zone_id                = aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].hosted_zone_id
-    evaluate_target_health = false
-  }
-}
\ No newline at end of file
+#   alias {
+#     name                   = aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].target_domain_name
+#     zone_id                = aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].hosted_zone_id
+#     evaluate_target_health = false
+#   }
+# }
\ No newline at end of file