diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
index dfc862d4..efa2936f 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.46.0"
-version: 7.9.1
+version: 7.9.2
 kubeVersion: ">= 1.21.0-0"
 icon: https://zitadel.com/zitadel-logo-dark.svg
 maintainers:
diff --git a/charts/zitadel/templates/setupjob.yaml b/charts/zitadel/templates/setupjob.yaml
index 551b5b15..ad89dbfe 100644
--- a/charts/zitadel/templates/setupjob.yaml
+++ b/charts/zitadel/templates/setupjob.yaml
@@ -42,19 +42,23 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - setup
+            - --masterkeyFromEnv
             - --config
             - /config/zitadel-config-yaml
+            - --steps
+            - /config/zitadel-config-yaml
             {{- if .Values.zitadel.secretConfig }}
             - --config
             - /.secrets/zitadel-secrets-yaml/zitadel-secrets-yaml
+            - --steps
+            - /.secrets/zitadel-secrets-yaml/zitadel-secrets-yaml
             {{- end }}
             {{- if and .Values.zitadel.configSecretName .Values.zitadel.configSecretKey }}
             - --config
             - /.secrets/zitadel-secret-config-yaml/{{ .Values.zitadel.configSecretKey }}
-            {{- end }}
             - --steps
-            - /config/zitadel-config-yaml
-            - --masterkeyFromEnv
+            - /.secrets/zitadel-secret-config-yaml/{{ .Values.zitadel.configSecretKey }}
+            {{- end }}
             {{- if .Values.setupJob.additionalArgs }}
             {{- toYaml .Values.setupJob.additionalArgs | nindent 12 }}
             {{- end }}