--- charts-original/templates/cilium-operator/deployment.yaml
+++ charts/templates/cilium-operator/deployment.yaml
@@ -1,4 +1,11 @@
 {{- if .Values.operator.enabled }}
+{{- if empty .Values.global.clusterCIDRv4 }}
+{{- $_ := set .Values.ipv4 "enabled" false -}}
+{{- end }}
+
+{{- if not (empty .Values.global.clusterCIDRv6) }}
+{{- $_ := set .Values.ipv6 "enabled" true -}}
+{{- end }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -55,7 +62,7 @@
       {{- end }}
       containers:
       - name: cilium-operator
-        image: {{ include "cilium.operator.image" . | quote }}
+        image: "{{ template "system_default_registry" . }}{{ include "cilium.operator.image" . }}"
         imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
         command:
         - cilium-operator-{{ include "cilium.operator.cloud" . }}