--- charts-original/templates/webhook-configs-pre-delete.yaml
+++ charts/templates/webhook-configs-pre-delete.yaml
@@ -35,7 +35,7 @@
       serviceAccount: gatekeeper-delete-webhook-configs
       containers:
         - name: kubectl-delete
-          image: "{{ .Values.preUninstall.deleteWebhookConfigurations.image.repository }}:{{ .Values.preUninstall.deleteWebhookConfigurations.image.tag }}"
+          image: '{{ template "system_default_registry" . }}{{ .Values.preUninstall.deleteWebhookConfigurations.image.repository }}:{{ .Values.preUninstall.deleteWebhookConfigurations.image.tag }}'
           imagePullPolicy: {{ .Values.preUninstall.deleteWebhookConfigurations.image.pullPolicy }}
           args:
             - delete
@@ -46,7 +46,7 @@
             - mutatingwebhookconfiguration/{{ .Values.mutatingWebhookName }}
             {{- end }}
           resources:
-            {{- toYaml .Values.preUninstall.resources | nindent 10 }}
+            {{- toYaml .Values.preUninstall.resources | nindent 12 }}
           securityContext:
             {{- if .Values.enableRuntimeDefaultSeccompProfile }}
             seccompProfile:
@@ -54,12 +54,16 @@
             {{- end }}
             {{- toYaml .Values.preUninstall.securityContext | nindent 10 }}
       {{- with .Values.preUninstall }}
-      nodeSelector:
-        {{- toYaml .nodeSelector | nindent 8 }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .nodeSelector }}
+{{ toYaml .nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .tolerations }}
+{{ toYaml .tolerations | indent 8 }}
+{{- end }}
       affinity:
         {{- toYaml .affinity | nindent 8 }}
-      tolerations:
-        {{- toYaml .tolerations | nindent 8 }}
       {{- end }}
 ---
 apiVersion: v1