diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix
index 9373483..2bcb52f 100644
--- a/nixos/hosts/Tibo-NixDesk/default.nix
+++ b/nixos/hosts/Tibo-NixDesk/default.nix
@@ -21,6 +21,7 @@
       networkmanager.enable = true;
       openconnect-sso.enable = true;
       openvpn.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -36,7 +37,6 @@
     };
 
     services = {
-      tailscale.enable = true;
       pipewire.enable = true;
       printing.enable = true;
       openrgb.enable = true;
diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 2e790c3..80d9d98 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -23,6 +23,7 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -37,10 +38,7 @@
       ssh.enable = true;
     };
 
-    services = {
-      pipewire.enable = true;
-      tailscale.enable = true;
-    };
+    services.pipewire.enable = true;
 
     users.tdpeuter.enable = true;
 
diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix
index 7d977af..8cbbec7 100644
--- a/nixos/hosts/Tibo-NixTop/default.nix
+++ b/nixos/hosts/Tibo-NixTop/default.nix
@@ -26,6 +26,8 @@
     networking = {
       networkmanager.enable = true;
       openconnect-sso.enable = true;
+      openvpn.enable = true;
+      tailscale.enable = true;
     };
 
     nix = {
@@ -41,10 +43,7 @@
       wireshark.enable = true;
     };
 
-    services = {
-      pipewire.enable = true;
-      tailscale.enable = true;
-    };
+    services.pipewire.enable = true;
 
     users.tdpeuter.enable = true;
 
diff --git a/nixos/modules/networking/default.nix b/nixos/modules/networking/default.nix
index 94bb711..897a716 100644
--- a/nixos/modules/networking/default.nix
+++ b/nixos/modules/networking/default.nix
@@ -3,5 +3,6 @@
     ./networkmanager
     ./openconnect-sso
     ./openvpn
+    ./tailscale
   ];
 }
diff --git a/nixos/modules/networking/tailscale/default.nix b/nixos/modules/networking/tailscale/default.nix
new file mode 100644
index 0000000..ac2a936
--- /dev/null
+++ b/nixos/modules/networking/tailscale/default.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, pkgs-unstable, ... }:
+
+let
+  cfg = config.sisyphus.networking.tailscale;
+in {
+  options.sisyphus.networking.tailscale.enable = lib.mkEnableOption "Tailscale";
+
+  config = lib.mkIf cfg.enable {
+    services = {
+      tailscale = {
+        enable = true;
+        package = pkgs-unstable.tailscale;
+        useRoutingFeatures = "client";
+        extraDaemonFlags = [
+          "--no-logs-no-support"
+        ];
+      };
+
+      resolved.enable = true;
+    };
+  };
+} 
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index 663fc70..324ef55 100644
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -6,6 +6,5 @@
     ./pipewire
     ./printing
     ./remEYEnder
-    ./tailscale
   ];
 }
diff --git a/nixos/modules/services/tailscale/default.nix b/nixos/modules/services/tailscale/default.nix
deleted file mode 100644
index 48eceb7..0000000
--- a/nixos/modules/services/tailscale/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
-
-let
-  cfg = config.sisyphus.services.tailscale;
-in {
-  options.sisyphus.services.tailscale.enable = lib.mkEnableOption "Tailscale";
-
-  config = lib.mkIf cfg.enable {
-    services.tailscale = {
-      enable = true;
-      package = pkgs-unstable.tailscale;
-      useRoutingFeatures = "client";
-    };
-  };
-}