diff --git a/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl b/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
index ec58a0826..995dc13fd 100644
--- a/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
+++ b/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
@@ -66,21 +66,6 @@
               secretKeyRef:
                   name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
                   key: pi-admin-password
-          - name: SYSTEM_RENAME_WAITING_TIME_IN_SECONDS # TODO
-            valueFrom:
-              secretKeyRef:
-                  name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
-                  key: system-rename-waiting-time-in-seconds
-          - name: SYSTEM_STEP_UP_TIMEOUT_IN_SECONDS # TODO
-            valueFrom:
-              secretKeyRef:
-                  name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
-                  key: system-step-up-timeout-in-seconds
-          - name: SYSTEM_STEP_UP_TIMEOUT_ENABLED # TODO
-            valueFrom:
-              secretKeyRef:
-                  name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
-                  key: system-step-up-timeout-enabled
           - name: REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
diff --git a/charts/dbildungs-iam-server/templates/configmap.yaml b/charts/dbildungs-iam-server/templates/configmap.yaml
index 36c0375fd..6644f5eb3 100644
--- a/charts/dbildungs-iam-server/templates/configmap.yaml
+++ b/charts/dbildungs-iam-server/templates/configmap.yaml
@@ -30,3 +30,6 @@ data:
   ITSLEARNING_ROOT: '{{ .Values.itslearning.root }}'
   ITSLEARNING_ROOT_OEFFENTLICH: '{{ .Values.itslearning.rootOeffentlich }}'
   ITSLEARNING_ROOT_ERSATZ: '{{ .Values.itslearning.rootErsatz }}'
+  SYSTEM_RENAME_WAITING_TIME_IN_SECONDS: '{{ .Values.system.rename_waiting_time_in_seconds }}'
+  SYSTEM_STEP_UP_TIMEOUT_IN_SECONDS: '{{ .Values.system.step_up_timeout_in_seconds }}'
+  SYSTEM_STEP_UP_TIMEOUT_ENABLED: '{{ .Values.system.step_up_timeout_enabled }}'
diff --git a/charts/dbildungs-iam-server/templates/secret.yaml b/charts/dbildungs-iam-server/templates/secret.yaml
index 7a44f09da..677d8f793 100644
--- a/charts/dbildungs-iam-server/templates/secret.yaml
+++ b/charts/dbildungs-iam-server/templates/secret.yaml
@@ -18,9 +18,6 @@ data:
   itslearning-password: {{ .Values.auth.itslearning_password }}
   pi-admin-user: {{ .Values.auth.pi_admin_user }}
   pi-admin-password: {{ .Values.auth.pi_admin_password }}
-  system-rename-waiting-time-in-seconds: {{ .Values.auth.system_rename_waiting_time_in_seconds }} # TODO
-  system-step-up-timeout-in-seconds: {{ .Values.auth.system_step_up_timeout_in_seconds }} # TODO
-  system-step-up-enabled: {{ .Values.auth.system_step_up_enabled }} # TODO
   secrets-json: {{ .Values.auth.secrets_json }}
   redis-password: {{ .Values.auth.redis_password }}
 {{- end }}
diff --git a/charts/dbildungs-iam-server/values.yaml b/charts/dbildungs-iam-server/values.yaml
index 938459219..6dddc182a 100644
--- a/charts/dbildungs-iam-server/values.yaml
+++ b/charts/dbildungs-iam-server/values.yaml
@@ -35,15 +35,20 @@ ldap:
 itslearning:
   enabled: false
   endpoint: https://enterprise.itslintegrations.com/WCFServiceLibrary/ImsEnterpriseServicesPort.svc
+  root: sh
+  rootOeffentlich: oeffentlich
+  rootErsatz: ersatz
 
 privacyidea:
   url: https://privacyidea.dev.spsh.dbildungsplattform.de
   renameWaitingTime: 5
   realm: ucs_users
   userResolver: ucs_users
-  root: sh
-  rootOeffentlich: oeffentlich
-  rootErsatz: ersatz
+
+system:
+  rename_waiting_time_in_seconds: ''
+  step_up_timeout_in_seconds: ''
+  step_up_timeout_enabled: ''
 
 auth:
   # existingSecret: Refers to a secret already present in the cluster, which is required.
@@ -59,9 +64,6 @@ auth:
   itslearning_password: ''
   pi_admin_user: ''
   pi_admin_password: ''
-  system_rename_waiting_time_in_seconds: '' # TODO
-  system_step_up_timeout_in_seconds: '' # TODO
-  system_step_up_timeout_enabled: '' # TODO
   redis_password: ''
 
 backend: