diff --git a/iac/provider-gcp/nomad-cluster/network/main.tf b/iac/provider-gcp/nomad-cluster/network/main.tf
index ea46f7b29e..dbe6278068 100644
--- a/iac/provider-gcp/nomad-cluster/network/main.tf
+++ b/iac/provider-gcp/nomad-cluster/network/main.tf
@@ -64,7 +64,11 @@ locals {
         request_path = var.docker_reverse_proxy_port.health_path
         port         = var.docker_reverse_proxy_port.port
       }
-      groups = [{ group = var.build_instance_group }]
+      # TODO: (2025-10-01) - this should be only api instance group, but keeping this here for a migration period (at least until 2025-10-15)
+      groups = [
+        { group = var.api_instance_group },
+        { group = var.build_instance_group },
+      ]
     }
     nomad = {
       protocol                        = "HTTP"
diff --git a/iac/provider-gcp/nomad-cluster/nodepool-api.tf b/iac/provider-gcp/nomad-cluster/nodepool-api.tf
index a8e24ac9e1..40873d6539 100644
--- a/iac/provider-gcp/nomad-cluster/nodepool-api.tf
+++ b/iac/provider-gcp/nomad-cluster/nodepool-api.tf
@@ -66,6 +66,11 @@ resource "google_compute_instance_group_manager" "api_pool" {
     port = var.api_port.port
   }
 
+  named_port {
+    name = var.docker_reverse_proxy_port.name
+    port = var.docker_reverse_proxy_port.port
+  }
+
   dynamic "named_port" {
     for_each = local.api_additional_ports
     content {
diff --git a/iac/provider-gcp/nomad-cluster/nodepool-build.tf b/iac/provider-gcp/nomad-cluster/nodepool-build.tf
index efe3f1b5a0..aea195d7f0 100644
--- a/iac/provider-gcp/nomad-cluster/nodepool-build.tf
+++ b/iac/provider-gcp/nomad-cluster/nodepool-build.tf
@@ -50,6 +50,7 @@ resource "google_compute_instance_group_manager" "build_pool" {
     instance_template = google_compute_instance_template.build.id
   }
 
+  # TODO: (2025-10-01) - keep this here for a migration period (at least until 2025-10-15)
   named_port {
     name = var.docker_reverse_proxy_port.name
     port = var.docker_reverse_proxy_port.port