diff --git a/deployment/helm/templates/onvif-configuration.yaml b/deployment/helm/templates/onvif-configuration.yaml
index 27d7c74a5..a46d4c888 100644
--- a/deployment/helm/templates/onvif-configuration.yaml
+++ b/deployment/helm/templates/onvif-configuration.yaml
@@ -139,12 +139,12 @@ spec:
         spec:
           containers:
           - name: {{ .Values.onvif.configuration.name }}-broker
-            image: {{ printf "%s:%s" .Values.onvif.configuration.brokerJob.image.repository .Values.onvif.configuration.brokerPod.image.tag | quote }}
+            image: {{ printf "%s:%s" .Values.onvif.configuration.brokerJob.image.repository .Values.onvif.configuration.brokerJob.image.tag | quote }}
             {{- if .Values.onvif.configuration.brokerJob.command }}
             command: 
               {{- toYaml .Values.onvif.configuration.brokerJob.command | nindent 14 }}
             {{- end }}
-            {{- with .Values.onvif.configuration.pullPolicy }}
+            {{- with .Values.onvif.configuration.brokerJob.image.pullPolicy }}
             imagePullPolicy: {{ . }}
             {{- end }}
             {{- if .Values.onvif.configuration.brokerJob.env }}
diff --git a/deployment/helm/templates/opcua-configuration.yaml b/deployment/helm/templates/opcua-configuration.yaml
index 150dd7e49..465d42bba 100644
--- a/deployment/helm/templates/opcua-configuration.yaml
+++ b/deployment/helm/templates/opcua-configuration.yaml
@@ -106,12 +106,12 @@ spec:
         spec:
           containers:
           - name: {{ .Values.opcua.configuration.name }}-broker
-            image: {{ printf "%s:%s" .Values.opcua.configuration.brokerJob.image.repository .Values.opcua.configuration.brokerPod.image.tag | quote }}
+            image: {{ printf "%s:%s" .Values.opcua.configuration.brokerJob.image.repository .Values.opcua.configuration.brokerJob.image.tag | quote }}
             {{- if .Values.opcua.configuration.brokerJob.command }}
             command: 
               {{- toYaml .Values.opcua.configuration.brokerJob.command | nindent 14 }}
             {{- end }}
-            {{- with .Values.opcua.configuration.pullPolicy }}
+            {{- with .Values.opcua.configuration.brokerJob.image.pullPolicy }}
             imagePullPolicy: {{ . }}
             {{- end }}
             {{- if .Values.opcua.configuration.brokerJob.env }}
diff --git a/deployment/helm/templates/udev-configuration.yaml b/deployment/helm/templates/udev-configuration.yaml
index e059ee038..aecb505fb 100644
--- a/deployment/helm/templates/udev-configuration.yaml
+++ b/deployment/helm/templates/udev-configuration.yaml
@@ -72,12 +72,12 @@ spec:
         spec:
           containers:
           - name: {{ .Values.udev.configuration.name }}-broker
-            image: {{ printf "%s:%s" .Values.udev.configuration.brokerJob.image.repository .Values.udev.configuration.brokerPod.image.tag | quote }}
+            image: {{ printf "%s:%s" .Values.udev.configuration.brokerJob.image.repository .Values.udev.configuration.brokerJob.image.tag | quote }}
             {{- if .Values.udev.configuration.brokerJob.command }}
             command: 
               {{- toYaml .Values.udev.configuration.brokerJob.command | nindent 14 }}
             {{- end }}
-            {{- with .Values.udev.configuration.pullPolicy }}
+            {{- with .Values.udev.configuration.brokerJob.image.pullPolicy }}
             imagePullPolicy: {{ . }}
             {{- end }}
             resources: