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