--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -56,9 +56,6 @@
 {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- if .Values.isClusterService }}
-        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
-        {{- end }}
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}
@@ -84,9 +81,15 @@
       topologySpreadConstraints:
 {{ toYaml .Values.topologySpreadConstraints | indent 8 }}
       {{- end }}
-      {{- if .Values.tolerations }}
+      {{- if or (.Values.isClusterService) (.Values.tolerations) }}
       tolerations:
+        {{- if .Values.isClusterService }}
+        - key: CriticalAddonsOnly
+          operator: Exists
+        {{- end }}
+        {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 8 }}
+        {{- end }}
       {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
@@ -98,7 +101,7 @@
       {{- end }}
       containers:
       - name: "coredns"
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts: