diff --git a/environment-provisioner/workflow-template.yaml b/environment-provisioner/workflow-template.yaml
index 39f9dd5..5e405fd 100644
--- a/environment-provisioner/workflow-template.yaml
+++ b/environment-provisioner/workflow-template.yaml
@@ -831,13 +831,16 @@ spec:
         NODE_IPS=$(kubectl get nodes -o jsonpath='{.items[*].status.addresses[?(@.type=="InternalIP")].address}' 2>/dev/null || echo "")
         echo "Node IPs: $NODE_IPS"
 
-        # 3. Get pod network CIDR gateway
-        POD_CIDR=$(kubectl get nodes -o jsonpath='{.items[0].spec.podCIDR}' 2>/dev/null || echo "")
-        if [ -n "$POD_CIDR" ]; then
-          GATEWAY_IP=$(echo "$POD_CIDR" | sed 's/\.[0-9]*\/.*/.1/')
-          COMMON_BRIDGE_IPS="$COMMON_BRIDGE_IPS $GATEWAY_IP"
-          echo "Pod CIDR gateway: $GATEWAY_IP"
-        fi
+        # 3. Get pod network CIDR gateways from ALL nodes
+        echo "Collecting pod CIDR gateways from all nodes..."
+        POD_CIDRS=$(kubectl get nodes -o jsonpath='{.items[*].spec.podCIDR}' 2>/dev/null || echo "")
+        for cidr in $POD_CIDRS; do
+          if [ -n "$cidr" ]; then
+            GATEWAY_IP=$(echo "$cidr" | sed 's/\.[0-9]*\/.*/.1/')
+            COMMON_BRIDGE_IPS="$COMMON_BRIDGE_IPS $GATEWAY_IP"
+            echo "  Pod CIDR gateway: $GATEWAY_IP (from $cidr)"
+          fi
+        done
 
         # Combine all IPs to register
         ALL_IPS="$COMMON_BRIDGE_IPS $NODE_IPS"