diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml
index 89e076810..032629d54 100644
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -110,7 +110,7 @@ matrix-synapse:
     enabled: false
 matrix-hookshot:
   controllers:
-    main:
+    matrix-hookshot:
       type: deployment
       replicas: 1
       strategy: Recreate
@@ -129,9 +129,9 @@ matrix-hookshot:
     create: true
     name: mautrix-whatsapp
   service:
-    nameOverride: matrix-hookshot
     main:
-      controller: main
+      nameOverride: matrix-hookshot
+      controller: matrix-hookshot
       ports:
         webhook:
           port: 9000
@@ -155,7 +155,7 @@ matrix-hookshot:
       type: secret
       name: matrix-hookshot-config-secret
       advancedMounts:
-        main:
+        matrix-hookshot:
           main:
             - path: /data/config.yml
               readOnly: true
@@ -166,7 +166,7 @@ matrix-hookshot:
       type: secret
       name: matrix-hookshot-config-secret
       advancedMounts:
-        main:
+        matrix-hookshot:
           main:
             - path: /data/registration.yml
               readOnly: true
@@ -177,7 +177,7 @@ matrix-hookshot:
       type: secret
       name: matrix-hookshot-config-secret
       advancedMounts:
-        main:
+        matrix-hookshot:
           main:
             - path: /data/passkey.pem
               readOnly: true
@@ -185,7 +185,7 @@ matrix-hookshot:
               subPath: passkey.pem
 mautrix-discord:
   controllers:
-    main:
+    mautrix-discord:
       type: deployment
       replicas: 1
       strategy: Recreate
@@ -204,9 +204,9 @@ mautrix-discord:
     create: true
     name: mautrix-discord
   service:
-    nameOverride: mautrix-discord
     main:
-      controller: main
+      nameOverride: mautrix-discord
+      controller: mautrix-discord
       ports:
         http:
           port: 29334
@@ -219,7 +219,7 @@ mautrix-discord:
       size: 500Mi
       retain: true
       advancedMounts:
-        main:
+        mautrix-discord:
           main:
             - path: /data
               readOnly: false
@@ -228,7 +228,7 @@ mautrix-discord:
       type: secret
       name: mautrix-discord-config-secret
       advancedMounts:
-        main:
+        mautrix-discord:
           main:
             - path: /data/config.yml
               readOnly: true
@@ -236,7 +236,7 @@ mautrix-discord:
               subPath: config.yml
 mautrix-whatsapp:
   controllers:
-    main:
+    mautrix-whatsapp:
       type: deployment
       replicas: 1
       strategy: Recreate
@@ -255,9 +255,9 @@ mautrix-whatsapp:
     create: true
     name: mautrix-whatsapp
   service:
-    nameOverride: mautrix-whatsapp
     main:
-      controller: main
+      nameOverride: mautrix-whatsapp
+      controller: mautrix-whatsapp
       ports:
         http:
           port: 29334
@@ -270,7 +270,7 @@ mautrix-whatsapp:
       size: 500Mi
       retain: true
       advancedMounts:
-        main:
+        mautrix-whatsapp:
           main:
             - path: /data
               readOnly: false
@@ -279,7 +279,7 @@ mautrix-whatsapp:
       type: secret
       name: mautrix-whatsapp-config-secret
       advancedMounts:
-        main:
+        mautrix-whatsapp:
           main:
             - path: /data/config.yml
               readOnly: true