diff --git a/helm/idgenerator/templates/deployment.yaml b/helm/idgenerator/templates/deployment.yaml
index 067d30971a..d401ebf58e 100644
--- a/helm/idgenerator/templates/deployment.yaml
+++ b/helm/idgenerator/templates/deployment.yaml
@@ -95,8 +95,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- range .Values.extraEnvVars }}
-            {{- end }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
diff --git a/helm/notifier/templates/deployment.yaml b/helm/notifier/templates/deployment.yaml
index ea5c059f71..269fa8dbab 100644
--- a/helm/notifier/templates/deployment.yaml
+++ b/helm/notifier/templates/deployment.yaml
@@ -95,8 +95,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- range .Values.extraEnvVars }}
-            {{- end }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
diff --git a/helm/pridgenerator/templates/deployment.yaml b/helm/pridgenerator/templates/deployment.yaml
index 4d23478b1c..247cb3a05c 100644
--- a/helm/pridgenerator/templates/deployment.yaml
+++ b/helm/pridgenerator/templates/deployment.yaml
@@ -95,8 +95,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- range .Values.extraEnvVars }}
-            {{- end }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
diff --git a/helm/ridgenerator/templates/deployment.yaml b/helm/ridgenerator/templates/deployment.yaml
index 2c50b91312..ee7a966701 100644
--- a/helm/ridgenerator/templates/deployment.yaml
+++ b/helm/ridgenerator/templates/deployment.yaml
@@ -95,8 +95,7 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- range .Values.extraEnvVars }}
-            {{- end }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}