diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index a936f7c..ab231db 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -33,7 +33,16 @@
   services = {
     displayManager.sddm.enable = true;
     dbus.enable = true;
-    tailscale.enable = true;
+    tailscale = {
+      enable = true;
+      extraUpFlags = [
+        "--ssh"
+        "--advertise-tags"
+        "tag:client"
+        "--login-server"
+        "https://hs.ccnlc.eu"
+      ];
+    };
   };
 
   programs = {
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index f283275..95ec256 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -63,6 +63,19 @@
     sway.enable = true;
   };
 
+  services = {
+    tailscale = {
+      enable = true;
+      extraUpFlags = [
+        "--ssh"
+        "--advertise-tags"
+        "tag:client"
+        "--login-server"
+        "https://hs.ccnlc.eu"
+      ];
+    };
+  };
+
   services.greetd = {
     enable = true;
     settings = {
diff --git a/hosts/raptus/configuration.nix b/hosts/raptus/configuration.nix
index e9aeb0b..76bb0b3 100644
--- a/hosts/raptus/configuration.nix
+++ b/hosts/raptus/configuration.nix
@@ -76,8 +76,6 @@
       ];
   };
 
-  services.tailscale.enable = true;
-
   services.openssh = {
     enable = true;
     ports = [ 56528 ];
diff --git a/hosts/shan/configuration.nix b/hosts/shan/configuration.nix
index b9c32a7..a1f97ff 100644
--- a/hosts/shan/configuration.nix
+++ b/hosts/shan/configuration.nix
@@ -10,6 +10,7 @@
     (modulesPath + "/profiles/qemu-guest.nix")
     ./disk-config.nix
     ../../modules/nix
+    ../../modules/users/ny.nix
   ];
 
   boot.loader.grub = {
@@ -37,6 +38,14 @@
     openssh.enable = true;
     tailscale = {
       enable = true;
+      extraUpFlags = [
+        "--ssh"
+        "--advertise-tags"
+        "tag:server"
+        "--login-server"
+        "https://hs.ccnlc.eu"
+      ];
+      #useRoutingFeatures = "both";
     };
   };
   environment.systemPackages = map lib.lowPrio [