diff --git a/hosts/architect/default.nix b/hosts/architect/default.nix
index b9089cb..6dfdea9 100644
--- a/hosts/architect/default.nix
+++ b/hosts/architect/default.nix
@@ -17,7 +17,6 @@ in
     ./fail2ban.nix
     ./dns.nix
     ./tailscale.nix
-    ./headscale.nix
     ./sunshine.nix
     ./postgres.nix
     ./netdata.nix
@@ -103,16 +102,6 @@ in
 
   pepe = {
     core = {
-      docker = {
-        enable = true;
-        nvidia = true;
-        dataRoot = "/docker";
-        extraOptions = "--dns 127.0.0.1 --dns ${config.pepe.core.network.interfaces.lan.devices.architect.address}";
-        enableOnBoot = false;
-        iptables = false;
-        users = [ "giulio" ];
-      };
-      
       media = {
         enable = true;
         path = "/media";
@@ -272,6 +261,20 @@ in
           frontend.themes = "!include_dir_merge_named themes";
         };
       };
+
+      headscale = {
+        enable = true;
+        package = pkgs.unstablePkgs.headscale;
+        domain = "vipienne.giugl.io";
+        settings = with config.pepe.core.network.interfaces.tailscale; {
+          prefixes.v4 = net;
+          dns = {
+            global = [ devices.architect.address ];
+            nameservers.global = [ devices.architect.address ];
+          };
+          log.level = "debug";
+        };
+      };
     };
   };
 }