--- charts-original/templates/upgrade-crds-hook.yaml
+++ charts/templates/upgrade-crds-hook.yaml
@@ -87,26 +87,14 @@
     spec:
       serviceAccountName: gatekeeper-admin-upgrade-crds
       restartPolicy: Never
-      {{- if .Values.image.pullSecrets }}
+      {{- if .Values.images.pullSecrets }}
       imagePullSecrets:
-        {{- toYaml .Values.image.pullSecrets | nindent 8 }}
+        {{- toYaml .Values.images.pullSecrets | nindent 8 }}
       {{- end }}
       containers:
       - name: crds-upgrade
-        {{- if .Values.preInstall.crdRepository.image.repository }}
-          {{- if not .Values.preInstall.crdRepository.image.tag }}
-        image: '{{ .Values.preInstall.crdRepository.image.repository }}'
-          {{- else }}
-        image: '{{ .Values.preInstall.crdRepository.image.repository }}:{{ .Values.preInstall.crdRepository.image.tag }}'
-          {{- end }}
-        {{- else }}
-          {{- if not .Values.image.release }}
-        image: '{{ .Values.image.crdRepository }}'
-          {{- else }}
-        image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}'
-          {{- end }}
-        {{- end }}
-        imagePullPolicy: '{{ .Values.image.pullPolicy }}'
+        image: '{{ template "system_default_registry" . }}{{ .Values.images.gatekeepercrd.repository }}:{{ .Values.images.gatekeepercrd.tag }}'
+        imagePullPolicy: '{{ .Values.images.pullPolicy }}'
         args:
         - apply
         - -f
@@ -120,11 +108,9 @@
           {{- end }}
           {{- toYaml .Values.crds.securityContext | nindent 10 }}
       {{- with .Values.crds }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
       affinity:
         {{- toYaml .affinity | nindent 8 }}
-      tolerations:
-        {{- toYaml .tolerations | nindent 8 }}
-      nodeSelector:
-        {{- toYaml .nodeSelector | nindent 8 }}
       {{- end }}
 {{- end }}