diff --git a/apps/staging-atlantis.yaml b/apps/staging-atlantis.yaml
index 67429e8a..8a25e64a 100644
--- a/apps/staging-atlantis.yaml
+++ b/apps/staging-atlantis.yaml
@@ -23,6 +23,12 @@ spec:
         string: staging
       - name: hostname
         string: atlantis.beta.oceanbox.io
+  - repoURL: https://charts.bitnami.com/bitnami
+    targetRevision: 20.1.7
+    chart: redis
+    helm:
+      valueFiles:
+      - $values/values/atlantis/staging/redis.yaml
   ignoreDifferences:
     - kind: Secret
       name: azure-keyvault
diff --git a/charts/atlantis/Chart.lock b/charts/atlantis/Chart.lock
deleted file mode 100644
index be1c8e99..00000000
--- a/charts/atlantis/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 20.1.7
-digest: sha256:9c9be148366bb3d50f7394ba5a33e1a00a087b5ed61d2bcf1faec9b369e76582
-generated: "2024-10-08T13:21:10.374993273+02:00"
diff --git a/charts/atlantis/Chart.yaml b/charts/atlantis/Chart.yaml
index 9039db31..6c71e1aa 100644
--- a/charts/atlantis/Chart.yaml
+++ b/charts/atlantis/Chart.yaml
@@ -4,9 +4,3 @@ description: Atlantis map and simulation service
 type: application
 version: v2.87.1
 appVersion: v2.87.1
-dependencies:
-  - name: redis
-    version: 20.1.7
-    repository: https://charts.bitnami.com/bitnami
-    condition: redis.enabled
-    alias: redis
diff --git a/charts/atlantis/charts/redis-20.1.7.tgz b/charts/atlantis/charts/redis-20.1.7.tgz
deleted file mode 100644
index 37567e25..00000000
Binary files a/charts/atlantis/charts/redis-20.1.7.tgz and /dev/null differ
diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
index ee2db0c7..2fad3e15 100644
--- a/charts/atlantis/values.yaml
+++ b/charts/atlantis/values.yaml
@@ -99,41 +99,6 @@ cluster:
       db: prod-archmeister
       namespace: atlantis
 
-redis:
-  enabled: true
-  image:
-    repository: redis/redis-stack-server
-    tag: 7.2.0-v10
-  architecture: standalone
-  replica:
-    replicaCount: 1
-    command:
-      - "/opt/redis-stack/bin/redis-server"
-      - "--loadmodule"
-      - "/opt/redis-stack/lib/redisearch.so"
-      - "MAXSEARCHRESULTS"
-      - "10000"
-      - "MAXAGGREGATERESULTS"
-      - "10000"
-      - "--loadmodule"
-      - "/opt/redis-stack/lib/rejson.so"
-  auth:
-    enabled: true
-    sentinel: true
-    password: ""
-    usePasswordFiles: false
-    existingSecretPasswordKey: ""
-    # existingSecret: staging-redis
-  master:
-    resources:
-      limits:
-        ephemeral-storage: 1024Mi
-        memory: 192Mi
-      requests:
-        cpu: 150m
-        ephemeral-storage: 50Mi
-        memory: 128Mi
-
 resources: {}
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/sorcerer/Chart.lock b/charts/sorcerer/Chart.lock
deleted file mode 100644
index 862f0ccb..00000000
--- a/charts/sorcerer/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 20.1.7
-digest: sha256:9c9be148366bb3d50f7394ba5a33e1a00a087b5ed61d2bcf1faec9b369e76582
-generated: "2024-11-16T14:23:53.686487149+01:00"
diff --git a/values/atlantis/prod/redis.yaml b/values/atlantis/prod/redis.yaml
new file mode 100644
index 00000000..357fe4aa
--- /dev/null
+++ b/values/atlantis/prod/redis.yaml
@@ -0,0 +1,37 @@
+image:
+  repository: redis/redis-stack-server
+  tag: 7.2.0-v10
+
+architecture: replication
+
+replica:
+  replicaCount: 2
+  command:
+    - "/opt/redis-stack/bin/redis-server"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/redisearch.so"
+    - "MAXSEARCHRESULTS"
+    - "10000"
+    - "MAXAGGREGATERESULTS"
+    - "10000"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/rejson.so"
+
+auth:
+  enabled: true
+  sentinel: true
+  password: ""
+  usePasswordFiles: false
+  existingSecretPasswordKey: ""
+  # existingSecret: staging-redis
+
+master:
+  resources:
+    limits:
+      ephemeral-storage: 1024Mi
+      memory: 192Mi
+    requests:
+      cpu: 150m
+      ephemeral-storage: 50Mi
+      memory: 128Mi
+
diff --git a/values/atlantis/staging/redis.yaml b/values/atlantis/staging/redis.yaml
new file mode 100644
index 00000000..05c8096a
--- /dev/null
+++ b/values/atlantis/staging/redis.yaml
@@ -0,0 +1,37 @@
+image:
+  repository: redis/redis-stack-server
+  tag: 7.2.0-v10
+
+architecture: standalone
+
+replica:
+  replicaCount: 1
+  command:
+    - "/opt/redis-stack/bin/redis-server"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/redisearch.so"
+    - "MAXSEARCHRESULTS"
+    - "10000"
+    - "MAXAGGREGATERESULTS"
+    - "10000"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/rejson.so"
+
+auth:
+  enabled: true
+  sentinel: true
+  password: ""
+  usePasswordFiles: false
+  existingSecretPasswordKey: ""
+  # existingSecret: staging-redis
+
+master:
+  resources:
+    limits:
+      ephemeral-storage: 1024Mi
+      memory: 192Mi
+    requests:
+      cpu: 150m
+      ephemeral-storage: 50Mi
+      memory: 128Mi
+