--- charts-original/templates/namespace-post-upgrade.yaml
+++ charts/templates/namespace-post-upgrade.yaml
@@ -32,7 +32,7 @@
       serviceAccount: gatekeeper-update-namespace-label-post-upgrade
       containers:
         - name: kubectl-label
-          image: "{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}"
+          image: '{{ template "system_default_registry" . }}{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}'
           imagePullPolicy: {{ .Values.postUpgrade.labelNamespace.image.pullPolicy }}
           args:
             - label
@@ -51,12 +51,10 @@
           securityContext:
             {{- toYaml .Values.postUpgrade.securityContext | nindent 12 }}
       {{- with .Values.postUpgrade }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
       affinity:
         {{- toYaml .affinity | nindent 8 }}
-      tolerations:
-        {{- toYaml .tolerations | nindent 8 }}
-      nodeSelector:
-        {{- toYaml .nodeSelector | nindent 8 }}
       {{- end }}
 ---
 apiVersion: v1