diff --git a/src/codeflare_sdk/templates/new-template.yaml b/src/codeflare_sdk/templates/new-template.yaml
index d8e923dc9..585f05baa 100644
--- a/src/codeflare_sdk/templates/new-template.yaml
+++ b/src/codeflare_sdk/templates/new-template.yaml
@@ -114,7 +114,12 @@ spec:
                           - "aw-kuberay"
                 containers:
                 # The Ray head pod
-                - name: ray-head
+                - env:
+                  - name: MY_POD_IP
+                    valueFrom:
+                      fieldRef:
+                        fieldPath: status.podIP
+                  name: ray-head
                   image: rayproject/ray:latest
                   imagePullPolicy: Always
                   ports:
diff --git a/tests/test-case-cmd.yaml b/tests/test-case-cmd.yaml
index 6782c50f5..4e5d72534 100644
--- a/tests/test-case-cmd.yaml
+++ b/tests/test-case-cmd.yaml
@@ -57,7 +57,12 @@ spec:
             template:
               spec:
                 containers:
-                - image: rayproject/ray:latest
+                - env:
+                  - name: MY_POD_IP
+                    valueFrom:
+                      fieldRef:
+                        fieldPath: status.podIP
+                  image: rayproject/ray:latest
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
index bdaf1b722..2aebb0007 100644
--- a/tests/test-case.yaml
+++ b/tests/test-case.yaml
@@ -68,7 +68,12 @@ spec:
                           values:
                           - unit-test-cluster
                 containers:
-                - image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
+                - env:
+                  - name: MY_POD_IP
+                    valueFrom:
+                      fieldRef:
+                        fieldPath: status.podIP
+                  image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
                   imagePullPolicy: Always
                   lifecycle:
                     preStop: