diff --git a/charts/camunda-platform-8.5/README.md b/charts/camunda-platform-8.5/README.md
index 31218cd3f7..12c83b7b26 100644
--- a/charts/camunda-platform-8.5/README.md
+++ b/charts/camunda-platform-8.5/README.md
@@ -634,7 +634,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `zeebe.image`                                             | configuration to configure the zeebe image specifics                                                                                                                                                                          |                                                                                                                                                            |
 | `zeebe.image.registry`                                    | can be used to set container image registry.                                                                                                                                                                                  | `""`                                                                                                                                                       |
 | `zeebe.image.repository`                                  | defines which image repository to use                                                                                                                                                                                         | `camunda/zeebe`                                                                                                                                            |
-| `zeebe.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                                                                    | `8.5.8`                                                                                                                                                    |
+| `zeebe.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                                                                    | `8.5.9`                                                                                                                                                    |
 | `zeebe.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                                                                       | `[]`                                                                                                                                                       |
 | `zeebe.sidecars`                                          | can be used to attach extra containers to the zeebe deployment                                                                                                                                                                | `[]`                                                                                                                                                       |
 | `zeebe.clusterSize`                                       | defines the amount of brokers (=replicas), which are deployed via helm                                                                                                                                                        | `3`                                                                                                                                                        |
@@ -755,7 +755,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `zeebeGateway.image`                                             | configuration to configure the ZeebeGateway image specifics                                                                                                                  |                                       |
 | `zeebeGateway.image.registry`                                    | can be used to set container image registry.                                                                                                                                 | `""`                                  |
 | `zeebeGateway.image.repository`                                  | defines which image repository to use                                                                                                                                        | `camunda/zeebe`                       |
-| `zeebeGateway.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                   | `8.5.8`                               |
+| `zeebeGateway.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                   | `8.5.9`                               |
 | `zeebeGateway.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                      | `[]`                                  |
 | `zeebeGateway.sidecars`                                          | can be used to attach extra containers to the ZeebeGateway deployment                                                                                                        | `[]`                                  |
 | `zeebeGateway.podAnnotations`                                    | can be used to define extra gateway pod annotations                                                                                                                          | `{}`                                  |
@@ -878,7 +878,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `operate.image`                                             | configuration to configure the Operate image specifics                                                                                                                              |                              |
 | `operate.image.registry`                                    | can be used to set container image registry.                                                                                                                                        | `""`                         |
 | `operate.image.repository`                                  | defines which image repository to use                                                                                                                                               | `camunda/operate`            |
-| `operate.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                          | `8.5.7`                      |
+| `operate.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                          | `8.5.8`                      |
 | `operate.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                             | `[]`                         |
 | `operate.migration`                                         | configuration for Operate migration                                                                                                                                                 |                              |
 | `operate.migration.enabled`                                 | if true, run Operate migration script as an init container                                                                                                                          | `true`                       |
@@ -985,7 +985,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `tasklist.image`                                             | configuration to configure the tasklist image specifics                                                                                                                      |                              |
 | `tasklist.image.registry`                                    | can be used to set container image registry.                                                                                                                                 | `""`                         |
 | `tasklist.image.repository`                                  | defines which image repository to use                                                                                                                                        | `camunda/tasklist`           |
-| `tasklist.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                   | `8.5.8`                      |
+| `tasklist.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                   | `8.5.9`                      |
 | `tasklist.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                      | `[]`                         |
 | `tasklist.sidecars`                                          | can be used to attach extra containers to the tasklist deployment                                                                                                            | `[]`                         |
 | `tasklist.initContainers`                                    | can be used to set up extra init containers for the application Pod                                                                                                          | `[]`                         |
@@ -1082,7 +1082,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `optimize.image`                                             | configuration to configure the Optimize image specifics                                                                                                                             |                             |
 | `optimize.image.registry`                                    | can be used to set container image registry                                                                                                                                         | `""`                        |
 | `optimize.image.repository`                                  | defines which image repository to use                                                                                                                                               | `camunda/optimize`          |
