diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/templates/deployment.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/templates/deployment.yaml
index ba1b6a9d..042976d2 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/templates/deployment.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/templates/deployment.yaml
@@ -26,8 +26,8 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.secretOperator.image.repository }}:{{ .Values.secretOperator.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.secretOperator.image.pullPolicy }}
           ports:
             - name: api
               containerPort: {{ .Values.operator.apiServerPort }}
diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
index 5b662014..b75b4399 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
@@ -1,10 +1,13 @@
 # Default values for freeleaps-secret-operator
 replicaCount: 1
 
-image:
-  repository: freeleaps/secret-operator
-  pullPolicy: IfNotPresent
-  tag: "latest"
+secretOperator:
+  image:
+    registry: docker.io
+    repository: freeleaps/secret-operator
+    pullPolicy: IfNotPresent
+    tag: "latest"
+    name: "secret-operator"
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
index 26db820b..2a9c4498 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
@@ -1,10 +1,13 @@
 # Default values for freeleaps-secret-operator
 replicaCount: 1
 
-image:
-  repository: freeleaps/secret-operator
-  pullPolicy: IfNotPresent
-  tag: "latest"
+secretOperator:
+  image:
+    registry: docker.io
+    repository: freeleaps/secret-operator
+    pullPolicy: IfNotPresent
+    tag: "latest"
+    name: "secret-operator"
 
 imagePullSecrets: []
 nameOverride: ""