diff --git a/infrastructure/modules/public_gateway/ecs.tf b/infrastructure/modules/public_gateway/ecs.tf
index 52d72d7e9..33a51b770 100644
--- a/infrastructure/modules/public_gateway/ecs.tf
+++ b/infrastructure/modules/public_gateway/ecs.tf
@@ -159,6 +159,11 @@ resource "aws_ecs_service" "public_gateway" {
     weight            = 1
   }
 
+  deployment_circuit_breaker {
+    enable   = true
+    rollback = true
+  }
+
   depends_on = [
     aws_iam_role.task_role
   ]
diff --git a/infrastructure/staging/public_gateway.tf b/infrastructure/staging/public_gateway.tf
index 6b304f5b3..9db8b9752 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       = 0
+  min_tasks       = 1
   max_tasks       = 2
 
   sip_port             = var.sip_port
diff --git a/infrastructure/staging/switch.tf b/infrastructure/staging/switch.tf
index bf751207c..4c2e2bd79 100644
--- a/infrastructure/staging/switch.tf
+++ b/infrastructure/staging/switch.tf
@@ -29,8 +29,8 @@ 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
 }
 
 module "switch_helium" {