diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 24ee8f21..02455b51 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -53,6 +53,7 @@
     };
     services = {
       syncthing.enable = true;
+      tailscale.enable = true;
     };
   };
 
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index b1c4e2df..0ee192b7 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -67,6 +67,7 @@ in {
         syncMusic = true;
         syncMusicPath = "${mediaDirectory}/Music";
       };
+      tailscale.enable = true;
     };
     system = {
       plymouth.enable = true;
diff --git a/hosts/mossdeep/default.nix b/hosts/mossdeep/default.nix
index 391aaa5b..9c1ad1ef 100644
--- a/hosts/mossdeep/default.nix
+++ b/hosts/mossdeep/default.nix
@@ -49,6 +49,7 @@
     services = {
       flatpak.enable = true;
       syncthing.enable = true;
+      tailscale.enable = true;
     };
   };
 
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index eb5c6a76..4b95f494 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -97,6 +97,7 @@ in {
     };
     services = {
       syncthing.enable = true;
+      tailscale.enable = true;
     };
   };
 
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index 34a88fea..38585a5f 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -72,6 +72,7 @@
     };
     services = {
       syncthing.enable = true;
+      tailscale.enable = true;
     };
   };
 
diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix
index 5c74205b..a32acde7 100644
--- a/nixosModules/services/default.nix
+++ b/nixosModules/services/default.nix
@@ -4,5 +4,5 @@
   config,
   ...
 }: {
-  imports = [./binaryCache ./flatpak ./ollama ./syncthing];
+  imports = [./binaryCache ./flatpak ./ollama ./syncthing ./tailscale];
 }
diff --git a/nixosModules/services/tailscale/default.nix b/nixosModules/services/tailscale/default.nix
new file mode 100644
index 00000000..499eaa6c
--- /dev/null
+++ b/nixosModules/services/tailscale/default.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    alyraffauf.services.tailscale.enable = lib.mkEnableOption "Enable Tailscale";
+  };
+
+  config = lib.mkIf config.alyraffauf.services.tailscale.enable {
+    services.tailscale = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}
diff --git a/nixosModules/system/default.nix b/nixosModules/system/default.nix
index c706dff6..dfacece8 100644
--- a/nixosModules/system/default.nix
+++ b/nixosModules/system/default.nix
@@ -101,7 +101,6 @@
       openFirewall = true;
     };
     printing.enable = true;
-    tailscale.enable = true;
   };
 
   security = {