diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 8a021f5..a8d67fd 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -80,6 +80,7 @@ inputs.nixpkgs.lib.nixosSystem {
       docker.enable = true;
       yubikey.enable = true;
       kdeconnect.enable = true;
+      tailscale.enable = true;
 
       # TODO: Move this out
       home-manager.users.annika = {
diff --git a/modules/common/utilities/default.nix b/modules/common/utilities/default.nix
index d99861e..2a4aac3 100644
--- a/modules/common/utilities/default.nix
+++ b/modules/common/utilities/default.nix
@@ -4,6 +4,7 @@
     ./docker.nix
     ./git.nix
     ./kdeconnect.nix
+    ./tailscale.nix
     ./yubikey-manager.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/common/utilities/tailscale.nix b/modules/common/utilities/tailscale.nix
new file mode 100644
index 0000000..7160772
--- /dev/null
+++ b/modules/common/utilities/tailscale.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    tailscale = {
+      enable = lib.mkEnableOption {
+        description = "Enable tailscale";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.tailscale.enable) {
+    environment.systemPackages = [ pkgs.tailscale ];
+    services.tailscale.enable = true;
+  };
+}