diff --git a/templates/common/baremetal/files/baremetal-mdns-publisher.yaml b/templates/common/baremetal/files/baremetal-mdns-publisher.yaml
index 1c51fcca88..a3ec0eaa41 100644
--- a/templates/common/baremetal/files/baremetal-mdns-publisher.yaml
+++ b/templates/common/baremetal/files/baremetal-mdns-publisher.yaml
@@ -24,6 +24,21 @@ contents:
         hostPath:
           path: "/etc/mdns"
       initContainers:
+      - name: verify-hostname
+        image: {{ .Images.baremetalRuntimeCfgImage }}
+        env:
+          - name: DEFAULT_LOCAL_HOSTNAME
+            value: "localhost"
+        command:
+        - "/bin/bash"
+        - "-c"
+        - |
+          #/bin/bash
+          while [ "$(hostname)" == "$DEFAULT_LOCAL_HOSTNAME" ]
+          do
+            echo "hostname is still ${DEFAULT_LOCAL_HOSTNAME}"
+            sleep 10
+          done
       - name: render-config
         image: {{ .Images.baremetalRuntimeCfgImage }}
         command: