diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7a611c..3f6d159 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # spring-service
 
+## 3.17.0
+
+- Remove outdated `CLUSTER_NAME` env which is replaced by `CLUSTER_ID`, `ENV_NAME`, and `DISASTER_RECOVERY_TEST`.
+  This is mainly relevant for updated Sentry configuration.
+
 ## 3.16.0
 
 - Set default SIGKILL timeout to 5min to allow graceful shutdown of Spring server
diff --git a/charts/spring-service/Chart.yaml b/charts/spring-service/Chart.yaml
index d540806..d41ee43 100644
--- a/charts/spring-service/Chart.yaml
+++ b/charts/spring-service/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 name: spring-service
 description: A generalized deployment for Meisterplan Spring Boot services in Kubernetes.
-version: 3.16.0
+version: 3.17.0
diff --git a/charts/spring-service/templates/deployment.yaml b/charts/spring-service/templates/deployment.yaml
index 173f151..f23aa90 100644
--- a/charts/spring-service/templates/deployment.yaml
+++ b/charts/spring-service/templates/deployment.yaml
@@ -110,16 +110,21 @@ spec:
             - name: "SPRING_PROFILES_ACTIVE"
               value: "prod,tracing"
 
-            - name: "CLUSTER_NAME" # Deprecated, should be removed in a later helm chart
+            - name: "CLUSTER_ID"
               valueFrom:
                 configMapKeyRef:
                   name: region
-                  key: cluster-name
+                  key: cluster-id
             - name: "ENV_NAME"
               valueFrom:
                 configMapKeyRef:
                   name: region
                   key: env-name
+            - name: "DISASTER_RECOVERY_TEST"
+              valueFrom:
+                configMapKeyRef:
+                  name: region
+                  key: disaster-recovery-test
 
             # Tracing environment configuration (Spring Boot 2.x)
             - name: "SPRING_SLEUTH_ENABLED"
diff --git a/tests/spring-service/complex-service/expected/spring-service/templates/deployment.yaml b/tests/spring-service/complex-service/expected/spring-service/templates/deployment.yaml
index 729465d..26cb23b 100644
--- a/tests/spring-service/complex-service/expected/spring-service/templates/deployment.yaml
+++ b/tests/spring-service/complex-service/expected/spring-service/templates/deployment.yaml
@@ -92,16 +92,21 @@ spec:
             - name: "SPRING_PROFILES_ACTIVE"
               value: "prod,tracing"
 
-            - name: "CLUSTER_NAME" # Deprecated, should be removed in a later helm chart
+            - name: "CLUSTER_ID"
               valueFrom:
                 configMapKeyRef:
                   name: region
-                  key: cluster-name
+                  key: cluster-id
             - name: "ENV_NAME"
               valueFrom:
                 configMapKeyRef:
                   name: region
                   key: env-name
+            - name: "DISASTER_RECOVERY_TEST"
+              valueFrom:
+                configMapKeyRef:
+                  name: region
+                  key: disaster-recovery-test
 
             # Tracing environment configuration (Spring Boot 2.x)
             - name: "SPRING_SLEUTH_ENABLED"
diff --git a/tests/spring-service/simple-service/expected/spring-service/templates/deployment.yaml b/tests/spring-service/simple-service/expected/spring-service/templates/deployment.yaml
index 42534ff..51b5f4f 100644
--- a/tests/spring-service/simple-service/expected/spring-service/templates/deployment.yaml
+++ b/tests/spring-service/simple-service/expected/spring-service/templates/deployment.yaml
@@ -98,16 +98,21 @@ spec:
             - name: "SPRING_PROFILES_ACTIVE"
               value: "prod,tracing"
 
-            - name: "CLUSTER_NAME" # Deprecated, should be removed in a later helm chart
+            - name: "CLUSTER_ID"
               valueFrom:
                 configMapKeyRef:
                   name: region
-                  key: cluster-name
+                  key: cluster-id
             - name: "ENV_NAME"
               valueFrom:
                 configMapKeyRef:
                   name: region
                   key: env-name
+            - name: "DISASTER_RECOVERY_TEST"
+              valueFrom:
+                configMapKeyRef:
+                  name: region
+                  key: disaster-recovery-test
 
             # Tracing environment configuration (Spring Boot 2.x)
             - name: "SPRING_SLEUTH_ENABLED"