diff --git a/profiles/known-hosts/default.nix b/profiles/known-hosts/default.nix
index 62733a7..3b32a98 100644
--- a/profiles/known-hosts/default.nix
+++ b/profiles/known-hosts/default.nix
@@ -109,8 +109,10 @@ let
       # timeouts are great when remote is unresponsive. nix doesn't care, lix is way and tests each remote only once
       programs.ssh.extraConfig = ''
         Host ${fqdn}
-          ConnectTimeout ${toString thatHost.ssh.connectTimeout}
           Port ${toString thatHost.ssh.listenPort}
+          ${lib.optionalString ((thatHost.ssh.connectTimeout or 0) != 0) ''
+            ConnectTimeout ${toString thatHost.ssh.connectTimeout}
+          ''}
           ${lib.optionalString (thatHost.ssh ? proxyJump && !lib.elem thatDomain (thatHost.noProxyJumpDomains or [])) ''
             ProxyJump ${thatJump.ssh.listenUser}@${thatHost.ssh.proxyJump}:${toString thatJump.ssh.listenPort}
           ''}
diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml
index c984f6e..82047eb 100644
--- a/profiles/known-hosts/hosts.toml
+++ b/profiles/known-hosts/hosts.toml
@@ -57,7 +57,8 @@ buildMachine.speedFactor = 4 # ???
 buildMachine.supportedFeatures = ["kvm", "nixos-test" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
 buildMachine.protocol = "ssh-ng"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
+# ssh.connectTimeout = 3
 # wakeonlan e4:54:e8:51:8c:e9
 
 ["eple.tail9aac63.ts.net"] # r9 290x
@@ -68,7 +69,8 @@ buildMachine.speedFactor = 3 # i7-5820K
 buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ]
 # useAsSubstituter = true
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsCDCLkvF9ow5FQJp9uiyQ1Iwi"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
+# ssh.connectTimeout = 3
 # wakeonlan 4c:cc:6a:05:51:01
 
 ["garp.tail9aac63.ts.net"] # gtx 1080
@@ -78,7 +80,8 @@ buildMachine.maxJobs = 2 # 8 threads 32GB
 buildMachine.speedFactor = 4 # i7-6700
 buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
+# ssh.connectTimeout = 3
 # wakeonlan 4c:cc:6a:61:d0:20
 
 ["noximilien.pbsds.net"]
@@ -239,7 +242,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJfJV5Ov3D0qErVnbQZ3oxhA3i0zuAmjmVUf3JV08aSg"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab02.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -247,7 +250,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHNhQPotOGWZdFeW4B3eDYGcaF/2xB56hNL+x3QEURa6"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab03.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -255,7 +258,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5srnYPuULchLvlCOlWOwrhQEBznQn61kj0Oawnp44Y"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab04.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -263,7 +266,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICgMxLYYiYb/6IAH6nyc9eGXASgDPTE2JcRZ9ODjhQt5"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab05.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -271,7 +274,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHw4h4dH689bLYWjrhhsvfljyWfUEClPa1Kb0cYxLRaD"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab06.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -279,7 +282,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVZ394P3124lSxkzVodFqbindIvCB3kcn4YcgbaPrAs"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab07.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -287,7 +290,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKQfcOmWC73bmE2mlWEcXFHiDUhsYWA7Xy9Dtq8kKmn"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab08.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -295,7 +298,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKlyZq3uTBCgkvPgs6nWRzsdhHmXHph14dmYWgt1vuBx"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab09.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -303,7 +306,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAj4eXT/k7iiUYx+CXq5ShLWm1N6SNO23EIs4xYEaQaW"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab10.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -311,7 +314,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5xEUkiwXWaUCA+QfMDq2vHfXKzcpXlrHpJMNQ8EU+K"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab11.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -319,7 +322,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlKZhdQBrjafzzwdRR3arem3TXnnPucQskd7RWW9L5V"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab12.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -327,7 +330,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDEr2zGzev8JffE67Hkb3Qli7K0kzVdu8VXxJW47PK7m"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab13.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -335,7 +338,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZgIhgpMCdegJaW6Huad7Dj4YfyR8Zhi1UmDsgcJYK2"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab14.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -343,7 +346,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3pAYx5rtbaUCf4xsiy+7/qKqnGMnSa9KCp42j+XmEh"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab15.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -351,7 +354,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7XwwhLJGwK+a7zShr2Ok9f2GlvPkP+FxKdbGYsNHtd"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab16.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -359,7 +362,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJKAaMXBAYsDd2QQOAQhXAAJCejbylQNLI9KsN3/EsY+"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab20.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -367,7 +370,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGBbcKU5uDTgaQoREjaNuzQkCKNm5wlnhln6ZNiL3o2"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab22.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -375,7 +378,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMHlaYq184VDBoEOtaIIu2jnuBihhWiGPlyku0SMKORG"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab23.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -383,7 +386,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsIRgqoFF900olTCy6DSrFMpZyRmtK6aVP2oYQhNi8g"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab24.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -391,7 +394,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqh/Sp13OcUnZ8gVgiylcLsqAgIw+twQG92GyZK3FBZ"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab25.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -399,7 +402,7 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdL5coXj0geu9O1cMLdYuUE0TWlIkKLNj71/XF0e8eg"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
 
 ["clab26.idi.ntnu.no"] # gtx 4090
 # buildMachine.maxJobs = 1 # 24 threads 64GB
@@ -407,4 +410,4 @@ buildMachine.speedFactor = 5 # AMD Ryzen 9 7900X
 buildMachine.supportedFeatures = ["big-parallel"] # "cuda"
 ssh.listenUser = "pederbs"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINqqxg0hVT/gPBM1xqrR9QtMRHVBZDYWZ3pzbJv9MHUG"
-ssh.proxyJump = "login.pvv.ntnu.no"
+ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no