diff --git a/hosts/nixos/porthos/secrets/matrix/sliding-sync-secret.age b/hosts/nixos/porthos/secrets/matrix/sliding-sync-secret.age
deleted file mode 100644
index d375a35..0000000
--- a/hosts/nixos/porthos/secrets/matrix/sliding-sync-secret.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 cKojmg N182xey8TWRVUWTRP16rT0zlhYZNr/pOZVR7YRnlIkk
-HVqAag55z1cKLgjR3WsUj2wvaVjxm169JcDRJGRvCVU
--> ssh-ed25519 jPowng Dc+aaUTxDsMTY+oOst0SC3ldq1e6zX8F5A5uBL5RHhc
-JWZou6+VaFc5f2OLRIrmFFWg3Er6WSY+TloXU0mP1K8
--> |9_9Aqh%-grease $ X8Mn|5 aKnl' fl<D{T-
-+fAc0cajqxhYWu55HCY
---- SrmtWXQXGYxNTabSrb5tBRXHnK1F22Qoiy7hKYrrF+0
-ñD·û²:,õn0i�½Àß^ÆŠ`üÔ2Æ#y'ý9ÖñÓÒŽéÿæ�r]ÀØ›¹x“³S=ú°ˆôuJéEÛóc€lH Ê~eÅ‚›ŸKtévo'êv+
\ No newline at end of file
diff --git a/hosts/nixos/porthos/secrets/secrets.nix b/hosts/nixos/porthos/secrets/secrets.nix
index ed6c2fd..8eac0f5 100644
--- a/hosts/nixos/porthos/secrets/secrets.nix
+++ b/hosts/nixos/porthos/secrets/secrets.nix
@@ -35,9 +35,6 @@ in
     owner = "matrix-synapse";
     publicKeys = all;
   };
-  "matrix/sliding-sync-secret.age" = {
-    publicKeys = all;
-  };
 
   "miniflux/credentials.age".publicKeys = all;
 
diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix
index b187833..863048c 100644
--- a/hosts/nixos/porthos/services.nix
+++ b/hosts/nixos/porthos/services.nix
@@ -64,9 +64,6 @@ in
       mailConfigFile = secrets."matrix/mail".path;
       # Only necessary when doing the initial registration
       secretFile = secrets."matrix/secret".path;
-      slidingSync = {
-        secretFile = secrets."matrix/sliding-sync-secret".path;
-      };
     };
     miniflux = {
       enable = true;
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index c87b6e4..c73afed 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -13,7 +13,6 @@ let
   federationPort = { public = 8448; private = 11338; };
   clientPort = { public = 443; private = 11339; };
   domain = config.networking.domain;
-  matrixDomain = "matrix.${domain}";
 in
 {
   options.my.services.matrix = with lib; {
@@ -26,23 +25,6 @@ in
       description = "Shared secret to register users";
     };
 
-    slidingSync = {
-      enable = my.mkDisableOption "sliding sync";
-
-      port = mkOption {
-        type = types.port;
-        default = 8009;
-        example = 8084;
-        description = "Port used by sliding sync server";
-      };
-
-      secretFile = mkOption {
-        type = types.str;
-        example = "/var/lib/matrix/sliding-sync-secret-file.env";
-        description = "Secret file which contains SYNCV3_SECRET definition";
-      };
-    };
-
     mailConfigFile = mkOption {
       type = types.str;
       example = "/var/lib/matrix/email-config.yaml";
@@ -70,7 +52,7 @@ in
 
       settings = {
         server_name = domain;
-        public_baseurl = "https://${matrixDomain}";
+        public_baseurl = "https://matrix.${domain}";
 
         enable_registration = false;
 
@@ -106,17 +88,6 @@ in
       extraConfigFiles = [
         cfg.mailConfigFile
       ] ++ lib.optional (cfg.secretFile != null) cfg.secretFile;
-
-      sliding-sync = lib.mkIf cfg.slidingSync.enable {
-        enable = true;
-
-        settings = {
-          SYNCV3_SERVER = "https://${matrixDomain}";
-          SYNCV3_BINDADDR = "127.0.0.1:${cfg.slidingSync.port}";
-        };
-
-        environmentFile = cfg.slidingSync.secretFile;
-      };
     };
 
     my.services.nginx.virtualHosts = [
@@ -127,7 +98,7 @@ in
           conf = {
             default_server_config = {
               "m.homeserver" = {
-                "base_url" = "https://${matrixDomain}";
+                "base_url" = "https://matrix.${domain}";
                 "server_name" = domain;
               };
               "m.identity_server" = {
@@ -149,7 +120,7 @@ in
 
     # Those are too complicated to use my wrapper...
     services.nginx.virtualHosts = {
-      ${matrixDomain} = {
+      "matrix.${domain}" = {
         onlySSL = true;
         useACMEHost = domain;
 
@@ -167,11 +138,6 @@ in
 
             "/_matrix" = proxyToClientPort;
             "/_synapse/client" = proxyToClientPort;
-
-            # Sliding sync
-            "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
-              proxyPass = "http://${config.services.matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}";
-            };
           };
 
         listen = [
@@ -182,9 +148,9 @@ in
       };
 
       # same as above, but listening on the federation port
-      "${matrixDomain}_federation" = {
+      "matrix.${domain}_federation" = {
         onlySSL = true;
-        serverName = matrixDomain;
+        serverName = "matrix.${domain}";
         useACMEHost = domain;
 
         locations."/".return = "404";
@@ -205,7 +171,7 @@ in
 
         locations."= /.well-known/matrix/server".extraConfig =
           let
-            server = { "m.server" = "${matrixDomain}:${toString federationPort.public}"; };
+            server = { "m.server" = "matrix.${domain}:${toString federationPort.public}"; };
           in
           ''
             add_header Content-Type application/json;
@@ -215,7 +181,7 @@ in
         locations."= /.well-known/matrix/client".extraConfig =
           let
             client = {
-              "m.homeserver" = { "base_url" = "https://${matrixDomain}"; };
+              "m.homeserver" = { "base_url" = "https://matrix.${domain}"; };
               "m.identity_server" = { "base_url" = "https://vector.im"; };
             };
             # ACAO required to allow element-web on any URL to request this json file
diff --git a/modules/system/users/default.nix b/modules/system/users/default.nix
index 655b31e..27557bd 100644
--- a/modules/system/users/default.nix
+++ b/modules/system/users/default.nix
@@ -17,11 +17,11 @@ in
 
       users = {
         root = {
-          hashedPasswordFile = secrets."users/root/hashed-password".path;
+          passwordFile = secrets."users/root/hashed-password".path;
         };
 
         ${config.my.user.name} = {
-          hashedPasswordFile = secrets."users/ambroisie/hashed-password".path;
+          passwordFile = secrets."users/ambroisie/hashed-password".path;
           description = "Bruno BELANYI";
           isNormalUser = true;
           shell = pkgs.zsh;