diff --git a/.github/actions/workflow-vars/action.yml b/.github/actions/workflow-vars/action.yml
index f3f30eba4a..c55154dcf6 100644
--- a/.github/actions/workflow-vars/action.yml
+++ b/.github/actions/workflow-vars/action.yml
@@ -14,6 +14,8 @@ inputs:
     description: The deployment cloud platform like GKE or ROSA.
   identifier-base:
     description: The fixed string in the identifier of the deployment it could be PR number or another specified name.
+  chart-dir:
+    description: A reference for the Camunda Helm chart directory which allows to test unreleased chagnes from Git repo.
 # NOTE: This is not an exclusive list, some vars are exported as env var not an output.
 outputs:
   identifier:
@@ -82,8 +84,11 @@ runs:
 
       # Chart version.
       # Used to install previous supported versions of Camunda Helm charts.
-      TEST_CHART_VERSION="$(yq '.version' charts/${CI_CHART_DIR}/Chart.yaml)"
-      echo "TEST_CHART_VERSION=${TEST_CHART_VERSION}" | tee -a $GITHUB_ENV
+      # This is only needed in the upgrade flow not the setup.
+      if [[ "${{ inputs.setup-flow }}" == 'upgrade' ]]; then
+        TEST_CHART_VERSION="$(yq '.version' charts/${{ inputs.chart-dir }}/Chart.yaml)"
+        echo "TEST_CHART_VERSION=${TEST_CHART_VERSION}" | tee -a $GITHUB_ENV
+      fi
 
     # Avoid confusion about the chart version since we only change the version during the release process
     # as the "version" field in "Chart.yaml" file doesn't reflect the changes since the latest release.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3e1b784bc2..cf5123f9e0 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -25,6 +25,13 @@
       // "addLabels": ["automerge"],
       // "automerge": true
     },