-| `optimize.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                          | `8.5.7`                     |
+| `optimize.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                          | `8.5.8`                     |
 | `optimize.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                             | `[]`                        |
 | `optimize.migration`                                         | configuration for Optimize migration                                                                                                                                                |                             |
 | `optimize.migration.enabled`                                 | if true, run Optimize migration script as an init container                                                                                                                         | `true`                      |
@@ -1197,7 +1197,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `identity.image`                                             | configuration to configure the identity image specifics                                                                                                                                                   |                               |
 | `identity.image.registry`                                    | can be used to set container image registry.                                                                                                                                                              | `""`                          |
 | `identity.image.repository`                                  | defines which image repository to use                                                                                                                                                                     | `camunda/identity`            |
-| `identity.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                                                | `8.5.6`                       |
+| `identity.image.tag`                                         | can be set to overwrite the global tag, which should be used in that chart                                                                                                                                | `8.5.8`                       |
 | `identity.image.pullSecrets`                                 | can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod                                                                   | `[]`                          |
 | `identity.sidecars`                                          | can be used to attach extra containers to the identity deployment                                                                                                                                         | `[]`                          |
 | `identity.initContainers`                                    | can be used to set up extra init containers for the application Pod                                                                                                                                       | `[]`                          |
@@ -1384,7 +1384,7 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
 | `webModeler.nameOverride`      | can be used to partly override the name of the WebModeler resources (names will still be prefixed with the release name)                      | `""`                     |
 | `webModeler.image`             | configuration of the WebModeler Docker images                                                                                                 |                          |
 | `webModeler.image.registry`    | can be used to set the Docker registry for the WebModeler images (overwrites global.image.registry)                                           | `registry.camunda.cloud` |
-| `webModeler.image.tag`         | can be used to set the Docker image tag for the WebModeler images (overwrites global.image.tag)                                               | `8.5.10`                 |
+| `webModeler.image.tag`         | can be used to set the Docker image tag for the WebModeler images (overwrites global.image.tag)                                               | `8.5.11`                 |
 | `webModeler.image.pullSecrets` | can be used to configure image pull secrets, see https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod  | `[]`                     |
 | `webModeler.contextPath`       | can be used to make WebModeler available on a custom sub-path. This is mainly used to run the Camunda web applications under a single domain. | `""`                     |
 
