diff --git a/kubernetes/Templates/OpenBMC-build-pod-v2.yaml b/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
index 75adac8..11c4419 100644
--- a/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
+++ b/kubernetes/Templates/OpenBMC-build-pod-v2.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: ${podname}
+  name: ${pod_name}
   namespace: ${namespace}
 spec:
   nodeSelector:
@@ -9,13 +9,13 @@
   volumes:
   - name: workspace
     persistentVolumeClaim:
-      claimName: ${wclaim}
-  - name: sscdir
+      claimName: ${w_claim}
+  - name: ssc-dir
     persistentVolumeClaim:
-      claimName: ${sclaim}
+      claimName: ${s_claim}
   hostNetwork: True
   containers:
-  - image: ${imgname}
+  - image: ${img_name}
     name: builder
     command: ["/bin/bash","-c"]
     args: ["sleep 2h"]
@@ -23,8 +23,8 @@
     env:
     - name: WORKSPACE
       value: ${WORKSPACE}
-    - name: builddir
-      value: ${builddir}
+    - name: build-dir
+      value: ${build_dir}
     securityContext:
       capabilities:
         add:
@@ -32,8 +32,8 @@
     volumeMounts:
     - name: workspace
       mountPath: ${HOME}/workspace
-    - name: sscdir
-      mountPath: ${sscdir}
+    - name: ssc-dir
+      mountPath: ${ssc_dir}
   restartPolicy: Never
   imagePullSecrets:
-  - name: ${imgplsec}
+  - name: ${img_pl_sec}