diff --git a/clusters/cl01tl/manifests/directus/Deployment-directus.yaml b/clusters/cl01tl/manifests/directus/Deployment-directus.yaml
index b23cf0b90..c1c0f6a2a 100644
--- a/clusters/cl01tl/manifests/directus/Deployment-directus.yaml
+++ b/clusters/cl01tl/manifests/directus/Deployment-directus.yaml
@@ -165,7 +165,6 @@ spec:
                   key: metric-token
                   name: directus-metric-token
           image: ghcr.io/directus/directus:11.17.1@sha256:1dd2080a50a9f6df2b6f49df15a7734424bbd1a5902983c4b6e447f22027b80b
-          imagePullPolicy: IfNotPresent
           name: main
           resources:
             requests:
diff --git a/clusters/cl01tl/manifests/foldergram/Deployment-foldergram.yaml b/clusters/cl01tl/manifests/foldergram/Deployment-foldergram.yaml
index ef538a689..518805edb 100644
--- a/clusters/cl01tl/manifests/foldergram/Deployment-foldergram.yaml
+++ b/clusters/cl01tl/manifests/foldergram/Deployment-foldergram.yaml
@@ -49,7 +49,6 @@ spec:
             - name: CSRF_TRUSTED_ORIGINS
               value: https://foldergram.alexlebens.net
           image: ghcr.io/foldergram/foldergram:1.1.0@sha256:b08c7f30a15a3d3e4cf0877a5271cb76be6a36ab83751f040c115ccdb76b736a
-          imagePullPolicy: IfNotPresent
           name: main
           resources:
             requests:
diff --git a/clusters/cl01tl/manifests/loki/ServiceMonitor-loki-alloy.yaml b/clusters/cl01tl/manifests/loki/ServiceMonitor-loki-alloy.yaml
new file mode 100644
index 000000000..68e426c29
--- /dev/null
+++ b/clusters/cl01tl/manifests/loki/ServiceMonitor-loki-alloy.yaml
@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: loki-alloy
+  namespace: loki
+  labels:
+    helm.sh/chart: alloy-1.7.0
+    app.kubernetes.io/name: alloy
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/version: "v1.15.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: alloy
+    app.kubernetes.io/component: metrics
+spec:
+  endpoints:
+    - port: http-metrics
+      scheme: http
+      honorLabels: true
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: alloy
+      app.kubernetes.io/instance: loki
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml
index 94b6c114d..97c7d436f 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -26,8 +26,8 @@ spec:
     limits:
       hugepages-2Mi: 256Mi
     requests:
-      cpu: 200m
-      memory: 256Mi
+      cpu: 20m
+      memory: 80Mi
   affinity:
     enablePodAntiAffinity: true
     topologyKey: kubernetes.io/hostname
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml
index 221074035..f0beb2a3a 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: matrix-synapse-postgresql-18-database-mautrix-discord
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   name: mautrix-discord
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml
deleted file mode 100644
index 998eb4d25..000000000
--- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: matrix-synapse-postgresql-18-database-mautrix-whatsapp
-  namespace: matrix-synapse
-  labels:
-    app.kubernetes.io/name: matrix-synapse-postgresql-18-database-mautrix-whatsapp
-    helm.sh/chart: postgres-18-cluster-7.10.0
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  name: mautrix-whatsapp
-  cluster:
-    name: matrix-synapse-postgresql-18-cluster
-  ensure: present
-  owner: app
-  template: template1
-  encoding: UTF8
-  databaseReclaimPolicy: retain
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-hookshot.yaml
index 5e4066d58..3d808478b 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-hookshot.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-hookshot.yaml
@@ -34,13 +34,12 @@ spec:
       hostPID: false
       dnsPolicy: ClusterFirst
       containers:
-        - image: halfshot/matrix-hookshot:7.3.2
-          imagePullPolicy: IfNotPresent
+        - image: halfshot/matrix-hookshot:7.3.2@sha256:44283e5131a1a5818bbbf6d9d1e07dccdc29ac5bb6002fcf159af6ac09cf8085
           name: main
           resources:
             requests:
-              cpu: 10m
-              memory: 128Mi
+              cpu: 5m
+              memory: 90Mi
           volumeMounts:
             - mountPath: /data/config.yml
               mountPropagation: None
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse-wellknown-lighttpd.yaml b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse-wellknown-lighttpd.yaml
index 9a3f23ee9..edfa4763c 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse-wellknown-lighttpd.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse-wellknown-lighttpd.yaml
@@ -28,7 +28,7 @@ spec:
       securityContext: {}
       containers:
         - name: lighttpd
