diff --git a/server/default.nix b/server/default.nix
index 7b65966..82a022d 100644
--- a/server/default.nix
+++ b/server/default.nix
@@ -28,6 +28,7 @@ in
     [
       ./detect-reboot-needed.nix
       ./systemd.nix
+      ./tailscale.nix
       ./upgrade-diff.nix
     ];
 
diff --git a/server/systemd.nix b/server/systemd.nix
index 674f39c..edbd421 100644
--- a/server/systemd.nix
+++ b/server/systemd.nix
@@ -6,46 +6,6 @@ let
 in {
   systemd = {
     services = {
-     #console-blank = {
-     #  enable = true;
-     #  description ="Blank screen";
-     #  serviceConfig = {
-     #    Type = "oneshot";
-     #    ExecStart = "${pkgs.util-linux}/bin/setterm -blank 1";
-     #    TTYPath="/dev/console";
-     #    StandardOutput="tty";
-     #  };
-     #  wantedBy = ["multi-user.target"];
-     #  environment = {
-     #    TERM = "linux";
-     #  };
-      tailscale-autoconnect = {
-        description = "Automatic connection to Tailscale";
-  
-        # make sure tailscale is running before trying to connect to tailscale
-        after = [ "network-pre.target" "tailscale.service" ];
-        wants = [ "network-pre.target" "tailscale.service" ];
-        wantedBy = [ "multi-user.target" ];
-  
-        # set this service as a oneshot job
-        serviceConfig.Type = "oneshot";
-  
-        # have the job run this shell script
-        script = with pkgs; ''
-          # wait for tailscaled to settle
-          sleep 2
-  
-          # check if we are already authenticated to tailscale
-          status="$(${tailscale}/bin/tailscale status -json | ${jq}/bin/jq -r .BackendState)"
-          if [ $status = "Running" ]; then # if so, then do nothing
-            exit 0
-          fi
-  
-          # otherwise authenticate with tailscale
-          ${tailscale}/bin/tailscale up --operator=don --authkey tskey-auth-kt22J52CNTRL-iT7CCqfci73sWvVy6Dyi83DWzwLnNyknF
-        '';
-      };
-  
       clean-keychain = {
         description = "Clean up .keychain on boot";
         wantedBy = [ "multi-user.target" ];
diff --git a/server/tailscale.nix b/server/tailscale.nix
new file mode 100644
index 0000000..f7ea086
Binary files /dev/null and b/server/tailscale.nix differ
diff --git a/workstation/default.nix b/workstation/default.nix
index 7b65966..82a022d 100644
--- a/workstation/default.nix
+++ b/workstation/default.nix
@@ -28,6 +28,7 @@ in
     [
       ./detect-reboot-needed.nix
       ./systemd.nix
+      ./tailscale.nix
       ./upgrade-diff.nix
     ];
 
diff --git a/workstation/systemd.nix b/workstation/systemd.nix
index 674f39c..edbd421 100644
--- a/workstation/systemd.nix
+++ b/workstation/systemd.nix
@@ -6,46 +6,6 @@ let
 in {
   systemd = {
     services = {
-     #console-blank = {
-     #  enable = true;
-     #  description ="Blank screen";
-     #  serviceConfig = {
-     #    Type = "oneshot";
-     #    ExecStart = "${pkgs.util-linux}/bin/setterm -blank 1";
-     #    TTYPath="/dev/console";
-     #    StandardOutput="tty";
-     #  };
-     #  wantedBy = ["multi-user.target"];
-     #  environment = {
-     #    TERM = "linux";
-     #  };
-      tailscale-autoconnect = {
-        description = "Automatic connection to Tailscale";
-  
-        # make sure tailscale is running before trying to connect to tailscale
-        after = [ "network-pre.target" "tailscale.service" ];
-        wants = [ "network-pre.target" "tailscale.service" ];
-        wantedBy = [ "multi-user.target" ];
-  
-        # set this service as a oneshot job
-        serviceConfig.Type = "oneshot";
-  
-        # have the job run this shell script
-        script = with pkgs; ''
-          # wait for tailscaled to settle
-          sleep 2
-  
-          # check if we are already authenticated to tailscale
-          status="$(${tailscale}/bin/tailscale status -json | ${jq}/bin/jq -r .BackendState)"
-          if [ $status = "Running" ]; then # if so, then do nothing
-            exit 0
-          fi
-  
-          # otherwise authenticate with tailscale
-          ${tailscale}/bin/tailscale up --operator=don --authkey tskey-auth-kt22J52CNTRL-iT7CCqfci73sWvVy6Dyi83DWzwLnNyknF
-        '';
-      };
-  
       clean-keychain = {
         description = "Clean up .keychain on boot";
         wantedBy = [ "multi-user.target" ];
diff --git a/workstation/tailscale.nix b/workstation/tailscale.nix
new file mode 100644
index 0000000..f7ea086
Binary files /dev/null and b/workstation/tailscale.nix differ