diff --git a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
index a1ba1d89a..5a3adefaf 100644
--- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
@@ -15,6 +15,12 @@ dependencies:
   - name: matrix-hookshot
     version: 0.1.1
     repository: http://alexlebens.github.io/helm-charts
+  - name: mautrix-discord
+    version: 0.0.2
+    repository: http://alexlebens.github.io/helm-charts
+  - name: mautrix-whatsapp
+    version: 0.0.3
+    repository: http://alexlebens.github.io/helm-charts    
   - name: redis
     version: 19.1.2
     repository: https://charts.bitnami.com/bitnami
diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
index 814054d8b..d3b1a30b8 100644
--- a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
@@ -75,6 +75,84 @@ spec:
         metadataPolicy: None
         property: passkey
 
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+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 }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: config.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-discord
+        metadataPolicy: None
+        property: config
+    - secretKey: registration.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-discord
+        metadataPolicy: None
+        property: registration
+    - secretKey: mautrix-discord-registration.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-discord
+        metadataPolicy: None
+        property: registration
+
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+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 }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: config.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-whatsapp
+        metadataPolicy: None
+        property: config
+    - secretKey: registration.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-whatsapp
+        metadataPolicy: None
+        property: registration
+    - secretKey: mautrix-whatsapp-registration.yaml
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /matrix-synapse/mautrix-whatsapp
+        metadataPolicy: None
+        property: registration
+
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml
index 7e12c5ccb..e2452bfe4 100644
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -28,6 +28,12 @@ matrix-synapse:
       - name: matrix-hookshot-config-secret
         secret:
           secretName: matrix-hookshot-config-secret
+      - name: mautrix-discord-config-secret
+        secret:
+          secretName: mautrix-discord-config-secret
+      - name: mautrix-whatsapp-config-secret
+        secret:
+          secretName: mautrix-whatsapp-config-secret
     extraVolumeMounts:
       - name: matrix-synapse-config-secret
         mountPath: /synapse/config/conf.d/oidc.yaml
@@ -41,6 +47,14 @@ matrix-synapse:
         mountPath: /synapse/config/conf.d/hookshot-registration.yaml
         subPath: hookshot-registration.yaml
         readOnly: true
+      - name: mautrix-discord-config-secret
+        mountPath: /synapse/config/conf.d/mautrix-discord-registration.yaml
+        subPath: mautrix-discord-registration.yaml
+        readOnly: true
+      - name: mautrix-whatsapp-config-secret
+        mountPath: /synapse/config/conf.d/mautrix-whatsapp-registration.yaml
+        subPath: mautrix-whatsapp-registration.yaml
+        readOnly: true
     resources:
       requests:
         cpu: 100m
@@ -113,6 +127,36 @@ matrix-hookshot:
     existingSecret: matrix-hookshot-config-secret
     existingRegistrationSecret: matrix-hookshot-config-secret
     existingPasskeySecret: matrix-hookshot-config-secret
+mautrix-discord:
+  deployment:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
+  ingress:
+    enabled: false
+  persistence:
+    enabled: ture
+    storageClass: ceph-block
+    size: 500Mi
+  mautrixDiscord:
+    existingSecret: mautrix-discord-config-secret
+    existingRegistrationSecret: mautrix-discord-config-secret
+mautrix-whatsapp:
+  deployment:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
+  ingress:
+    enabled: false
+  persistence:
+    enabled: ture
+    storageClass: ceph-block
+    size: 500Mi
+  mautrixWhatsapp:
+    existingSecret: mautrix-whatsapp-config-secret
+    existingRegistrationSecret: mautrix-whatsapp-config-secret
 redis:
   architecture: standalone
   auth: