diff --git a/clusters/cl01tl/helm/blocky/values.yaml b/clusters/cl01tl/helm/blocky/values.yaml
index 6030e23c7..e46a6b2cf 100644
--- a/clusters/cl01tl/helm/blocky/values.yaml
+++ b/clusters/cl01tl/helm/blocky/values.yaml
@@ -327,5 +327,6 @@ blocky:
               mountPropagation: None
               subPath: config.yml
 valkey:
-  replica:
-    enabled: false
+  valkey:
+    replica:
+      enabled: false
diff --git a/clusters/cl01tl/helm/directus/values.yaml b/clusters/cl01tl/helm/directus/values.yaml
index 702f932ae..cf451a9c9 100644
--- a/clusters/cl01tl/helm/directus/values.yaml
+++ b/clusters/cl01tl/helm/directus/values.yaml
@@ -232,9 +232,10 @@ postgres-18-cluster:
       #   schedule: "0 0 0 * * *"
       #   backupName: external
 valkey:
-  auth:
-    enabled: true
-    usersExistingSecret: directus-valkey-config
-    aclUsers:
-      default:
-        permissions: "~* &* +@all"
+  valkey:
+    auth:
+      enabled: true
+      usersExistingSecret: directus-valkey-config
+      aclUsers:
+        default:
+          permissions: "~* &* +@all"
diff --git a/clusters/cl01tl/helm/gitea/values.yaml b/clusters/cl01tl/helm/gitea/values.yaml
index 0f93011ec..13309cf2e 100644
--- a/clusters/cl01tl/helm/gitea/values.yaml
+++ b/clusters/cl01tl/helm/gitea/values.yaml
@@ -235,19 +235,21 @@ postgres-18-cluster:
       #   schedule: "0 0 0 * * *"
       #   backupName: external
 valkey-gitea:
-  resources:
-    requests:
-      cpu: 20m
-      memory: 256Mi
-  dataStorage:
-    requestedSize: 10Gi
-  replica:
-    persistence:
-      size: 10Gi
+  valkey:
+    resources:
+      requests:
+        cpu: 20m
+        memory: 256Mi
+    dataStorage:
+      requestedSize: 10Gi
+    replica:
+      persistence:
+        size: 10Gi
 valkey-renovate:
-  nameOverride: valkey-renovate
-  replica:
-    enabled: false
+  valkey:
+    nameOverride: valkey-renovate
+    replica:
+      enabled: false
 volsync-target-storage:
   pvcTarget: gitea-shared-storage
   moverSecurityContext:
diff --git a/clusters/cl01tl/helm/grafana-operator/values.yaml b/clusters/cl01tl/helm/grafana-operator/values.yaml
index 80b1837b3..8842f8ba8 100644
--- a/clusters/cl01tl/helm/grafana-operator/values.yaml
+++ b/clusters/cl01tl/helm/grafana-operator/values.yaml
@@ -55,8 +55,10 @@ postgres-18-cluster:
       #   schedule: "0 0 0 * * *"
       #   backupName: external
 valkey-unified-alerting:
-  nameOverride: valkey-unified-alerting
+  valkey:
+    nameOverride: valkey-unified-alerting
 valkey-remote-cache:
-  nameOverride: valkey-remote-cache
-  replica:
-    enabled: false
+  valkey:
+    nameOverride: valkey-remote-cache
+    replica:
+      enabled: false
diff --git a/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml b/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml
index 9cb4d5a86..cd42aefeb 100644
--- a/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml
+++ b/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml
@@ -171,8 +171,9 @@ ntfy-alertmanager:
               mountPropagation: None
               subPath: config
 valkey:
-  dataStorage:
-    requestedSize: 10Gi
-  replica:
-    persistence:
-      size: 10Gi
+  valkey:
+    dataStorage:
+      requestedSize: 10Gi
+    replica:
+      persistence:
+        size: 10Gi
diff --git a/clusters/cl01tl/helm/matrix-synapse/Chart.lock b/clusters/cl01tl/helm/matrix-synapse/Chart.lock
index 3228f9145..d057a6f77 100644
--- a/clusters/cl01tl/helm/matrix-synapse/Chart.lock
+++ b/clusters/cl01tl/helm/matrix-synapse/Chart.lock
@@ -20,12 +20,12 @@ dependencies:
 - name: postgres-cluster
   repository: oci://harbor.alexlebens.net/helm-charts
   version: 7.8.0
-- name: redis-replication
+- name: valkey
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.1.0
-- name: redis-replication
+  version: 0.2.0
+- name: valkey
   repository: oci://harbor.alexlebens.net/helm-charts
-  version: 1.1.0
+  version: 0.2.0
 - name: volsync-target
   repository: oci://harbor.alexlebens.net/helm-charts
   version: 0.8.0
@@ -38,5 +38,5 @@ dependencies:
 - name: volsync-target
   repository: oci://harbor.alexlebens.net/helm-charts
   version: 0.8.0
