diff --git a/helm/ida-auth/templates/deployment.yaml b/helm/ida-auth/templates/deployment.yaml
index dd244d5fdc1..78b4f09d501 100644
--- a/helm/ida-auth/templates/deployment.yaml
+++ b/helm/ida-auth/templates/deployment.yaml
@@ -117,8 +117,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/ida-auth/values.yaml b/helm/ida-auth/values.yaml
index 8e808c5f4ba..1264991e594 100644
--- a/helm/ida-auth/values.yaml
+++ b/helm/ida-auth/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/ida-internal/templates/deployment.yaml b/helm/ida-internal/templates/deployment.yaml
index 465d68012eb..e9b9b4ad4f2 100644
--- a/helm/ida-internal/templates/deployment.yaml
+++ b/helm/ida-internal/templates/deployment.yaml
@@ -117,8 +117,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/ida-internal/values.yaml b/helm/ida-internal/values.yaml
index f1e5a5a1725..e0bc1158bac 100644
--- a/helm/ida-internal/values.yaml
+++ b/helm/ida-internal/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/ida-otp/templates/deployment.yaml b/helm/ida-otp/templates/deployment.yaml
index 7016a127aea..d016cb4bb08 100644
--- a/helm/ida-otp/templates/deployment.yaml
+++ b/helm/ida-otp/templates/deployment.yaml
@@ -117,8 +117,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/ida-otp/values.yaml b/helm/ida-otp/values.yaml
index 0208fc6d359..e9c83140e6d 100644
--- a/helm/ida-otp/values.yaml
+++ b/helm/ida-otp/values.yaml
@@ -252,7 +252,7 @@ extraEnvVarsCM:
 
 ## Secret with extra environment variables
 ##
-extraEnvVarsSecret:
+extraEnvVarsSecret: []
 
 ## Extra volumes to add to the deployment
 ##