diff --git a/charts/camunda-platform-alpha/README.md b/charts/camunda-platform-alpha/README.md
index bc99da1107..6d3f8dd800 100644
--- a/charts/camunda-platform-alpha/README.md
+++ b/charts/camunda-platform-alpha/README.md
@@ -831,7 +831,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `webModeler.restapi.mail.existingSecretPasswordKey`                    | can be used to provide the name of an existing secret key containing the SMTP password                                                                                       | `smtp-password`               |
 | `webModeler.restapi.mail.fromAddress`                                  | defines the email address that will be displayed as the sender of emails sent by WebModeler                                                                                  | `""`                          |
 | `webModeler.restapi.mail.fromName`                                     | defines the name that will be displayed as the sender of emails sent by WebModeler                                                                                           | `Camunda 8`                   |
-| `webModeler.restapi.clusters`                                          | can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `zeebe.enabled=true`)         | `[]`                          |
+| `webModeler.restapi.clusters`                                          | can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `core.enabled=true`)          | `[]`                          |
 | `webModeler.restapi.podAnnotations`                                    | can be used to define extra restapi pod annotations                                                                                                                          | `{}`                          |
 | `webModeler.restapi.podLabels`                                         | can be used to define extra restapi pod labels                                                                                                                               | `{}`                          |
 | `webModeler.restapi.logging`                                           | configuration for the restapi logging. This template will be directly included in the webModeler.restapi configuration YAML file                                             |                               |
diff --git a/charts/camunda-platform-alpha/templates/core/configmap.yaml b/charts/camunda-platform-alpha/templates/core/configmap.yaml
index 33b1c4fcd0..f1c40a51f1 100644
--- a/charts/camunda-platform-alpha/templates/core/configmap.yaml
+++ b/charts/camunda-platform-alpha/templates/core/configmap.yaml
@@ -33,7 +33,7 @@ data:
               oidcclient:
                 client-id: {{ include "core.authClientId" . | quote }}
                 client-secret: ${VALUES_CAMUNDA_CORE_CLIENT_SECRET:}
-                # authorization-grant-type: authorization_code
+                authorization-grant-type: authorization_code
                 {{- $redirectURIDefault := printf "http://%s:8080" (include "core.fullname" .) }}
                 redirect-uri: "{{ tpl .Values.global.identity.auth.core.redirectUrl $ | default $redirectURIDefault }}/login/oauth2/code/core"
                 provider: oidcclient
@@ -56,8 +56,8 @@ data:
       forward-headers-strategy: framework
       address: 0.0.0.0
       port: {{ .Values.core.service.httpPort }}
-      {{- if .Values.core.contextPath }}
       servlet:
+      {{- if .Values.core.contextPath }}
         context-path: {{ .Values.core.contextPath | quote }}
       {{- end }}
 
diff --git a/charts/camunda-platform-alpha/templates/identity/configmap.yaml b/charts/camunda-platform-alpha/templates/identity/configmap.yaml
index e4dd6f6361..248e269204 100644
--- a/charts/camunda-platform-alpha/templates/identity/configmap.yaml
+++ b/charts/camunda-platform-alpha/templates/identity/configmap.yaml
@@ -215,7 +215,6 @@ data:
             - Optimize
             - Web Modeler
             - Web Modeler Admin
-            - Zeebe
           {{- end }}
         {{- end }}
         {{- if .Values.identity.users }}
diff --git a/charts/camunda-platform-alpha/test/unit/core/golden/configmap-authorizations.golden.yaml b/charts/camunda-platform-alpha/test/unit/core/golden/configmap-authorizations.golden.yaml
index 4f7dfbc6aa..6a02f7226e 100644
--- a/charts/camunda-platform-alpha/test/unit/core/golden/configmap-authorizations.golden.yaml
+++ b/charts/camunda-platform-alpha/test/unit/core/golden/configmap-authorizations.golden.yaml
@@ -34,7 +34,7 @@ data:
               oidcclient:
                 client-id: "core"
                 client-secret: ${VALUES_CAMUNDA_CORE_CLIENT_SECRET:}
