diff --git a/modules/sys/pkgs.nix b/modules/sys/pkgs.nix
index fc694c0..5e75847 100644
--- a/modules/sys/pkgs.nix
+++ b/modules/sys/pkgs.nix
@@ -7,7 +7,6 @@
     openssl
     topgrade
     htop
-    mosh
     btop
     python314
     wget2
diff --git a/modules/sys/rc/openssh.nix b/modules/sys/rc/openssh.nix
index 901d9fe..c57deec 100644
--- a/modules/sys/rc/openssh.nix
+++ b/modules/sys/rc/openssh.nix
@@ -5,8 +5,15 @@
   #  startAgent = true;
   #  agentPKCS11Whitelist = "${config.security.tpm2.pkcs11.package}/lib/*,/run/current-system/sw/lib/*";
   #};
+  programs.mosh = {
+    enable = true;
+    openFirewall = true;
+    withUtempter = true;
+  };
   services.openssh = {
     enable = true;
-    settings.PasswordAuthentication = true;
+    settings = {
+      GatewayPorts = true;
+    };
   };
 }