diff --git a/kubernetes/Templates/OpenBMC-build-job-v2.yaml b/kubernetes/Templates/OpenBMC-build-job-v2.yaml
index f379bff..a6719c7 100644
--- a/kubernetes/Templates/OpenBMC-build-job-v2.yaml
+++ b/kubernetes/Templates/OpenBMC-build-job-v2.yaml
@@ -9,7 +9,7 @@
 spec:
   template:
     metadata:
-      name: ${podname}
+      name: ${pod_name}
       labels:
         target: ${target}
     spec:
@@ -18,14 +18,14 @@
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
-      - name: sscdir
+          claimName: ${w_claim}
+      - name: ssc-dir
         persistentVolumeClaim:
-          claimName: ${sclaim}
+          claimName: ${s_claim}
       restartPolicy: Never
       hostNetwork: True
       containers:
-      - image: ${imgname}
+      - image: ${img_name}
         name: builder
         command: ["/bin/bash","-c"]
         args: ["sleep 2h"]
@@ -33,8 +33,8 @@
         env:
         - name: WORKSPACE
           value: ${WORKSPACE}
-        - name: builddir
-          value: ${builddir}
+        - name: build-dir
+          value: ${build_dir}
         securityContext:
           capabilities:
             add:
@@ -42,7 +42,7 @@
         volumeMounts:
         - name: workspace
           mountPath: ${HOME}/workspace
-        - name: sscdir
-          mountPath: ${sscdir}
+        - name: ssc-dir
+          mountPath: ${ssc_dir}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}