-                # authorization-grant-type: authorization_code
+                authorization-grant-type: authorization_code
                 redirect-uri: "http://localhost:8082/login/oauth2/code/core"
                 provider: oidcclient
                 scope: openid,profile
@@ -47,6 +47,7 @@ data:
       forward-headers-strategy: framework
       address: 0.0.0.0
       port: 8080
+      servlet:
 
     zeebe:
       host: 0.0.0.0
diff --git a/charts/camunda-platform-alpha/test/unit/core/golden/configmap-log4j2.golden.yaml b/charts/camunda-platform-alpha/test/unit/core/golden/configmap-log4j2.golden.yaml
index 12d86b553c..db4c0940c0 100644
--- a/charts/camunda-platform-alpha/test/unit/core/golden/configmap-log4j2.golden.yaml
+++ b/charts/camunda-platform-alpha/test/unit/core/golden/configmap-log4j2.golden.yaml
@@ -34,7 +34,7 @@ data:
               oidcclient:
                 client-id: "core"
                 client-secret: ${VALUES_CAMUNDA_CORE_CLIENT_SECRET:}
-                # authorization-grant-type: authorization_code
+                authorization-grant-type: authorization_code
                 redirect-uri: "http://localhost:8082/login/oauth2/code/core"
                 provider: oidcclient
                 scope: openid,profile
@@ -47,6 +47,7 @@ data:
       forward-headers-strategy: framework
       address: 0.0.0.0
       port: 8080
+      servlet:
 
     zeebe:
       host: 0.0.0.0
diff --git a/charts/camunda-platform-alpha/test/unit/core/golden/configmap.golden.yaml b/charts/camunda-platform-alpha/test/unit/core/golden/configmap.golden.yaml
index b953b38371..ca0d76e4e9 100644
--- a/charts/camunda-platform-alpha/test/unit/core/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-alpha/test/unit/core/golden/configmap.golden.yaml
@@ -34,7 +34,7 @@ data:
               oidcclient:
                 client-id: "core"
                 client-secret: ${VALUES_CAMUNDA_CORE_CLIENT_SECRET:}
-                # authorization-grant-type: authorization_code
+                authorization-grant-type: authorization_code
                 redirect-uri: "http://localhost:8082/login/oauth2/code/core"
                 provider: oidcclient
                 scope: openid,profile
@@ -47,6 +47,7 @@ data:
       forward-headers-strategy: framework
       address: 0.0.0.0
       port: 8080
+      servlet:
 
     zeebe:
       host: 0.0.0.0
diff --git a/charts/camunda-platform-alpha/test/unit/identity/golden/configmap.golden.yaml b/charts/camunda-platform-alpha/test/unit/identity/golden/configmap.golden.yaml
index 279c4eadea..08dea823d6 100644
--- a/charts/camunda-platform-alpha/test/unit/identity/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-alpha/test/unit/identity/golden/configmap.golden.yaml
@@ -198,7 +198,6 @@ data:
             - Optimize
             - Web Modeler
             - Web Modeler Admin
-            - Zeebe
       environment:
         clients:
           - name: Identity
diff --git a/charts/camunda-platform-alpha/values.yaml b/charts/camunda-platform-alpha/values.yaml
index 1dd446c0f1..d0d1d5a916 100644
--- a/charts/camunda-platform-alpha/values.yaml
+++ b/charts/camunda-platform-alpha/values.yaml
@@ -1202,7 +1202,7 @@ webModeler:
       ## @param webModeler.restapi.mail.fromName defines the name that will be displayed as the sender of emails sent by WebModeler
       fromName: "Camunda 8"
 
-    ## @param webModeler.restapi.clusters can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `zeebe.enabled=true`)
+    ## @param webModeler.restapi.clusters can be used to configure Camunda 8 clusters that will be available in Web Modeler (will override default cluster configuration that is used if `core.enabled=true`)
     clusters: []
 
     ## @param webModeler.restapi.podAnnotations can be used to define extra restapi pod annotations