-          image: "ghcr.io/rtsp/docker-lighttpd:latest"
+          image: "ghcr.io/rtsp/docker-lighttpd:1.4.76@sha256:b4b58d217a35dbd6cade82927677de404a46fb3d2b1d5fcb42042b6a6f17b2fb"
           imagePullPolicy: Always
           securityContext: {}
           ports:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse.yaml
index e93061a5d..53a47164f 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/Deployment-matrix-synapse.yaml
@@ -37,7 +37,7 @@ spec:
             - -c
             - |
               chown 666:666 -R /synapse/data
-          image: "alpine:latest"
+          image: "alpine:3.23.3@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659"
           imagePullPolicy: Always
           resources: {}
           securityContext:
@@ -73,7 +73,7 @@ spec:
                 secretKeyRef:
                   name: matrix-synapse-valkey-secret
                   key: password
-          image: "ghcr.io/element-hq/synapse:v1.150.0"
+          image: "ghcr.io/element-hq/synapse:v1.150.0@sha256:cba0969087ca70a3ec72ebcd1491a6c8391a7da2c0b92738231dd9c7ad55df4d"
           imagePullPolicy: IfNotPresent
           securityContext: {}
           ports:
@@ -139,7 +139,7 @@ spec:
           resources:
             requests:
               cpu: 10m
-              memory: 128Mi
+              memory: 130Mi
       volumes:
         - name: config
           configMap:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-double-puppet-registration-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-double-puppet-registration-secret.yaml
index 9eaa3a862..10c743973 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-double-puppet-registration-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-double-puppet-registration-secret.yaml
@@ -14,8 +14,5 @@ spec:
   data:
     - secretKey: double-puppet-registration.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/double-puppet
-        metadataPolicy: None
         property: registration
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-hookshot-config-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-hookshot-config-secret.yaml
index b6739e7f4..2114f7325 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-hookshot-config-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-hookshot-config-secret.yaml
@@ -14,29 +14,17 @@ spec:
   data:
     - secretKey: config.yml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/hookshot
-        metadataPolicy: None
         property: config
     - secretKey: registration.yml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/hookshot
-        metadataPolicy: None
         property: registration
     - secretKey: hookshot-registration.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/hookshot
-        metadataPolicy: None
         property: registration
     - secretKey: passkey.pem
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/hookshot
-        metadataPolicy: None
         property: passkey
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-config-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-config-secret.yaml
index 4284d9797..5b4465d12 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-config-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-config-secret.yaml
@@ -14,15 +14,9 @@ spec:
   data:
     - secretKey: oidc.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/config
-        metadataPolicy: None
         property: oidc.yaml
     - secretKey: config.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/config
-        metadataPolicy: None
         property: config.yaml
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml
index 16b508f67..00ca6815a 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-backup-garage-local-secret.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: matrix-synapse-postgresql-18-backup-garage-local-secret
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   secretStoreRef:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml
index a0b9ac6d6..c09673685 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-postgresql-18-recovery-secret.yaml
@@ -4,10 +4,10 @@ metadata:
   name: matrix-synapse-postgresql-18-recovery-secret
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: matrix-synapse-postgresql-18-recovery-secret
 spec:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-signingkey.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-signingkey.yaml
index 362460635..67d0f7d00 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-signingkey.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-signingkey.yaml
@@ -14,8 +14,5 @@ spec:
   data:
     - secretKey: signing.key
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/config
-        metadataPolicy: None
         property: signing-key
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-valkey-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-valkey-secret.yaml
index 69fe60ce8..319093632 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-valkey-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-matrix-synapse-valkey-secret.yaml
@@ -14,15 +14,9 @@ spec:
   data:
     - secretKey: default
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/redis
-        metadataPolicy: None
         property: password
     - secretKey: password
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/redis
-        metadataPolicy: None
         property: password
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-discord-config-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-discord-config-secret.yaml
index 7e2e5fbe5..5c603846e 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-discord-config-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-discord-config-secret.yaml
@@ -13,15 +13,9 @@ spec:
   data:
     - secretKey: config.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/mautrix-discord
-        metadataPolicy: None
         property: config
     - secretKey: mautrix-discord-registration.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/mautrix-discord
-        metadataPolicy: None
         property: registration
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-whatsapp-config-secret.yaml b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-whatsapp-config-secret.yaml
index 666800a60..978619d3f 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-whatsapp-config-secret.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ExternalSecret-mautrix-whatsapp-config-secret.yaml
@@ -14,15 +14,9 @@ spec:
   data:
     - secretKey: config.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/mautrix-whatsapp
-        metadataPolicy: None
         property: config
     - secretKey: mautrix-whatsapp-registration.yaml
       remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
         key: /cl01tl/matrix-synapse/mautrix-whatsapp
