diff --git a/helm/idgenerator/templates/deployment.yaml b/helm/idgenerator/templates/deployment.yaml
index fae49142bdb..d401ebf58e7 100644
--- a/helm/idgenerator/templates/deployment.yaml
+++ b/helm/idgenerator/templates/deployment.yaml
@@ -105,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service
diff --git a/helm/idgenerator/values.yaml b/helm/idgenerator/values.yaml
index 4d2acfd6e3c..876a881331a 100644
--- a/helm/idgenerator/values.yaml
+++ b/helm/idgenerator/values.yaml
@@ -253,7 +253,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/notifier/templates/deployment.yaml b/helm/notifier/templates/deployment.yaml
index 826587135c8..269fa8dbaba 100644
--- a/helm/notifier/templates/deployment.yaml
+++ b/helm/notifier/templates/deployment.yaml
@@ -105,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service
diff --git a/helm/notifier/values.yaml b/helm/notifier/values.yaml
index 47f84d928db..cacf5d41b87 100644
--- a/helm/notifier/values.yaml
+++ b/helm/notifier/values.yaml
@@ -252,7 +252,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/pridgenerator/templates/deployment.yaml b/helm/pridgenerator/templates/deployment.yaml
index 29929e31fce..247cb3a05c3 100644
--- a/helm/pridgenerator/templates/deployment.yaml
+++ b/helm/pridgenerator/templates/deployment.yaml
@@ -105,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service
diff --git a/helm/pridgenerator/values.yaml b/helm/pridgenerator/values.yaml
index 41e78974b2c..a64fe2fa028 100644
--- a/helm/pridgenerator/values.yaml
+++ b/helm/pridgenerator/values.yaml
@@ -252,7 +252,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/ridgenerator/templates/deployment.yaml b/helm/ridgenerator/templates/deployment.yaml
index 7d29298dcc8..ee7a9667014 100644
--- a/helm/ridgenerator/templates/deployment.yaml
+++ b/helm/ridgenerator/templates/deployment.yaml
@@ -105,8 +105,10 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.extraEnvVarsSecret }}
+            {{- range .Values.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
+                name: {{ . }}
+            {{- end }}
             {{- end }}
           ports:
             - name: spring-service
diff --git a/helm/ridgenerator/values.yaml b/helm/ridgenerator/values.yaml
index 85b5f52aa29..8e1cfaab0d8 100644
--- a/helm/ridgenerator/values.yaml
+++ b/helm/ridgenerator/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##