diff --git a/modules/common/matrix.nix b/modules/common/matrix.nix
index c71ba37..5e865bd 100644
--- a/modules/common/matrix.nix
+++ b/modules/common/matrix.nix
@@ -8,14 +8,14 @@
       [ matrix-synapse-mjolnir-antispam ];
 
     settings = rec {
-      server_name = "coded.codes";
+      server_name = "clicks.codes";
       auto_join_rooms = [ "#general:${server_name}" ];
       enable_registration = true;
       registration_requires_token = true;
       allow_public_rooms_over_federation = true;
       allow_device_name_lookup_over_federation = true;
       registration_shared_secret = "!!registration_shared_secret!!";
-      public_baseurl = "https://matrix-backend.coded.codes/";
+      public_baseurl = "https://matrix-backend.clicks.codes/";
       max_upload_size = "100M";
       listeners = [{
         x_forwarded = true;
@@ -28,12 +28,31 @@
       }];
       enable_metrics = true;
       database.args.database = "synapse";
+
+      oidc_providers = [
+        {
+          idp_id = "keycloak";
+          idp_name = "Clicks Keycloak";
+          issuer = "https://login.clicks.codes/realms/master";
+          client_id = "matrix";
+          client_secret = "!!matrix_keycloak_client_secret!!";
+          scopes = [ "openid" "profile" ];
+          user_mapping_provider = {
+            config = {
+              localpart_template = "{{ user.preferred_username }}";
+              display_name_template = "{{ user.name }}";
+            };
+          };
+          backchannel_logout_enabled = true;
+        }
+      ];
+
       turn_uris = [
 
-        /* "turn:turn.coded.codes:3478?transport=udp"
-           "turn:turn.coded.codes:3478?transport=tcp"
-           "turns:turn.coded.codes:5349?transport=udp"
-           "turns:turn.coded.codes:5349?transport=tcp"
+        /* "turn:turn.clicks.codes:3478?transport=udp"
+           "turn:turn.clicks.codes:3478?transport=tcp"
+           "turns:turn.clicks.codes:5349?transport=udp"
+           "turns:turn.clicks.codes:5349?transport=tcp"
         */
       ]; # Please use matrix.org turn
       # turn_shared_secret = "!!turn_shared_secret!!";
@@ -66,7 +85,7 @@
   networking.firewall.allowedUDPPorts = [ 3478 5349 ];
 
   services.mjolnir = {
-    enable = true;
+    enable = false;
 
     settings = {
       autojoinOnlyIfManager = true;
@@ -76,7 +95,7 @@
       admin.enableMakeRoomAdminCommand = true;
       allowNoPrefix = true;
       protections.wordlist.words = [ ];
-      protectedRooms = [ "https://matrix.to/#/#global:coded.codes" ];
+      protectedRooms = [ "https://matrix.to/#/#global:clicks.codes" ];
     };
 
     pantalaimon = {
@@ -91,7 +110,7 @@
 
     homeserverUrl = "http://localhost:4527";
 
-    managementRoom = "#moderation-commands:coded.codes";
+    managementRoom = "#moderation-commands:clicks.codes";
   };
 
   services.coturn = {
@@ -100,14 +119,14 @@
     use-auth-secret = true;
     # static-auth-secret-file = config.sops.secrets.turn_shared_secret.path;
 
-    realm = "turn.coded.codes";
+    realm = "turn.clicks.codes";
 
     no-tcp-relay = true;
 
     no-cli = true;
 
     extraConfig = ''
-      external-ip=turn.coded.codes
+      external-ip=turn.clicks.codes
     '';
   };
 
@@ -119,6 +138,13 @@
     #  sopsFile = ../../secrets/matrix.json;
     #  format = "json";
     #};
+    matrix_keycloak_client_secret = {
+      mode = "0400";
+      owner = config.users.users.matrix-synapse.name;
+      group = config.users.users.matrix-synapse.group;
+      sopsFile = ../../secrets/matrix.json;
+      format = "json";
+    };
     registration_shared_secret = {
       mode = "0400";
       owner = config.users.users.root.name;
@@ -134,13 +160,13 @@
       format = "binary";
       path = config.services.matrix-synapse.settings.signing_key_path;
     };
-    mjolnir_password = {
+    /*mjolnir_password = {
       mode = "0600";
       owner = config.users.users.mjolnir.name;
       group = config.users.users.mjolnir.group;
       sopsFile = ../../secrets/matrix.json;
       format = "json";
-    };
+    };*/
   };
 } (let isDerived = base != null;
 in if isDerived
@@ -153,6 +179,8 @@
       source = toString synapse_cfgfile;
       matchers."registration_shared_secret".secret =
         config.sops.secrets.registration_shared_secret.path;
+      matchers."matrix_keycloak_client_secret".secret =
+        config.sops.secrets.matrix_keycloak_client_secret.path;
       # matchers."turn_shared_secret".secret =
       #   config.sops.secrets.turn_shared_secret.path;
       owner = config.users.users.matrix-synapse.name;