diff --git a/machines/org/_configuration.nix b/machines/org/_configuration.nix
index 30db8d7..712fd39 100644
--- a/machines/org/_configuration.nix
+++ b/machines/org/_configuration.nix
@@ -18,6 +18,7 @@
       ./orga
       ./secrets
       ./static-sites.nix
+      ./legacy-redir.nix
       ./webpass.nix
     ];
 
diff --git a/machines/org/dokuwiki.nix b/machines/org/dokuwiki.nix
index 0aa4cf7..f6daff7 100644
--- a/machines/org/dokuwiki.nix
+++ b/machines/org/dokuwiki.nix
@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }: {
 
-  services.nginx.virtualHosts."new.hackens.org" = {
+  services.nginx.virtualHosts."hackens.org" = {
     enableACME = true;
     forceSSL = true;
   };
 
   # Si tu as des problèmes un jour, vide le cache avant tout
-  services.dokuwiki.sites."new.hackens.org" = {
+  services.dokuwiki.sites."hackens.org" = {
     enable = true;
     settings = {
       template = "bootstrap3";
diff --git a/machines/org/legacy-redir.nix b/machines/org/legacy-redir.nix
new file mode 100644
index 0000000..2fb8bd8
--- /dev/null
+++ b/machines/org/legacy-redir.nix
@@ -0,0 +1,55 @@
+{
+  services.nginx.virtualHosts = {
+
+    "www.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org$request_uri;
+      '';
+    };
+
+    "new.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org$request_uri;
+      '';
+    };
+    "pass.new.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://pass.hackens.org$request_uri;
+      '';
+    };
+    "known.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org/known$request_uri;
+        '';
+    };
+    "prez.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org/prez$request_uri;
+        '';
+    };
+    "pub.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org/pub$request_uri;
+        '';
+    };
+    "2048.hackens.org" = {
+      forceSSL = true;
+      enableACME = true;
+      extraConfig = ''
+        return 301 $scheme://hackens.org/2048$request_uri;
+        '';
+    };
+  };
+}
diff --git a/machines/org/orga/default.nix b/machines/org/orga/default.nix
index 345b86f..b273810 100644
--- a/machines/org/orga/default.nix
+++ b/machines/org/orga/default.nix
@@ -17,7 +17,7 @@ in
   ];
   services.nginx = {
     enable = true;
-    virtualHosts."new.hackens.org" = {
+    virtualHosts."hackens.org" = {
       locations = {
         "/orga" = {
           proxyPass = "http://localhost:51666/orga";
@@ -34,7 +34,7 @@ in
     assets = assets;
     settings = {
       HACKENS_ORGA_DEBUG = "0";
-      HACKENS_ORGA_ALLOWED_HOSTS = [ "new.hackens.org" ];
+      HACKENS_ORGA_ALLOWED_HOSTS = [ "hackens.org" ];
       HACKENS_ORGA_SECRET_KEY._file = config.age.secrets.django.path;
       HACKENS_ORGA_DB_FILE = "/var/lib/hackens-orga/db.sqlite3";
     };
diff --git a/machines/org/static-sites.nix b/machines/org/static-sites.nix
index 561731f..c9a16eb 100644
--- a/machines/org/static-sites.nix
+++ b/machines/org/static-sites.nix
@@ -1,7 +1,6 @@
 { pkgs, lib, ... }:
 let
   sites = [
-    "/NdS"
     "/2048"
     "/prez"
     "/known"
@@ -12,50 +11,17 @@ in
 
   services.nginx.enable = true;
   services.nginx.virtualHosts = {
-    "new.hackens.org" = {
+    "hackens.org" = {
       forceSSL = true;
       enableACME = true;
       locations = lib.genAttrs sites (name: {
         root = "/var/www";
-        extraConfig = "autoindex on;";
+        extraConfig = ''
+          autoindex on;
+          charset utf-8;
+          '';
       });
     };
-    # Legacy redirections
-    #"known.hackens.org" = {
-    #  forceSSL = true;
-    #  enableACME = true;
-    #  extraConfig = ''
-    #    return 301 $scheme://hackens.org/known$request_uri;
-    #    '';
-    #};
-    #"nds.hackens.org" = {
-    #  forceSSL = true;
-    #  enableACME = true;
-    #  extraConfig = ''
-    #    return 301 $scheme://hackens.org/known$request_uri;
-    #    '';
-    #};
-    #"prez.hackens.org" = {
-    #  forceSSL = true;
-    #  enableACME = true;
-    #  extraConfig = ''
-    #    return 301 $scheme://hackens.org/prez$request_uri;
-    #    '';
-    #};
-    #"pub.hackens.org" = {
-    #  forceSSL = true;
-    #  enableACME = true;
-    #  extraConfig = ''
-    #    return 301 $scheme://hackens.org/pub$request_uri;
-    #    '';
-    #};
-    #"2048.hackens.org" = {
-    #  forceSSL = true;
-    #  enableACME = true;
-    #  extraConfig = ''
-    #    return 301 $scheme://hackens.org/2048$request_uri;
-    #    '';
-    #};
 
   };
   networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/machines/org/webpass.nix b/machines/org/webpass.nix
index 85d5a94..3044f3f 100644
--- a/machines/org/webpass.nix
+++ b/machines/org/webpass.nix
@@ -8,7 +8,7 @@
   services.vaultwarden = {
     enable = true;
     config = {
-      DOMAIN = "https://pass.new.hackens.org";
+      DOMAIN = "https://pass.hackens.org";
       WEBSOCKET_ENABLED = true;
       WEBSOCKET_PORT = 10500;
       SIGNUPS_DOMAINS_WHITELIST = "ens.fr,ens.psl.eu";
@@ -21,7 +21,7 @@
   };
 
   services.nginx.enable = true;
-  services.nginx.virtualHosts."pass.new.hackens.org" = {
+  services.nginx.virtualHosts."pass.hackens.org" = {
     forceSSL = true;
     enableACME = true;
     locations."/" = {