diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 7f55f51..d8d0f02 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -34,7 +34,6 @@ in {
       settings = {X11Forwarding = true;};
     };
     globalprotect.enable = true;
-    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;
diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index c09fe13..ec7f77c 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -10,13 +10,14 @@
       pulse.enable = true;
       alsa.enable = true;
     };
+    xserver = {
+      enable = true;
+      displayManager.lightdm.enable = true;
+      desktopManager.cinnamon.enable = true;
+      layout = "us";
+      xkbVariant = "";
+    };
   };
-  
-  services.xserver = {
-    enable = true;
-    displayManager.lightdm.enable = true;
-    desktopManager.cinnamon.enable = true;
-    layout = "us";
-    xkbVariant = "";
-  };
+
+  environment.systemPackages = [pkgs.tailscale-systray];
 }
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index e08ef1b..197f396 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -58,6 +58,8 @@
     '';
   };
 
+  services.tailscale.enable = true;
+
   environment = {
     systemPackages = with pkgs; [podman podman-compose podman-tui];
   };
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 1c47a9a..d413d27 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -15,11 +15,7 @@ in {
     };
   };
 
-  services = {
-    openssh.enable = true;
-    tailscale.enable = true;
-  };
-
+  services.openssh.enable = true;
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index a73bd31..da157fe 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -36,7 +36,6 @@ in {
     blueman.enable = true;
     openssh.enable = true;
     pcscd.enable = true;
-    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;