diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml
index e251b7066..64c1418eb 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml
@@ -4,29 +4,33 @@ metadata:
   name: redis-replication-hookshot
   namespace: matrix-synapse
   labels:
+    helm.sh/chart: redis-replication-hookshot-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: redis-replication-hookshot
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
 spec:
   clusterSize: 3
   podSecurityContext:
-    runAsUser: 1000
     fsGroup: 1000
+    runAsUser: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: "quay.io/opstree/redis:v8.4.0"
     imagePullPolicy: IfNotPresent
     resources:
       requests:
-        cpu: 50m
-        memory: 128Mi
+        cpu: 10m
+        memory: 32Mi
   storage:
     volumeClaimTemplate:
       spec:
-        storageClassName: ceph-block
-        accessModes: ["ReadWriteOnce"]
+        accessModes:
+          - ReadWriteOnce
         resources:
           requests:
             storage: 1Gi
+        storageClassName: ceph-block
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: "quay.io/opstree/redis-exporter:v1.80.1"
diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml
index 36cc03ad0..41cade9b9 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml
@@ -4,32 +4,36 @@ metadata:
   name: redis-replication-matrix-synapse
   namespace: matrix-synapse
   labels:
+    helm.sh/chart: redis-replication-matrix-synapse-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: redis-replication-matrix-synapse
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
 spec:
   clusterSize: 3
   podSecurityContext:
-    runAsUser: 1000
     fsGroup: 1000
+    runAsUser: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v8.4.0
+    image: "quay.io/opstree/redis:v8.4.0"
     imagePullPolicy: IfNotPresent
+    resources:
+      requests:
+        cpu: 10m
+        memory: 32Mi
     redisSecret:
       name: matrix-synapse-redis-secret
       key: password
-    resources:
-      requests:
-        cpu: 50m
-        memory: 128Mi
   storage:
     volumeClaimTemplate:
       spec:
-        storageClassName: ceph-block
-        accessModes: ["ReadWriteOnce"]
+        accessModes:
+          - ReadWriteOnce
         resources:
           requests:
             storage: 1Gi
+        storageClassName: ceph-block
   redisExporter:
     enabled: true
-    image: quay.io/opstree/redis-exporter:v1.80.1
+    image: "quay.io/opstree/redis-exporter:v1.80.1"
diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml
index 6591fc0c5..c0caa86c7 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml
@@ -4,20 +4,26 @@ metadata:
   name: redis-sentinel-hookshot
   namespace: matrix-synapse
   labels:
+    helm.sh/chart: redis-replication-hookshot-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: redis-sentinel-hookshot
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
 spec:
   clusterSize: 3
   podSecurityContext:
-    runAsUser: 1000
     fsGroup: 1000
+    runAsUser: 1000
   redisSentinelConfig:
     redisReplicationName: redis-replication-hookshot
   kubernetesConfig:
-    image: quay.io/opstree/redis-sentinel:v8.4.0
+    image: "quay.io/opstree/redis-sentinel:v8.4.0"
     imagePullPolicy: IfNotPresent
     resources:
       requests:
         cpu: 10m
-        memory: 128Mi
+        memory: 32Mi
+  redisExporter:
+    enabled: true
+    image: "quay.io/opstree/redis-exporter:v1.80.1"
diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml
index 8c46f1ded..8aa5b9b46 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml
@@ -4,14 +4,17 @@ metadata:
   name: redis-sentinel-matrix-synapse
   namespace: matrix-synapse
   labels:
+    helm.sh/chart: redis-replication-matrix-synapse-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: redis-sentinel-matrix-synapse
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
 spec:
   clusterSize: 3
   podSecurityContext:
-    runAsUser: 1000
     fsGroup: 1000
+    runAsUser: 1000
   redisSentinelConfig:
     redisReplicationName: redis-replication-matrix-synapse
     redisReplicationPassword:
@@ -19,12 +22,15 @@ spec:
         name: matrix-synapse-redis-secret
         key: password
   kubernetesConfig:
-    image: quay.io/opstree/redis-sentinel:v8.4.0
+    image: "quay.io/opstree/redis-sentinel:v8.4.0"
     imagePullPolicy: IfNotPresent
-    redisSecret:
-      name: matrix-synapse-redis-secret
-      key: password
     resources:
       requests:
         cpu: 10m
-        memory: 128Mi
+        memory: 32Mi
+    redisSecret:
+      name: matrix-synapse-redis-secret
+      key: password
+  redisExporter:
+    enabled: true
+    image: "quay.io/opstree/redis-exporter:v1.80.1"
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml
new file mode 100644
index 000000000..71d87a9ed
--- /dev/null
+++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-hookshot
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: redis-replication-hookshot-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: redis-replication-hookshot
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+spec:
+  selector:
+    matchLabels:
+      app: redis-replication-hookshot
+      redis_setup_type: replication
+      role: replication
+  endpoints:
+    - port: redis-exporter
+      interval: 30s
+      scrapeTimeout: 10s
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml
index 9fe53ceb3..3bc53f6fd 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml
@@ -4,15 +4,18 @@ metadata:
   name: redis-replication-matrix-synapse
   namespace: matrix-synapse
   labels:
+    helm.sh/chart: redis-replication-matrix-synapse-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: redis-replication-matrix-synapse
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    redis-operator: "true"
-    env: production
 spec:
   selector:
     matchLabels:
+      app: redis-replication-matrix-synapse
       redis_setup_type: replication
+      role: replication
   endpoints:
     - port: redis-exporter
       interval: 30s
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml
new file mode 100644
index 000000000..4b0a375ff
--- /dev/null
+++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-sentinel-hookshot
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: redis-replication-hookshot-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: redis-sentinel-hookshot
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+spec:
+  selector:
+    matchLabels:
+      app: redis-sentinel-hookshot
+      redis_setup_type: sentinel
+      role: sentinel
+  endpoints:
+    - port: sentinel-client
+      interval: 30s
+      scrapeTimeout: 10s
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml
new file mode 100644
index 000000000..e7297eea6
--- /dev/null
+++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-sentinel-matrix-synapse
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: redis-replication-matrix-synapse-0.5.0
+    app.kubernetes.io/version: "0.5.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: redis-sentinel-matrix-synapse
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+spec:
+  selector:
+    matchLabels:
+      app: redis-sentinel-matrix-synapse
+      redis_setup_type: sentinel
+      role: sentinel
+  endpoints:
+    - port: sentinel-client
+      interval: 30s
+      scrapeTimeout: 10s