diff --git a/configurations/camelot/default.nix b/configurations/camelot/default.nix
index 7956c28..6772015 100644
--- a/configurations/camelot/default.nix
+++ b/configurations/camelot/default.nix
@@ -12,7 +12,6 @@
     ./wireguard.nix
     ./nextcloud.nix
     ./gotosocial.nix
-    ./matrix.nix
     ./forgejo.nix
   ];
 
@@ -46,7 +45,6 @@
       nextcloud_admin_pw = {
         owner = config.users.users.nextcloud.name;
       };
-      discord_bridge_token = { };
       gotosocial_env = {
         owner = config.users.users.gotosocial.name;
       };
diff --git a/configurations/camelot/matrix.nix b/configurations/camelot/matrix.nix
deleted file mode 100644
index 9c253bc..0000000
--- a/configurations/camelot/matrix.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ config, ... }:
-let
-  conduitConfig = config.services.matrix-conduit.settings;
-in
-{
-  services.matrix-conduit = {
-    enable = true;
-
-    settings = {
-      global = {
-        server_name = "dalaran.fr";
-        address = "127.0.0.1";
-        database_backend = "rocksdb";
-
-        enable_lightning_bolt = false;
-        allow_registration = false;
-        well_known = {
-          client = "https://matrix.dalaran.fr";
-          server = "matrix.dalaran.fr:443";
-        };
-      };
-    };
-  };
-
-  services.nginx.virtualHosts = {
-    "dalaran.fr".locations."/.well-known/matrix/" = {
-      return = "301 https://matrix.dalaran.fr$request_uri";
-    };
-
-    "matrix.dalaran.fr" = {
-      enableACME = true;
-      addSSL = true;
-      listen = [
-        {
-          addr = "0.0.0.0";
-          port = 8448;
-          ssl = true;
-        }
-        {
-          addr = "[::]";
-          port = 8448;
-          ssl = true;
-        }
-        {
-          addr = "0.0.0.0";
-          port = 443;
-          ssl = true;
-        }
-        {
-          addr = "[::]";
-          port = 443;
-          ssl = true;
-        }
-      ];
-
-      locations."/" = {
-        recommendedProxySettings = true;
-        proxyPass = "http://${conduitConfig.global.address}:${builtins.toString conduitConfig.global.port}";
-      };
-
-      extraConfig = "client_max_body_size 20M;";
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [
-    443
-    8448
-  ];
-
-  services.matrix-appservice-discord = {
-    enable = true;
-    settings = {
-      bridge = {
-        domain = "dalaran.fr";
-        homeserverUrl = "https://matrix.dalaran.fr";
-        disableTypingNotifications = true;
-        disableJoinLeaveNotifications = true;
-        adminMxid = "dala@dalaran.fr";
-      };
-
-      ghosts = {
-        usernamePattern = ":username";
-      };
-
-      auth = {
-        usePrivilegedIntents = true;
-      };
-
-      room = {
-        defaultVisibility = "private";
-      };
-    };
-    environmentFile = config.sops.secrets.discord_bridge_token.path;
-
-    serviceDependencies = [ "conduit.service" ];
-  };
-}
diff --git a/configurations/camelot/secrets/secrets.yaml b/configurations/camelot/secrets/secrets.yaml
index 4ae743b..e11b7bd 100644
--- a/configurations/camelot/secrets/secrets.yaml
+++ b/configurations/camelot/secrets/secrets.yaml
@@ -1,7 +1,6 @@
 wg0_private: ENC[AES256_GCM,data:nuHHAwi+l9BQ8oJupm+i47EbfFc62QZXDeATeE+23RAEq/grJ/bN6sTn/o4=,iv:hZQAvvcCe2DOTvM1mABB26PsEqw8jpQUNhGbBaK/l0I=,tag:9VMaJys4IzelbBdCDuiy0Q==,type:str]
 wg1_private: ENC[AES256_GCM,data:tpetT5qyude2G1hRt4lPONhJMSSdHt6V92yY/NhgeZRQkZZg9WIdHAMI2JM=,iv:78Sn0Thki4LkHBM37x618Oc3FjztYoXEzMSoRQGmnFk=,tag:RV9cYT1A68gBrPpwS0npIg==,type:str]
 nextcloud_admin_pw: ENC[AES256_GCM,data:MKD4sEOfpvd0GWcA/CHcbV5/uLI=,iv:4WJ0S9OvumWZu4i5EYkX+b3OCODKc7IkUzWsd1GtngA=,tag:phIRRR8dTFwCGwUps3P7tQ==,type:str]
-discord_bridge_token: ENC[AES256_GCM,data:2ZVIjMjRLuQbTgzJc7DLpkapAIR4ntbvaw+bqFQLNQd1FKdnf9V7+Zk1AhkGfV5gOyA7ezXvexLQHYN5ACL4vMwghke7x3cyKjUteDq2EpjFZzrA9ZljUdBE6JMq8xbFWHr3wi+27dPFaA==,iv:fxHTLOYCJxd8rJFHzWM0+XgACGOjdNYauPqdVBiR648=,tag:eRJgBcXT6MsVDMurWRFocA==,type:str]
 gotosocial_env: ENC[AES256_GCM,data:rs48GFvnQs5qi+Omn0kIHuYtn/P9mLM5D/RAW6MQ7k4MX7aqEcgqrl50GObxDRnvMGQdS6KkJ1rL/a2DjfzP2SAghpvNNu7H82lKKFTfckE5I5PMzvwzSTviMM5kg6Min/glHKurI4ROZYZLb11myq4JsTtYm+8OQUTfLauj/ilr5BiprKDgUDO7Ubon+FMQF5n8bpHSP8bH8hK5+ihY6WeTRGhdGqr/gEqM,iv:69f1KEHVBKgzBH07LwWAkkUjlfqv+peQ/f2VIZYSHAk=,tag:tBkgrR8hQsDWHKwqelrNAA==,type:str]
 sops:
     kms: []
@@ -18,8 +17,8 @@ sops:
             b00xT3ZHWTJBNFlUbTUrRjlVV0FoM1UKtfWg4R4Y28r2w8MYp1B1yhFEOBT8rEkz
             P5qEP0p1i/zXlglaxxXTiQSuloG1Fwi2l5VGrhm6Hse07u3fEmS2VQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-07-27T06:50:01Z"
-    mac: ENC[AES256_GCM,data:JlIxhbA3o/Zc0yrE1tWIA3mohcUDzTpwwYC0S/9KP6SY2WTrFbIw60MN8YBqMzlZQZINfaNY3uYGZMHUPIoCmdOhM9CEevTHzKz+OgkcRnQUBR2doU+wAQol64ZasM0lskQ8KzLe9P5cZoJTlYUdX4eLgCJD2R74z2P07C/YFN0=,iv:L3i/YAS3xpVxsSGLiYnvySsvgBdoCdnsBWSJ6tD8FXw=,tag:8/MGD2gJ3NOMA7Am8Ka6Fg==,type:str]
+    lastmodified: "2024-12-02T21:36:00Z"
+    mac: ENC[AES256_GCM,data:HMChIWnGBT9Ge61OyF94BKDhoOc2xqWRy68/iUHl9h5lP15lK2C8WhpnZi4YEkWzpQA6ys7QiOGBc6ebH63sgXyPmGWwBh0Gxjk/K3ioqwKY3pRQYURpOK9D4FsA06G3I6Ml5Xo32EwoALMIZ0iWUzhuHdLVAmd21eozqEql6O4=,iv:/PnWIS2OVOzGqU7EFaSxi2abOaRYWbvhFvN7v+9Tx7k=,tag:Tnq5hU3hTCrt0UhroKYxLg==,type:str]
     pgp:
         - created_at: "2023-12-10T17:24:42Z"
           enc: |
@@ -34,4 +33,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 2763F2B50E63CE401A3EB9C040DE2FEE4D3C5E2C
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.9.1