diff --git a/helm/admin-hotlist/templates/deployment.yaml b/helm/admin-hotlist/templates/deployment.yaml
index ee278401891..6ebe063b496 100644
--- a/helm/admin-hotlist/templates/deployment.yaml
+++ b/helm/admin-hotlist/templates/deployment.yaml
@@ -94,7 +94,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -104,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/admin-hotlist/values.yaml b/helm/admin-hotlist/values.yaml
index 2fecbb29760..e7bb46d4f91 100644
--- a/helm/admin-hotlist/values.yaml
+++ b/helm/admin-hotlist/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/admin-service/templates/deployment.yaml b/helm/admin-service/templates/deployment.yaml
index 8477d8fd1bd..084e0aec844 100644
--- a/helm/admin-service/templates/deployment.yaml
+++ b/helm/admin-service/templates/deployment.yaml
@@ -94,7 +94,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -104,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/admin-service/values.yaml b/helm/admin-service/values.yaml
index 844f3b8ef7b..2aaedca23de 100644
--- a/helm/admin-service/values.yaml
+++ b/helm/admin-service/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/masterdata/templates/deployment.yaml b/helm/masterdata/templates/deployment.yaml
index 4e79ff24cd2..69ec8c4b419 100644
--- a/helm/masterdata/templates/deployment.yaml
+++ b/helm/masterdata/templates/deployment.yaml
@@ -95,7 +95,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -105,8 +106,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/masterdata/values.yaml b/helm/masterdata/values.yaml
index a50095e4b0a..a47266a0efd 100644
--- a/helm/masterdata/values.yaml
+++ b/helm/masterdata/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##
diff --git a/helm/syncdata/templates/deployment.yaml b/helm/syncdata/templates/deployment.yaml
index 81d572d67d2..a0c6a95ab26 100644
--- a/helm/syncdata/templates/deployment.yaml
+++ b/helm/syncdata/templates/deployment.yaml
@@ -95,7 +95,8 @@ spec:
             - name: JDK_JAVA_OPTIONS
               value: {{ .Values.additionalResources.javaOpts }}
             {{- if .Values.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- range .Values.extraEnvVars }}
+            {{- end }}
             {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
@@ -105,8 +106,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/syncdata/values.yaml b/helm/syncdata/values.yaml
index fae5461fd55..56579221b9f 100644
--- a/helm/syncdata/values.yaml
+++ b/helm/syncdata/values.yaml
@@ -251,7 +251,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##