diff --git a/modules/nixos/net/net-network-manager.ulu.nix b/modules/nixos/net/net-network-manager.ulu.nix
index 88ec867..1f61393 100644
--- a/modules/nixos/net/net-network-manager.ulu.nix
+++ b/modules/nixos/net/net-network-manager.ulu.nix
@@ -6,8 +6,6 @@
       inherit (lib.modules) mkDefault mkForce;
     in
     {
-      networking.hostName = "copland";
-
       networking.networkmanager = {
         enable = true;
         dns = mkForce "none";
diff --git a/modules/nixos/services/service-ssh.ulu.nix b/modules/nixos/services/service-ssh.ulu.nix
index a0a7308..c748b27 100644
--- a/modules/nixos/services/service-ssh.ulu.nix
+++ b/modules/nixos/services/service-ssh.ulu.nix
@@ -3,7 +3,19 @@
   flake.nixosModules.service-ssh =
     { ... }:
     {
-      services.openssh.enable = true;
       services.tailscale.enable = true;
+
+      services.openssh = {
+        enable = true;
+        openFirewall = false;
+        settings = {
+          PasswordAuthentication = false;
+          KbdInteractiveAuthentication = false;
+          PermitRootLogin = "no";
+        };
+      };
+
+      networking.firewall.interfaces."tailscale0".allowedTCPPorts = [ 22 ];
+      networking.firewall.trustedInterfaces = [ "tailscale0" ];
     };
 }