diff --git a/configuration.nix b/configuration.nix
index a400d04..0292a3b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,7 @@
     ./modules/hardware.nix
     ./modules/services.nix
     ./modules/proxy.nix
-    # ./modules/matrix.nix
+    ./modules/matrix.nix
     ./modules/fail2ban.nix
   ];
 
diff --git a/modules/matrix.nix b/modules/matrix.nix
index fd6568d..ca0334c 100644
--- a/modules/matrix.nix
+++ b/modules/matrix.nix
@@ -7,7 +7,7 @@ let
   matrixRtcDomain = "matrixrtc.atri.dad";
 in
 {
-  services.matrix-tuwunel = {
+  services.matrix-continuwuity = {
     enable = true;
     settings = {
       global = {
@@ -18,9 +18,11 @@ in
         ];
         port = [ 6167 ];
         max_request_size = 104857600;
-        allow_registration = false;
+        allow_registration = true;
         allow_encryption = true;
         allow_federation = true;
+        new_user_displayname_suffix = "";
+        log_to_journald = true;
         trusted_servers = [
           "matrix.org"
           "chat.blahaj.zone"
@@ -45,12 +47,16 @@ in
 
         allow_local_presence = true;
         allow_incoming_presence = true;
-        allow_outgoing_presence = true;
+        allow_outgoing_presence = false;
+        allow_device_name_federation = false;
 
         well_known = {
           server = "${matrixDomain}:443";
           client = "https://${matrixDomain}";
-          rtc_transports = [
+        };
+
+        matrix_rtc = {
+          foci = [
             {
               type = "livekit";
               livekit_service_url = "https://${matrixDomain}/livekit/jwt";