--- charts-original/templates/deployment-autoscaler.yaml
+++ charts/templates/deployment-autoscaler.yaml
@@ -10,7 +10,7 @@
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- if .Values.isClusterService }}
-    k8s-app: {{ .Chart.Name }}-autoscaler
+    k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "CoreDNS"
     {{- end }}
@@ -23,14 +23,14 @@
     matchLabels:
       app.kubernetes.io/instance: {{ .Release.Name | quote }}
       {{- if .Values.isClusterService }}
-      k8s-app: {{ .Chart.Name }}-autoscaler
+      k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
       {{- end }}
       app.kubernetes.io/name: {{ template "coredns.name" . }}-autoscaler
   template:
     metadata:
       labels:
         {{- if .Values.isClusterService }}
-        k8s-app: {{ .Chart.Name }}-autoscaler
+        k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
         {{- end }}
         app.kubernetes.io/name: {{ template "coredns.name" . }}-autoscaler
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
@@ -63,7 +63,7 @@
       {{- end }}
       containers:
       - name: autoscaler
-        image: "{{ .Values.autoscaler.image.repository }}:{{ .Values.autoscaler.image.tag }}"
+        image:  {{ template "system_default_registry" . }}{{ .Values.autoscaler.image.repository }}:{{ .Values.autoscaler.image.tag }}
         imagePullPolicy: {{ .Values.autoscaler.image.pullPolicy }}
         resources:
 {{ toYaml .Values.autoscaler.resources | indent 10 }}