-digest: sha256:bec6b763eb21c34c9d09b03a55f4ba3543a786b9ff09211b4d22416b8db03007
-generated: "2026-03-06T01:11:18.558642269Z"
+digest: sha256:8a0b365b092cd6dd5cba5351e412ff900cd132b71035e19627344a5481d33168
+generated: "2026-03-05T22:39:38.64823-06:00"
diff --git a/clusters/cl01tl/helm/matrix-synapse/Chart.yaml b/clusters/cl01tl/helm/matrix-synapse/Chart.yaml
index 9bfbc8e9c..a89d70362 100644
--- a/clusters/cl01tl/helm/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/Chart.yaml
@@ -55,13 +55,13 @@ dependencies:
     alias: postgres-18-cluster
     version: 7.8.0
     repository: oci://harbor.alexlebens.net/helm-charts
-  - name: redis-replication
-    alias: redis-replication-matrix-synapse
-    version: 1.1.0
+  - name: valkey
+    alias: valkey-matrix-synapse
+    version: 0.2.0
     repository: oci://harbor.alexlebens.net/helm-charts
-  - name: redis-replication
-    alias: redis-replication-hookshot
-    version: 1.1.0
+  - name: valkey
+    alias: valkey-hookshot
+    version: 0.2.0
     repository: oci://harbor.alexlebens.net/helm-charts
   - name: volsync-target
     alias: volsync-target-synapse
diff --git a/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml b/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml
index fe5cd2aa1..9c8cc7500 100644
--- a/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/templates/external-secret.yaml
@@ -180,10 +180,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: matrix-synapse-redis-secret
+  name: matrix-synapse-valkey-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-redis-secret
+    app.kubernetes.io/name: matrix-synapse-valkey-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -191,6 +191,13 @@ spec:
     kind: ClusterSecretStore
     name: vault
   data:
+    - secretKey: default
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/matrix-synapse/redis
+        metadataPolicy: None
+        property: password
     - secretKey: password
       remoteRef:
         conversionStrategy: Default
diff --git a/clusters/cl01tl/helm/matrix-synapse/values.yaml b/clusters/cl01tl/helm/matrix-synapse/values.yaml
index db9bc979d..7225c7221 100644
--- a/clusters/cl01tl/helm/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/values.yaml
@@ -112,9 +112,9 @@ matrix-synapse:
   redis:
     enabled: false
   externalRedis:
-    host: redis-replication-matrix-synapse-master
+    host: matrix-synapse-valkey
     port: 6379
-    existingSecret: matrix-synapse-redis-secret
+    existingSecret: matrix-synapse-valkey-secret
     existingSecretPasswordKey: password
   persistence:
     enabled: true
@@ -453,22 +453,17 @@ postgres-18-cluster:
     - name: mautrix-whatsapp
       ensure: present
       owner: app
-redis-replication-matrix-synapse:
-  replicationNameOverride: redis-replication-matrix-synapse
-  existingSecret:
-    enabled: true
-    name: matrix-synapse-redis-secret
-    key: password
-  redisReplication:
-    clusterSize: 3
-    sentinel:
-      enabled: true
-redis-replication-hookshot:
-  replicationNameOverride: redis-replication-hookshot
-  redisReplication:
-    clusterSize: 3
-    sentinel:
+valkey-matrix-synapse:
+  valkey:
+    auth:
       enabled: true
+      usersExistingSecret: matrix-synapse-valkey-secret
+      aclUsers:
+        default:
+          permissions: "~* &* +@all"
+valkey-hookshot:
+  valkey:
+    nameOverride: valkey-hookshot
 volsync-target-synapse:
   pvcTarget: matrix-synapse
   local:
diff --git a/clusters/cl01tl/helm/postiz/values.yaml b/clusters/cl01tl/helm/postiz/values.yaml
index c62eb4c7a..d5deebf80 100644
--- a/clusters/cl01tl/helm/postiz/values.yaml
+++ b/clusters/cl01tl/helm/postiz/values.yaml
@@ -168,12 +168,13 @@ postgres-18-cluster:
       #   schedule: "0 0 0 * * *"
       #   backupName: external
 valkey:
-  auth:
-    enabled: true
-    usersExistingSecret: postiz-valkey-config
-    aclUsers:
-      default:
-        permissions: "~* &* +@all"
+  valkey:
+    auth:
+      enabled: true
+      usersExistingSecret: postiz-valkey-config
+      aclUsers:
+        default:
+          permissions: "~* &* +@all"
 volsync-target-config:
   pvcTarget: postiz-config
   local:
diff --git a/clusters/cl01tl/helm/tubearchivist/values.yaml b/clusters/cl01tl/helm/tubearchivist/values.yaml
index 9d4133d2b..236cf0d8b 100644
--- a/clusters/cl01tl/helm/tubearchivist/values.yaml
+++ b/clusters/cl01tl/helm/tubearchivist/values.yaml
@@ -152,12 +152,13 @@ tubearchivist:
             - path: /youtube
               readOnly: false
 valkey:
-  resources:
-    requests:
-      cpu: 100m
-      memory: 1Gi
-  dataStorage:
-    requestedSize: 10Gi
-  replica:
-    persistence:
-      size: 10Gi
+  valkey:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 1Gi
+    dataStorage:
+      requestedSize: 10Gi
+    replica:
+      persistence:
+        size: 10Gi