-        metadataPolicy: None
         property: registration
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml
index 2ca1b23ec..5cad64911 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-backup-garage-local.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: matrix-synapse-postgresql-18-backup-garage-local
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 7d
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml
index 9ed412fb3..c9501c8e0 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml
@@ -4,10 +4,10 @@ metadata:
   name: "matrix-synapse-postgresql-18-recovery"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: "matrix-synapse-postgresql-18-recovery"
 spec:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-matrix-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-matrix-hookshot.yaml
index e7e8c7c9f..645df9673 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-matrix-hookshot.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-matrix-hookshot.yaml
@@ -7,8 +7,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: matrix-hookshot
     helm.sh/chart: matrix-hookshot-4.6.2
-  annotations:
-    helm.sh/resource-policy: keep
   namespace: matrix-synapse
 spec:
   accessModes:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-discord.yaml b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-discord.yaml
index e9ba2e52c..97bb6c05b 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-discord.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-discord.yaml
@@ -7,8 +7,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: mautrix-discord
     helm.sh/chart: mautrix-discord-4.6.2
-  annotations:
-    helm.sh/resource-policy: keep
   namespace: matrix-synapse
 spec:
   accessModes:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-whatsapp.yaml b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-whatsapp.yaml
index cf877160a..c1e65261a 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-whatsapp.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/PersistentVolumeClaim-mautrix-whatsapp.yaml
@@ -7,8 +7,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: mautrix-whatsapp
     helm.sh/chart: mautrix-whatsapp-4.6.2
-  annotations:
-    helm.sh/resource-policy: keep
   namespace: matrix-synapse
 spec:
   accessModes:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml
index a4c202d2b..65776e138 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: matrix-synapse-postgresql-18-alert-rules
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:
diff --git a/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml b/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml
index 3568e8800..71619c24e 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-scheduled-backup-live-backup.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: matrix-synapse
   labels:
     app.kubernetes.io/name: "matrix-synapse-postgresql-18-scheduled-backup-live-backup"
-    helm.sh/chart: postgres-18-cluster-7.10.0
+    helm.sh/chart: postgres-18-cluster-7.11.1
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.10.0"
+    app.kubernetes.io/version: "7.11.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true
diff --git a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey-hookshot.yaml
index 6b0530466..b2df9cef7 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey-hookshot.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey-hookshot.yaml
@@ -95,7 +95,7 @@ spec:
           resources:
             requests:
               cpu: 10m
-              memory: 128Mi
+              memory: 20Mi
           volumeMounts:
             - name: valkey-data
               mountPath: /data
@@ -117,8 +117,8 @@ spec:
               port: metrics
           resources:
             requests:
-              cpu: 10m
-              memory: 64M
+              cpu: 1m
+              memory: 10M
           env:
             - name: REDIS_ALIAS
               value: matrix-synapse-valkey-hookshot
diff --git a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey.yaml b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey.yaml
index 05508d9b4..b7659bdae 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-matrix-synapse-valkey.yaml
@@ -100,7 +100,7 @@ spec:
           resources:
             requests:
               cpu: 10m
-              memory: 128Mi
+              memory: 20Mi
           volumeMounts:
             - name: valkey-data
               mountPath: /data
diff --git a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-discord.yaml b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-discord.yaml
index 6a269848d..8bef3d94c 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-discord.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-discord.yaml
@@ -36,13 +36,12 @@ spec:
       hostPID: false
       dnsPolicy: ClusterFirst
       containers:
-        - image: dock.mau.dev/mautrix/discord:v0.7.6
-          imagePullPolicy: IfNotPresent
+        - image: dock.mau.dev/mautrix/discord:v0.7.6@sha256:e4946b0df6a2786c88ed490e0d2692e352f1b79b9ff0e821a33764bd8bd1fffd
           name: main
           resources:
             requests:
-              cpu: 10m
-              memory: 128Mi
+              cpu: 1m
+              memory: 40Mi
           volumeMounts:
             - mountPath: /data
               name: data
diff --git a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-whatsapp.yaml b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-whatsapp.yaml
index 8e15ea0ac..57f4e6ef6 100644
--- a/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-whatsapp.yaml
+++ b/clusters/cl01tl/manifests/matrix-synapse/StatefulSet-mautrix-whatsapp.yaml
@@ -36,13 +36,12 @@ spec:
       hostPID: false
       dnsPolicy: ClusterFirst
       containers:
-        - image: dock.mau.dev/mautrix/whatsapp:v0.2602.0
-          imagePullPolicy: IfNotPresent
+        - image: dock.mau.dev/mautrix/whatsapp:v0.2602.0@sha256:07fca07f8746c09e6d5f486d002e638da014d0a134e053e2ed7af9875053104d
           name: main
           resources:
             requests:
-              cpu: 10m
-              memory: 64Mi
+              cpu: 1m
+              memory: 40Mi
           volumeMounts:
             - mountPath: /data
               name: data