diff --git a/kubernetes/Templates/QEMU-build-job.yaml b/kubernetes/Templates/QEMU-build-job.yaml
index 04a8c4e..1fe635f 100644
--- a/kubernetes/Templates/QEMU-build-job.yaml
+++ b/kubernetes/Templates/QEMU-build-job.yaml
@@ -9,33 +9,33 @@
 spec:
   template:
     metadata:
-      name: ${podname}
+      name: ${pod_name}
     spec:
       nodeSelector:
         beta.kubernetes.io/arch: ${ARCH}
       volumes:
       - name: workspace
         persistentVolumeClaim:
-          claimName: ${wclaim}
-      - name: qemudir
+          claimName: ${w_claim}
+      - name: qemu-dir
         persistentVolumeClaim:
-          claimName: ${qclaim}
+          claimName: ${q_claim}
       restartPolicy: Never
       hostNetwork: True
       containers:
-      - image: ${imgname}
+      - image: ${img_name}
         name: builder
         command: [\"${WORKSPACE}/build.sh\"]
         workingDir: ${HOME}
         env:
         - name: WORKSPACE
           value: ${WORKSPACE}
-        - name: qemudir
-          value: ${qemudir}
+        - name: qemu-dir
+          value: ${qemu_dir}
         volumeMounts:
         - name: workspace
           mountPath: ${HOME}/workspace
-        - name: qemudir
-          mountPath: ${qemudir}
+        - name: qemu-dir
+          mountPath: ${qemu_dir}
       imagePullSecrets:
-      - name: ${imgplsec}
+      - name: ${img_pl_sec}