+    {
+      "matchPaths": [
+        "charts/camunda-platform*/Chart.yaml",
+        "charts/camunda-platform*/values*.yaml"
+      ],
+      "matchUpdateTypes": ["patch"],
+    },
     {
       // Disable major version update for all Helm components.
       "enabled": false,
diff --git a/.github/workflows/renovate-post-upgrade.yaml b/.github/workflows/renovate-post-upgrade.yaml
index fed8f19185..7c6c9dbf52 100644
--- a/.github/workflows/renovate-post-upgrade.yaml
+++ b/.github/workflows/renovate-post-upgrade.yaml
@@ -33,7 +33,7 @@ jobs:
         token: '${{ steps.generate-github-token.outputs.token }}'
     - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
       with:
-        go-version-file: go.mod
+        go-version-file: charts/camunda-platform/go.mod
         cache: false
     - uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6 # v3
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
diff --git a/.github/workflows/test-integration-template.yaml b/.github/workflows/test-integration-template.yaml
index 99acc0b0fa..a6c4f00977 100644
--- a/.github/workflows/test-integration-template.yaml
+++ b/.github/workflows/test-integration-template.yaml
@@ -57,7 +57,6 @@ env:
   # Vars with "TEST_" prefix are used in the test runner tool (Task).
   CI_PERSISTENT: ${{ inputs.persistent }}
   CI_HOSTNAME_BASE: ci.distro.ultrawombat.com
-  CI_CHART_DIR: ${{ inputs.camunda-helm-dir }}
   CI_SCENARIOS_DIR: charts/${{ inputs.camunda-helm-dir }}/test/integration/scenarios
   # Docker Hub auth to avoid image pull rate limit.
   TEST_CREATE_DOCKER_LOGIN_SECRET: "TRUE"
@@ -171,6 +170,7 @@ jobs:
         platform: ${{ matrix.distro.platform }}
         identifier-base: ${{ inputs.identifier }}
         ingress-hostname-base: ${{ env.CI_HOSTNAME_BASE }}
+        chart-dir: ${{ inputs.camunda-helm-dir }}
     - name: Install env dependencies
       uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6 # v3
     - name: Add Helm repos and dependencies
diff --git a/charts/camunda-platform-8.2/test/integration/scenarios/chart-full-setup/Taskfile.yaml b/charts/camunda-platform-8.2/test/integration/scenarios/chart-full-setup/Taskfile.yaml
index f51da48314..6028ed93ef 100644
--- a/charts/camunda-platform-8.2/test/integration/scenarios/chart-full-setup/Taskfile.yaml
+++ b/charts/camunda-platform-8.2/test/integration/scenarios/chart-full-setup/Taskfile.yaml
@@ -43,7 +43,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .CHART_DIR }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml
diff --git a/charts/camunda-platform-8.2/values/values-latest.yaml b/charts/camunda-platform-8.2/values/values-latest.yaml
deleted file mode 100644
index 0e69fb66f3..0000000000
--- a/charts/camunda-platform-8.2/values/values-latest.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Camunda Platform - Latest
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=docker depName=camunda/zeebe
-    tag: 8.2.26
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.23.2
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 19.0.3
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.4.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 8.2.9
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.2.13
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.13
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.2/values/values-v8.0.yaml b/charts/camunda-platform-8.2/values/values-v8.0.yaml
deleted file mode 100644
index d6a13082ab..0000000000
--- a/charts/camunda-platform-8.2/values/values-v8.0.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Camunda Platform - v8.0
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.0.21
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      repository: bitnami/postgresql
-      image:
-        tag: 14.2.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.10
diff --git a/charts/camunda-platform-8.2/values/values-v8.1.yaml b/charts/camunda-platform-8.2/values/values-v8.1.yaml
deleted file mode 100644
index ab21bf9320..0000000000
--- a/charts/camunda-platform-8.2/values/values-v8.1.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Camunda Platform - v8.1
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.1.16
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.16.1
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 14.5.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-webModeler:
-  # Camunda Enterprise repository.
-  # registry.camunda.cloud/web-modeler-ee
-  image:
-    # renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
-    tag: 0.8.0-beta
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.13
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.3/test/integration/scenarios/chart-full-setup/Taskfile.yaml b/charts/camunda-platform-8.3/test/integration/scenarios/chart-full-setup/Taskfile.yaml
index 76f47ceee9..0a320b3366 100644
--- a/charts/camunda-platform-8.3/test/integration/scenarios/chart-full-setup/Taskfile.yaml
+++ b/charts/camunda-platform-8.3/test/integration/scenarios/chart-full-setup/Taskfile.yaml
@@ -59,7 +59,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .TEST_CHART_NAME }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml
diff --git a/charts/camunda-platform-8.3/values/values-latest.yaml b/charts/camunda-platform-8.3/values/values-latest.yaml
deleted file mode 100644
index d2587f6cb2..0000000000
--- a/charts/camunda-platform-8.3/values/values-latest.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Camunda - Latest
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=docker depName=camunda/zeebe
-    tag: 8.3.10
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 8.3.10
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 22.0.5
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.5.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    # renovate: datasource=docker depName=camunda/optimize
-    tag: 8.3.8
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.3.6
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/bitnami/elasticsearch/tags
-  image: bitnami/elasticsearch
-  tag: 8.8.2
diff --git a/charts/camunda-platform-8.3/values/values-v8.0-eol.yaml b/charts/camunda-platform-8.3/values/values-v8.0-eol.yaml
deleted file mode 100644
index 413fab2ee2..0000000000
--- a/charts/camunda-platform-8.3/values/values-v8.0-eol.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Camunda - v8.0
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.0.21
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      repository: bitnami/postgresql
-      image:
-        tag: 14.2.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.10
diff --git a/charts/camunda-platform-8.3/values/values-v8.1.yaml b/charts/camunda-platform-8.3/values/values-v8.1.yaml
deleted file mode 100644
index 63f0934a1b..0000000000
--- a/charts/camunda-platform-8.3/values/values-v8.1.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Camunda - v8.1
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.1.21
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.16.1
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 14.5.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-webModeler:
-  # Camunda Enterprise repository.
-  # registry.camunda.cloud/web-modeler-ee
-  image:
-    # renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
-    tag: 0.8.0-beta
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.16
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.3/values/values-v8.2.yaml b/charts/camunda-platform-8.3/values/values-v8.2.yaml
deleted file mode 100644
index 4f5a61553f..0000000000
--- a/charts/camunda-platform-8.3/values/values-v8.2.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Camunda - Latest
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.2.19
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.23.2
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 19.0.3
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.4.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.10.6
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.2.9
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.16
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.4/test/integration/scenarios/chart-full-setup/Taskfile.yaml b/charts/camunda-platform-8.4/test/integration/scenarios/chart-full-setup/Taskfile.yaml
index 76f47ceee9..0a320b3366 100644
--- a/charts/camunda-platform-8.4/test/integration/scenarios/chart-full-setup/Taskfile.yaml
+++ b/charts/camunda-platform-8.4/test/integration/scenarios/chart-full-setup/Taskfile.yaml
@@ -59,7 +59,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .TEST_CHART_NAME }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml
diff --git a/charts/camunda-platform-8.4/values/values-latest.yaml b/charts/camunda-platform-8.4/values/values-latest.yaml
deleted file mode 100644
index a4fec81a14..0000000000
--- a/charts/camunda-platform-8.4/values/values-latest.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Camunda - Latest
-#
-
-# https://github.com/camunda/camunda-platform/releases
-global:
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=docker depName=camunda/zeebe
-    tag: 8.4.5
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 8.4.5
-
-operate:
-  # https://hub.docker.com/r/camunda/operate/tags
-  image:
-    repository: camunda/operate
-    # renovate: datasource=docker depName=camunda/operate
-    tag: 8.4.8
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 22.0.5
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.6.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    # renovate: datasource=docker depName=camunda/optimize
-    tag: 8.4.2
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.4.3
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/bitnami/elasticsearch/tags
-  image:
-    repository: bitnami/elasticsearch
-    tag: 8.9.2
diff --git a/charts/camunda-platform-8.4/values/values-v8.0-eol.yaml b/charts/camunda-platform-8.4/values/values-v8.0-eol.yaml
deleted file mode 100644
index 413fab2ee2..0000000000
--- a/charts/camunda-platform-8.4/values/values-v8.0-eol.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Camunda - v8.0
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.0.21
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      repository: bitnami/postgresql
-      image:
-        tag: 14.2.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.10
diff --git a/charts/camunda-platform-8.4/values/values-v8.1.yaml b/charts/camunda-platform-8.4/values/values-v8.1.yaml
deleted file mode 100644
index ed1e9bb44a..0000000000
--- a/charts/camunda-platform-8.4/values/values-v8.1.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Camunda - v8.1
-# https://docs.camunda.io/docs/next/reference/announcements/#camunda-81
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.1.26
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.16.1
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 16.1.1
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 14.5.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.9.5
-  env:
-  - name: CAMUNDA_OPTIMIZE_IDENTITY_REDIRECT_ROOT_URL
-    value: "{{ .Values.global.identity.auth.optimize.redirectUrl }}"
-
-webModeler:
-  # Camunda Enterprise repository.
-  # registry.camunda.cloud/web-modeler-ee
-  image:
-    # renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
-    tag: 0.8.0-beta
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.18
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.4/values/values-v8.2.yaml b/charts/camunda-platform-8.4/values/values-v8.2.yaml
deleted file mode 100644
index e535ebee9e..0000000000
--- a/charts/camunda-platform-8.4/values/values-v8.2.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Camunda - v8.2
-# https://docs.camunda.io/docs/next/reference/announcements/#camunda-82
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.2.25
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 0.23.2
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 19.0.3
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.4.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    tag: 3.10.8
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.2.12
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/elastic/elasticsearch/tags
-  image: docker.elastic.co/elasticsearch/elasticsearch
-  # renovate: datasource=docker depName=elasticsearch/elasticsearch lookupName=docker.elastic.co/elasticsearch/elasticsearch
-  imageTag: 7.17.18
-
-retentionPolicy:
-  # https://hub.docker.com/r/bitnami/elasticsearch-curator/tags
-  image:
-    repository: bitnami/elasticsearch-curator-archived
-    tag: 5.8.4
diff --git a/charts/camunda-platform-8.4/values/values-v8.3.yaml b/charts/camunda-platform-8.4/values/values-v8.3.yaml
deleted file mode 100644
index d3f0485f2c..0000000000
--- a/charts/camunda-platform-8.4/values/values-v8.3.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Camunda - v8.3
-# https://docs.camunda.io/docs/next/reference/announcements/#camunda-83
-#
-
-global:
-  # https://github.com/camunda/camunda-platform/releases
-  # https://hub.docker.com/u/camunda
-  image:
-    # renovate: datasource=github-releases depName=camunda/camunda-platform
-    tag: 8.3.8
-
-connectors:
-  # https://hub.docker.com/r/camunda/connectors-bundle/tags
-  image:
-    repository: camunda/connectors-bundle
-    tag: 8.3.8
-
-identity:
-  keycloak:
-    # https://hub.docker.com/r/bitnami/keycloak/tags
-    image:
-      repository: bitnami/keycloak
-      tag: 22.0.5
-    postgresql:
-      # https://hub.docker.com/r/bitnami/postgresql/tags
-      image:
-        repository: bitnami/postgresql
-        tag: 15.5.0
-
-optimize:
-  # https://hub.docker.com/r/camunda/optimize/tags
-  image:
-    repository: camunda/optimize
-    # renovate: datasource=docker depName=camunda/optimize
-    tag: 8.3.7
-
-webModeler:
-  # Camunda Enterprise repository.
-  # 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.3.5
-
-#
-# Elasticsearch
-#
-
-elasticsearch:
-  # https://hub.docker.com/r/bitnami/elasticsearch/tags
-  image:
-    repository: bitnami/elasticsearch
-    tag: 8.8.2
\ No newline at end of file
diff --git a/charts/camunda-platform/test/integration/scenarios/chart-full-setup/Taskfile.yaml b/charts/camunda-platform/test/integration/scenarios/chart-full-setup/Taskfile.yaml
index f59f6c9962..4e18051c3c 100644
--- a/charts/camunda-platform/test/integration/scenarios/chart-full-setup/Taskfile.yaml
+++ b/charts/camunda-platform/test/integration/scenarios/chart-full-setup/Taskfile.yaml
@@ -62,7 +62,7 @@ tasks:
     deps: [init.seed]
     cmds:
     - helm install integration {{ .TEST_CHART_NAME }}
-        --version {{ .TEST_CHART_VERSION | default ">0.0.0" }}
+        --version {{ .TEST_CHART_VERSION | default ">0.0.0" | quote }}
         --namespace {{ .TEST_NAMESPACE }}
         --values {{ .FIXTURES_DIR }}/values-integration-test.yaml
         --values ./values-integration-test-ingress.yaml