--- charts-original/templates/gatekeeper-audit-deployment.yaml
+++ charts/templates/gatekeeper-audit-deployment.yaml
@@ -42,11 +42,7 @@
         {{- toYaml .Values.audit.affinity | nindent 8 }}
       automountServiceAccountToken: true
       containers:
-      - {{- if .Values.image.release }}
-        image: {{ .Values.image.repository }}:{{ .Values.image.release }}
-        {{- else }}
-        image: {{ .Values.image.repository }}
-        {{- end }}
+      - image: '{{ template "system_default_registry" . }}{{ .Values.images.gatekeeper.repository }}:{{ .Values.images.gatekeeper.tag }}'
         args:
         - --audit-interval={{ .Values.auditInterval }}
         - --log-level={{ .Values.logLevel }}
@@ -87,7 +83,7 @@
               fieldPath: metadata.namespace
         - name: CONTAINER_NAME
           value: manager
-        imagePullPolicy: '{{ .Values.image.pullPolicy }}'
+        imagePullPolicy: '{{ .Values.images.pullPolicy }}'
         livenessProbe:
           httpGet:
             path: /healthz
@@ -123,9 +119,11 @@
       dnsPolicy: {{ .Values.audit.dnsPolicy }}
       hostNetwork: {{ .Values.audit.hostNetwork }}
       imagePullSecrets:
-        {{- toYaml .Values.image.pullSecrets | nindent 8 }}
-      nodeSelector:
-        {{- toYaml .Values.audit.nodeSelector | nindent 8 }}
+        {{- toYaml .Values.images.pullSecrets | nindent 8 }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .Values.audit.nodeSelector }}
+{{ toYaml .Values.audit.nodeSelector | indent 8 }}
+{{- end }}
       {{- if .Values.audit.priorityClassName }}
       priorityClassName:  {{ .Values.audit.priorityClassName }}
       {{- end }}
@@ -133,8 +131,10 @@
         {{- toYaml .Values.audit.podSecurityContext | nindent 8 }}
       serviceAccountName: gatekeeper-admin
       terminationGracePeriodSeconds: 60
-      tolerations:
-        {{- toYaml .Values.audit.tolerations | nindent 8 }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.audit.tolerations }}
+{{ toYaml .Values.audit.tolerations | indent 8 }}
+{{- end }}
       volumes:
       - name: cert
         secret: