diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
index 5235789..c6a255a 100644
--- a/charts/zitadel/Chart.yaml
+++ b/charts/zitadel/Chart.yaml
@@ -3,7 +3,7 @@ name: zitadel
 description: A Helm chart for ZITADEL
 type: application
 appVersion: v2.61.0
-version: 8.4.1
+version: 8.5.0
 kubeVersion: ">= 1.21.0-0"
 icon: https://zitadel.com/zitadel-logo-dark.svg
 maintainers:
diff --git a/charts/zitadel/templates/debug_replicaset.yaml b/charts/zitadel/templates/debug_replicaset.yaml
index e49e621..38794ff 100644
--- a/charts/zitadel/templates/debug_replicaset.yaml
+++ b/charts/zitadel/templates/debug_replicaset.yaml
@@ -60,6 +60,11 @@ spec:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- if .Values.envVarsSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.envVarsSecret }}
+          {{- end }}
           volumeMounts:
           - name: zitadel-config-yaml
             mountPath: /config
diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
index adebff1..73c6df8 100644
--- a/charts/zitadel/templates/deployment.yaml
+++ b/charts/zitadel/templates/deployment.yaml
@@ -94,6 +94,11 @@ spec:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- if .Values.envVarsSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.envVarsSecret }}
+          {{- end }}
           ports:
           - containerPort: 8080
             name: {{ .Values.service.protocol }}-server
diff --git a/charts/zitadel/templates/initjob.yaml b/charts/zitadel/templates/initjob.yaml
index a8f92a4..1516982 100644
--- a/charts/zitadel/templates/initjob.yaml
+++ b/charts/zitadel/templates/initjob.yaml
@@ -88,6 +88,11 @@ spec:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- if .Values.envVarsSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.envVarsSecret }}
+          {{- end }}
           volumeMounts:
           - name: zitadel-config-yaml
             mountPath: /config
diff --git a/charts/zitadel/templates/setupjob.yaml b/charts/zitadel/templates/setupjob.yaml
index 270f670..60ba267 100644
--- a/charts/zitadel/templates/setupjob.yaml
+++ b/charts/zitadel/templates/setupjob.yaml
@@ -92,6 +92,11 @@ spec:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- if .Values.envVarsSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.envVarsSecret }}
+          {{- end }}
           volumeMounts:
           - name: zitadel-config-yaml
             mountPath: /config
diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
index 26420e1..dda71e9 100644
--- a/charts/zitadel/values.yaml
+++ b/charts/zitadel/values.yaml
@@ -132,6 +132,11 @@ env:
   #       name: postgres-pguser-postgres
   #       key: host
 
+# Additional environment variables from the given secret name
+# Zitadel can be configured using environment variables from a secret.
+# Reference: https://zitadel.com/docs/self-hosting/manage/configure#configure-by-environment-variables
+envVarsSecret: ""
+
 service:
   type: ClusterIP
   # If service type is "ClusterIP", this can optionally be set to a fixed IP address.