diff --git a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
index adbcfc0a2..39515e9c6 100644
--- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
@@ -35,16 +35,16 @@ dependencies:
     repository: https://ananace.gitlab.io/charts
   - name: app-template
     alias: matrix-hookshot
-    version: 3.7.3
+    version: 4.0.1
     repository: https://bjw-s-labs.github.io/helm-charts/
   # - name: app-template
   #   alias: mautrix-discord
   #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 3.6.1
+  #   version: 4.0.1
   # - name: app-template
   #   alias: mautrix-whatsapp
   #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 3.6.1
+  #   version: 4.0.1
   - name: valkey
     alias: valkey-synapse
     version: 3.0.6
@@ -55,11 +55,11 @@ dependencies:
     repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: cloudflared
     alias: cloudflared-synapse
-    version: 1.14.8
+    version: 1.15.0
     repository: oci://harbor.alexlebens.net/helm-charts
   - name: cloudflared
     alias: cloudflared-hookshot
-    version: 1.14.8
+    version: 1.15.0
     repository: oci://harbor.alexlebens.net/helm-charts
   - name: postgres-cluster
     alias: postgres-17-cluster
diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
index 4f06bffbf..6b96d333d 100644
--- a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: matrix-synapse-config-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-config-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -36,11 +33,8 @@ metadata:
   name: matrix-synapse-signingkey
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: 1.125.0
-    app.kubernetes.io/component: signingkey-job
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -61,11 +55,8 @@ metadata:
   name: matrix-hookshot-config-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-hookshot-config-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -106,12 +97,9 @@ spec:
 # metadata:
 #   name: mautrix-discord-config-secret
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-discord-config-secret
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: web
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -138,12 +126,9 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-config-secret
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-whatsapp-config-secret
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: web
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -171,11 +156,8 @@ metadata:
   name: double-puppet-registration-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: double-puppet-registration-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -196,11 +178,8 @@ metadata:
   name: matrix-synapse-valkey-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-valkey-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -221,11 +200,8 @@ metadata:
   name: matrix-synapse-cloudflared-synapse-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-cloudflared-synapse-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -246,11 +222,8 @@ metadata:
   name: matrix-synapse-cloudflared-hookshot-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-cloudflared-hookshot-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -271,11 +244,8 @@ metadata:
   name: matrix-synapse-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -329,12 +299,9 @@ spec:
 # metadata:
 #   name: mautrix-discord-data-backup-secret
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-discord-data-backup-secret
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: backup
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -388,12 +355,9 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-data-backup-secret
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-whatsapp-data-backup-secret
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: backup
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -448,11 +412,8 @@ metadata:
   name: matrix-synapse-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-postgresql-17-cluster-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: database
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml
index ad0f26e31..63650ca66 100644
--- a/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: matrix-synapse-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-backup-source
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   sourcePVC: matrix-synapse
   trigger:
@@ -32,12 +29,9 @@ spec:
 # metadata:
 #   name: mautrix-discord-data-backup-source
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-discord-data-backup-source
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: backup
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   sourcePVC: mautrix-discord-data
 #   trigger:
@@ -64,12 +58,9 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-data-backup-source
 #   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: mautrix-whatsapp-data-backup-source
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
-#     app.kubernetes.io/component: backup
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+  # labels:
+  #   app.kubernetes.io/name: {{ .Release.Name }}
+  #   app.kubernetes.io/instance: {{ .Release.Name }}
 # spec:
 #   sourcePVC: mautrix-whatsapp-data
 #   trigger:
diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml
index c91d7b9fd..a8e702ffd 100644
--- a/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml
@@ -4,11 +4,8 @@ metadata:
   name: matrix-synapse
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
@@ -27,11 +24,8 @@ metadata:
   name: matrix-hookshot
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-hookshot
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml
index cfc37819a..5ba689b62 100644
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -134,8 +134,6 @@ matrix-hookshot:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -209,8 +207,6 @@ mautrix-discord:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -260,8 +256,6 @@ mautrix-whatsapp:
             requests:
               cpu: 10m
               memory: 64Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main