diff --git a/roles/common/default.nix b/roles/common/default.nix
index 91e9eb3..1e090a3 100755
--- a/roles/common/default.nix
+++ b/roles/common/default.nix
@@ -3,7 +3,7 @@
 {
 	imports = [
 		./programs
-		./services/avahi.nix
+		./services
 		./configuration.nix
 	];
 }
diff --git a/roles/common/services/default.nix b/roles/common/services/default.nix
new file mode 100644
index 0000000..38fca78
--- /dev/null
+++ b/roles/common/services/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+	imports = [
+		./avahi.nix
+		./tailscale.nix
+	];
+}
diff --git a/roles/common/services/tailscale.nix b/roles/common/services/tailscale.nix
new file mode 100644
index 0000000..aef79f6
--- /dev/null
+++ b/roles/common/services/tailscale.nix
@@ -0,0 +1,8 @@
+{ config, lib, ... }:
+
+{
+	services.tailscale = {
+		enable = true;
+		useRoutingFeatures = lib.mkDefault "client";
+	};
+}