diff --git a/charts/camunda-platform-8.5/test/unit/camunda/golden/keycloak-statefulset.golden.yaml b/charts/camunda-platform-8.5/test/unit/camunda/golden/keycloak-statefulset.golden.yaml
index f093a20d80..b7611f7863 100644
--- a/charts/camunda-platform-8.5/test/unit/camunda/golden/keycloak-statefulset.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/camunda/golden/keycloak-statefulset.golden.yaml
@@ -92,7 +92,7 @@ spec:
           - sh
           - -c
           - cp -a /app/keycloak-theme/* /mnt
-          image: 'docker.io/camunda/identity:8.5.6'
+          image: 'docker.io/camunda/identity:8.5.8'
           imagePullPolicy: 'IfNotPresent'
           name: copy-camunda-theme
           securityContext:
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/configmap.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/configmap.golden.yaml
index 6d77e6900e..5ce2d6f4cf 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/configmap.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     {}
 data:
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/deployment.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/deployment.golden.yaml
index 2fb6b3cfb0..3eaf7e335a 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/deployment.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/deployment.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     {}
 spec:
@@ -35,7 +35,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: identity
-        app.kubernetes.io/version: "8.5.6"
+        app.kubernetes.io/version: "8.5.8"
       annotations:
     spec:
       imagePullSecrets:
@@ -44,7 +44,7 @@ spec:
         []
       containers:
         - name: camunda-platform
-          image: camunda/identity:8.5.6
+          image: camunda/identity:8.5.8
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/ingress-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/ingress-all-enabled.golden.yaml
index c873f57d22..901b07cc17 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/ingress-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/ingress-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/ingress.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/ingress.golden.yaml
index 261b7e0637..c522bc5f7e 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/ingress.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/ingress.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/service.golden.yaml
index cde2aafb73..faa7191340 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
 spec:
   type: ClusterIP
diff --git a/charts/camunda-platform-8.5/test/unit/identity/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/identity/golden/serviceaccount.golden.yaml
index 5c809f4897..c3189598fd 100644
--- a/charts/camunda-platform-8.5/test/unit/identity/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/identity/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: identity
-    app.kubernetes.io/version: "8.5.6"
+    app.kubernetes.io/version: "8.5.8"
 automountServiceAccountToken: true
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/configmap.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/configmap.golden.yaml
index d16982ecc2..9c45347d2c 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/configmap.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
 data:
   application.yml: |
     spring:
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/deployment.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/deployment.golden.yaml
index 7977fb1e2e..ec388e641f 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/deployment.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/deployment.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     {}
 spec:
@@ -35,14 +35,14 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: operate
-        app.kubernetes.io/version: "8.5.7"
+        app.kubernetes.io/version: "8.5.8"
       annotations:
     spec:
       imagePullSecrets:
         []
       initContainers:
         - name: migration
-          image: camunda/operate:8.5.7
+          image: camunda/operate:8.5.8
           command: ['/bin/sh', '/usr/local/operate/bin/migrate']
           securityContext:
             allowPrivilegeEscalation: false
@@ -74,7 +74,7 @@ spec:
               mountPath: /camunda
       containers:
         - name: operate
-          image: camunda/operate:8.5.7
+          image: camunda/operate:8.5.8
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/ingress-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/ingress-all-enabled.golden.yaml
index f844ccc41d..763b466bb4 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/ingress-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/ingress-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/ingress.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/ingress.golden.yaml
index 0891bf5510..06bb7a56c5 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/ingress.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/ingress.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/service.golden.yaml
index a8f0dee8e1..aaae767b4e 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
 spec:
   type: ClusterIP
diff --git a/charts/camunda-platform-8.5/test/unit/operate/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/operate/golden/serviceaccount.golden.yaml
index fb59c293f3..d9e7aab102 100644
--- a/charts/camunda-platform-8.5/test/unit/operate/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/operate/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: operate
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
 automountServiceAccountToken: false
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/optimize/golden/deployment.golden.yaml b/charts/camunda-platform-8.5/test/unit/optimize/golden/deployment.golden.yaml
index 847563d736..4a7623f28f 100644
--- a/charts/camunda-platform-8.5/test/unit/optimize/golden/deployment.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/optimize/golden/deployment.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: optimize
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     {}
 spec:
@@ -35,14 +35,14 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: optimize
-        app.kubernetes.io/version: "8.5.7"
+        app.kubernetes.io/version: "8.5.8"
       annotations:
     spec:
       imagePullSecrets:
         []
       initContainers:
         - name: migration
-          image: camunda/optimize:8.5.7
+          image: camunda/optimize:8.5.8
           command: ['./upgrade/upgrade.sh', '--skip-warning']
           securityContext:
             allowPrivilegeEscalation: false
@@ -77,7 +77,7 @@ spec:
               name: environment-config
       containers:
         - name: optimize
-          image: camunda/optimize:8.5.7
+          image: camunda/optimize:8.5.8
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress-all-enabled.golden.yaml
index 67bece84e0..06bc0e417a 100644
--- a/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: optimize
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress.golden.yaml b/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress.golden.yaml
index a33254ed0b..17fa7351b8 100644
--- a/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/optimize/golden/ingress.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: optimize
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/optimize/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/optimize/golden/service.golden.yaml
index 7f1ec4cdb9..fd03e3d999 100644
--- a/charts/camunda-platform-8.5/test/unit/optimize/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/optimize/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: optimize
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
   annotations:
 spec:
   type: ClusterIP
diff --git a/charts/camunda-platform-8.5/test/unit/optimize/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/optimize/golden/serviceaccount.golden.yaml
index f50de737f8..b2c29b0345 100644
--- a/charts/camunda-platform-8.5/test/unit/optimize/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/optimize/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: optimize
-    app.kubernetes.io/version: "8.5.7"
+    app.kubernetes.io/version: "8.5.8"
 automountServiceAccountToken: false
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/tasklist/golden/configmap.golden.yaml b/charts/camunda-platform-8.5/test/unit/tasklist/golden/configmap.golden.yaml
index 1500f435c5..7ecf8c595d 100644
--- a/charts/camunda-platform-8.5/test/unit/tasklist/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/tasklist/golden/configmap.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: tasklist
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 data:
   application.yml: |
     spring:
diff --git a/charts/camunda-platform-8.5/test/unit/tasklist/golden/deployment.golden.yaml b/charts/camunda-platform-8.5/test/unit/tasklist/golden/deployment.golden.yaml
index 0f427428c4..a313a0f52c 100644
--- a/charts/camunda-platform-8.5/test/unit/tasklist/golden/deployment.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/tasklist/golden/deployment.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: tasklist
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     {}
 spec:
@@ -35,7 +35,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: tasklist
-        app.kubernetes.io/version: "8.5.8"
+        app.kubernetes.io/version: "8.5.9"
       annotations:
     spec:
       imagePullSecrets:
@@ -44,7 +44,7 @@ spec:
         []
       containers:
         - name: tasklist
-          image: camunda/tasklist:8.5.8
+          image: camunda/tasklist:8.5.9
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress-all-enabled.golden.yaml
index c00a252ce4..374350ba3b 100644
--- a/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: tasklist
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress.golden.yaml b/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress.golden.yaml
index 6291087862..bf70b2bcd4 100644
--- a/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/tasklist/golden/ingress.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: tasklist
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/tasklist/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/tasklist/golden/service.golden.yaml
index 6e737f4b43..3fe0dc2e83 100644
--- a/charts/camunda-platform-8.5/test/unit/tasklist/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/tasklist/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: tasklist
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
 spec:
   type: ClusterIP
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/configmap-shared.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/configmap-shared.golden.yaml
index 97df3497cd..ebbaaf9ded 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/configmap-shared.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/configmap-shared.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: web-modeler
-    app.kubernetes.io/version: "8.5.10"
+    app.kubernetes.io/version: "8.5.11"
   annotations:
     {}
 data:
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-restapi.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-restapi.golden.yaml
index 5b77ef45b5..e9e43ac3b7 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-restapi.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-restapi.golden.yaml
@@ -41,7 +41,7 @@ spec:
         []
       containers:
         - name: web-modeler-restapi
-          image: "registry.camunda.cloud/web-modeler-ee/modeler-restapi:8.5.10"
+          image: "registry.camunda.cloud/web-modeler-ee/modeler-restapi:8.5.11"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-webapp.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-webapp.golden.yaml
index 51000594e6..4c196e6001 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-webapp.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-webapp.golden.yaml
@@ -41,7 +41,7 @@ spec:
         []
       containers:
         - name: web-modeler-webapp
-          image: "registry.camunda.cloud/web-modeler-ee/modeler-webapp:8.5.10"
+          image: "registry.camunda.cloud/web-modeler-ee/modeler-webapp:8.5.11"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-websockets.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-websockets.golden.yaml
index 503ba2efc8..71f9beb42b 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-websockets.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/deployment-websockets.golden.yaml
@@ -41,7 +41,7 @@ spec:
         []
       containers:
         - name: web-modeler-websockets
-          image: "registry.camunda.cloud/web-modeler-ee/modeler-websockets:8.5.10"
+          image: "registry.camunda.cloud/web-modeler-ee/modeler-websockets:8.5.11"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress-all-enabled.golden.yaml
index 197bd3edc5..ee5ece88c0 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: web-modeler
-    app.kubernetes.io/version: "8.5.10"
+    app.kubernetes.io/version: "8.5.11"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress.golden.yaml
index 65fd9da1c9..c7cd33bf59 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/ingress.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: web-modeler
-    app.kubernetes.io/version: "8.5.10"
+    app.kubernetes.io/version: "8.5.11"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/secret-shared.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/secret-shared.golden.yaml
index 33bdcbb4f7..12aa4a3416 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/secret-shared.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/secret-shared.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: web-modeler
-    app.kubernetes.io/version: "8.5.10"
+    app.kubernetes.io/version: "8.5.11"
   annotations:
     {}
 type: Opaque
diff --git a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/serviceaccount.golden.yaml
index d8f0ec28d0..069cf24dbb 100644
--- a/charts/camunda-platform-8.5/test/unit/web-modeler/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/web-modeler/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: web-modeler
-    app.kubernetes.io/version: "8.5.10"
+    app.kubernetes.io/version: "8.5.11"
 automountServiceAccountToken: false
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml
index 02620eae34..125e1f77ec 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap-log4j2.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   gateway-log4j2.xml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap.golden.yaml
index 7a531b30c7..a23b7d5150 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/configmap.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   gateway-log4j2.xml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/deployment.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/deployment.golden.yaml
index b558c3a72d..936c0760a7 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/deployment.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/deployment.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     {}
 spec:
@@ -35,7 +35,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: zeebe-gateway
-        app.kubernetes.io/version: "8.5.8"
+        app.kubernetes.io/version: "8.5.9"
       annotations:
     spec:
       imagePullSecrets:
@@ -44,7 +44,7 @@ spec:
         []
       containers:
         - name: zeebe-gateway
-          image: camunda/zeebe:8.5.8
+          image: camunda/zeebe:8.5.9
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 9600
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc-all-enabled.golden.yaml
index 01d413469d..0e9e69beac 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/backend-protocol: GRPC
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc.golden.yaml
index 4693f93f00..0b39eec394 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-grpc.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/backend-protocol: GRPC
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest-all-enabled.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest-all-enabled.golden.yaml
index 3daae171e4..16d7b29ee4 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest-all-enabled.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest-all-enabled.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest.golden.yaml
index 17335fefb1..288115fca6 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/ingress-rest.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/poddisruptionbudget.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/poddisruptionbudget.golden.yaml
index af84c3d3ac..1338f238fb 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/poddisruptionbudget.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/poddisruptionbudget.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 spec:
   minAvailable: 1
   selector:
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/service.golden.yaml
index 22a204ccb3..e8fb2233b0 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
 spec:
   type: ClusterIP
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount-annotations.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount-annotations.golden.yaml
index aa70f75808..eef24f62f6 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount-annotations.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount-annotations.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
     foo: bar
     lulz: baz
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount.golden.yaml
index 045b009781..1049e76ba6 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe-gateway/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-gateway
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 automountServiceAccountToken: false
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-log4j2.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-log4j2.golden.yaml
index d99d96f2b0..a0ca6ccef4 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-log4j2.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-log4j2.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   application.yaml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failBack.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failBack.golden.yaml
index 0b23c13b3b..5f40b1f083 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failBack.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failBack.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   application.yaml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failOver.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failOver.golden.yaml
index 573115b038..63f3be4ee9 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failOver.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap-multiregion-failOver.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   application.yaml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap.golden.yaml
index 7840b01c9b..62e1918a03 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/configmap.golden.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 apiVersion: v1
 data:
   application.yaml: |
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/poddisruptionbudget.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/poddisruptionbudget.golden.yaml
index 207c1b0ab1..87f9bd5e5c 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/poddisruptionbudget.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/poddisruptionbudget.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 spec:
   maxUnavailable: 1
   selector:
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/service.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/service.golden.yaml
index f207c81d74..4784d597db 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/service.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/service.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
 spec:
   clusterIP: None
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/serviceaccount.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/serviceaccount.golden.yaml
index 3329285eaf..0058e4080c 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/serviceaccount.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/serviceaccount.golden.yaml
@@ -11,5 +11,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
 automountServiceAccountToken: false
\ No newline at end of file
diff --git a/charts/camunda-platform-8.5/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-8.5/test/unit/zeebe/golden/statefulset.golden.yaml
index 32f1cea5d7..1b2c4cd4b5 100644
--- a/charts/camunda-platform-8.5/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-8.5/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: camunda-platform
     app.kubernetes.io/component: zeebe-broker
-    app.kubernetes.io/version: "8.5.8"
+    app.kubernetes.io/version: "8.5.9"
   annotations:
 spec:
   replicas: 3
@@ -36,7 +36,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: camunda-platform
         app.kubernetes.io/component: zeebe-broker
-        app.kubernetes.io/version: "8.5.8"
+        app.kubernetes.io/version: "8.5.9"
       annotations:
     spec:
       imagePullSecrets:
@@ -45,7 +45,7 @@ spec:
         []
       containers:
         - name: zeebe
-          image: camunda/zeebe:8.5.8
+          image: camunda/zeebe:8.5.9
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/charts/camunda-platform-8.5/values-latest.yaml b/charts/camunda-platform-8.5/values-latest.yaml
index 8b816cd25f..5cb4a4c8b4 100644
--- a/charts/camunda-platform-8.5/values-latest.yaml
+++ b/charts/camunda-platform-8.5/values-latest.yaml
@@ -11,7 +11,7 @@ global:
   identity:
     image:
       repository: camunda/identity
-      tag: 8.5.6
+      tag: 8.5.8
 
 console:
   # Camunda Enterprise repository.
@@ -35,7 +35,7 @@ optimize:
   # https://hub.docker.com/r/camunda/optimize/tags
   image:
     repository: camunda/optimize
-    tag: 8.5.7
+    tag: 8.5.8
 
 tasklist:
   # https://hub.docker.com/r/camunda/tasklist/tags
@@ -47,7 +47,7 @@ webModeler:
   # registry.camunda.cloud/web-modeler-ee
   image:
     # renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
-    tag: 8.5.10
+    tag: 8.5.11
 
 zeebe:
   # https://hub.docker.com/r/camunda/zeebe/tags
diff --git a/charts/camunda-platform-8.5/values.yaml b/charts/camunda-platform-8.5/values.yaml
index f3c9bceacd..007dee3317 100644
--- a/charts/camunda-platform-8.5/values.yaml
+++ b/charts/camunda-platform-8.5/values.yaml
@@ -185,7 +185,7 @@ global:
       ## @skip global.identity.image.repository defines which image repository to use
       repository: camunda/identity
       ## @skip global.identity.image.tag can be set to overwrite the global tag, which should be used in that chart
-      tag: 8.5.6
+      tag: 8.5.8
       ## @skip global.identity.image.pullPolicy defines the image pull policy which should be used https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
       pullPolicy: IfNotPresent
     service:
@@ -638,7 +638,7 @@ zeebe:
      ## @param zeebe.image.repository defines which image repository to use
     repository: camunda/zeebe
      ## @param zeebe.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.8
+    tag: 8.5.9
      ## @param zeebe.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -931,7 +931,7 @@ zeebeGateway:
     ## @param zeebeGateway.image.repository defines which image repository to use
     repository: camunda/zeebe
     ## @param zeebeGateway.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.8
+    tag: 8.5.9
     ## @param zeebeGateway.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -1243,7 +1243,7 @@ operate:
     ## @param operate.image.repository defines which image repository to use
     repository: camunda/operate
     ## @param operate.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.7
+    tag: 8.5.8
     ## @param operate.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -1503,7 +1503,7 @@ tasklist:
     ## @param tasklist.image.repository defines which image repository to use
     repository: camunda/tasklist
     ## @param tasklist.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.8
+    tag: 8.5.9
     ## @param tasklist.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -1741,7 +1741,7 @@ optimize:
     ## @param optimize.image.repository defines which image repository to use
     repository: camunda/optimize
     ## @param optimize.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.7
+    tag: 8.5.8
     ## @param optimize.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -2022,7 +2022,7 @@ identity:
     ## @param identity.image.repository defines which image repository to use
     repository: camunda/identity
     ## @param identity.image.tag can be set to overwrite the global tag, which should be used in that chart
-    tag: 8.5.6
+    tag: 8.5.8
     ## @param identity.image.pullSecrets can be used to configure image pull secrets https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     pullSecrets: []
 
@@ -2511,7 +2511,7 @@ webModeler:
     registry: registry.camunda.cloud
     ## @param webModeler.image.tag can be used to set the Docker image tag for the WebModeler images (overwrites global.image.tag)
     # renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
-    tag: 8.5.10
+    tag: 8.5.11
     ## @param webModeler.image.pullSecrets can be used to configure image pull secrets, see https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
     # Note: A secret will be required, if the WebModeler images are pulled directly from Camunda's private registry.
     #