diff --git a/infrastructure/production/client_gateway.tf b/infrastructure/production/client_gateway.tf
index d8bd58623..35c1e83f1 100644
--- a/infrastructure/production/client_gateway.tf
+++ b/infrastructure/production/client_gateway.tf
@@ -22,5 +22,5 @@ module "client_gateway" {
   db_username           = data.terraform_remote_state.core_infrastructure.outputs.db_cluster.master_username
   db_host               = data.terraform_remote_state.core_infrastructure.outputs.db_cluster.endpoint
   db_port               = data.terraform_remote_state.core_infrastructure.outputs.db_cluster.port
-  services_function     = module.services.function
+  services_function     = module.services
 }
diff --git a/infrastructure/production/switch.tf b/infrastructure/production/switch.tf
index 8e40a5627..b6fe3e0b9 100644
--- a/infrastructure/production/switch.tf
+++ b/infrastructure/production/switch.tf
@@ -20,7 +20,7 @@ module "switch" {
   sip_alternative_port                               = var.sip_alternative_port
   freeswitch_event_socket_port                       = var.freeswitch_event_socket_port
   json_cdr_password_parameter                        = data.aws_ssm_parameter.somleng_services_password
-  services_function                                  = module.services.function
+  services_function                                  = module.services
   internal_route53_zone                              = data.terraform_remote_state.core_infrastructure.outputs.route53_zone_internal_somleng_org
   lb_rule_index                                      = 20
   app_image                                          = data.terraform_remote_state.core.outputs.switch_ecr_repository.repository_uri
@@ -28,11 +28,10 @@ module "switch" {
   freeswitch_image                                   = data.terraform_remote_state.core.outputs.freeswitch_ecr_repository.repository_uri
   freeswitch_event_logger_image                      = data.terraform_remote_state.core.outputs.freeswitch_event_logger_ecr_repository.repository_uri
   external_rtp_ip                                    = data.terraform_remote_state.core_infrastructure.outputs.hydrogen_region.vpc.nat_public_ips[0]
-  alternative_sip_outbound_ip                        = data.terraform_remote_state.core_infrastructure.outputs.nat_instance_ip
-  alternative_rtp_ip                                 = data.terraform_remote_state.core_infrastructure.outputs.nat_instance_ip
+  alternative_sip_outbound_ip                        = data.terraform_remote_state.core_infrastructure.outputs.hydrogen_region.nat_instance.public_ip
+  alternative_rtp_ip                                 = data.terraform_remote_state.core_infrastructure.outputs.hydrogen_region.nat_instance.public_ip
 }
 
-
 resource "aws_route53_record" "switch_legacy" {
   zone_id = data.terraform_remote_state.core_infrastructure.outputs.route53_zone_internal_somleng_org_old.zone_id
   name    = "switch"
diff --git a/infrastructure/staging/public_gateway.tf b/infrastructure/staging/public_gateway.tf
index 9db8b9752..6b304f5b3 100644
--- a/infrastructure/staging/public_gateway.tf
+++ b/infrastructure/staging/public_gateway.tf
@@ -11,7 +11,7 @@ module "public_gateway" {
 
   app_image       = data.terraform_remote_state.core.outputs.public_gateway_ecr_repository.repository_uri
   scheduler_image = data.terraform_remote_state.core.outputs.opensips_scheduler_ecr_repository.repository_uri
-  min_tasks       = 1
+  min_tasks       = 0
   max_tasks       = 2
 
   sip_port             = var.sip_port