diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index d8970a4..33aa410 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -19,6 +19,7 @@
 
     services = {
       pipewire.enable = true;
+      tailscale.enable = true;
     };
 
     users.tdpeuter.enable = true;
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index 8094bfa..ce7bc80 100644
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -4,5 +4,6 @@
     ./openssh
     ./pipewire
     ./printing
+    ./tailscale
   ];
 }
diff --git a/nixos/modules/services/tailscale/default.nix b/nixos/modules/services/tailscale/default.nix
new file mode 100644
index 0000000..f0bbc05
--- /dev/null
+++ b/nixos/modules/services/tailscale/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sisyphus.services.tailscale;
+in {
+  options.sisyphus.services.tailscale.enable = lib.mkEnableOption "Tailscale";
+
+  config = lib.mkIf cfg.enable {
+    services.tailscale = {
+      enable = true;
+      useRoutingFeatures = "client";
+    };
+  };
+}