diff --git a/kubernetes/Templates/OpenBMC-build-pod.yaml b/kubernetes/Templates/OpenBMC-build-pod.yaml
index 135547c..9df4488 100644
--- a/kubernetes/Templates/OpenBMC-build-pod.yaml
+++ b/kubernetes/Templates/OpenBMC-build-pod.yaml
@@ -5,8 +5,7 @@
   namespace: ${namespace}
 spec:
   nodeSelector:
-    worker: \"true\"
-    arch: ${ARCH}
+    beta.kubernetes.io/arch: ${ARCH}
   volumes:
   - name: home
     persistentVolumeClaim:
@@ -14,9 +13,6 @@
   - name: sscdir
     persistentVolumeClaim:
       claimName: ${sclaim}
-  - name: obmccache
-    persistentVolumeClaim:
-      claimName: ${oclaim}
   hostNetwork: True
   containers:
   - image: ${imgname}
@@ -37,7 +33,6 @@
       mountPath: ${HOME}
     - name: sscdir
       mountPath: ${sscdir}
-    - name: obmccache
-      mountPath: ${obmcext}
+  restartPolicy: Never
   imagePullSecrets:
   - name: ${imgplsec}