--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -39,7 +39,7 @@
       - name: kubed
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
-        image: {{ .Values.operator.registry }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag }}
+        image: {{ template "registry-url" . }}{{ .Values.operator.repository }}:{{ .Values.operator.tag }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         args:
         - run
@@ -99,24 +99,21 @@
           secretName: {{ template "kubed.fullname" . }}-apiserver-cert
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if or .Values.tolerations $criticalAddon }}
       tolerations:
-      {{- with .Values.tolerations }}
+        {{- include "linux-node-tolerations" . | nindent 8 }}
+        {{- with .Values.tolerations }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if $criticalAddon }}
+        {{- end }}
+        {{- if $criticalAddon }}
         - key: CriticalAddonsOnly
           operator: Exists
-      {{- end -}}
-    {{- end -}}
+        {{- end -}}
     {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- with .Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
+        {{- include "linux-node-selector" . | nindent 8 }}
     {{- if $criticalAddon }}
       priorityClassName: system-cluster-critical
     {{- end -}}