diff --git a/home/env/shell/fish.nix b/home/env/shell/fish.nix
index 26ab66d8..0e47d6e8 100644
--- a/home/env/shell/fish.nix
+++ b/home/env/shell/fish.nix
@@ -8,7 +8,9 @@
       hm = "home-manager";
       lg = "lazygit";
       nv = "neovide --multigrid --maximized";
+      rnv = "neovide --multigrid --maximized --server localhost:6702";
       xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized";
+      rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server localhost:6702";
     };
   };
 }
diff --git a/home/env/ssh.nix b/home/env/ssh.nix
index 9832c944..e7ef934c 100644
--- a/home/env/ssh.nix
+++ b/home/env/ssh.nix
@@ -8,6 +8,6 @@
     serverAliveInterval = 15;
     serverAliveCountMax = 3;
     controlMaster = "auto";
-    controlPersist = "5s";
+    controlPersist = "1s";
   };
 }
diff --git a/ssh/config.d/ukaea.conf b/ssh/config.d/ukaea.conf
index e1ed1ab0..97ccb0df 100644
--- a/ssh/config.d/ukaea.conf
+++ b/ssh/config.d/ukaea.conf
@@ -1,23 +1,14 @@
 # vim: ft=sshconfig
-
-Host heimdall
-    HostName heimdall003.jet.uk
-
-Host heimdall???
-    HostName %h.jet.uk
-
 Host batch
     User cxsbatch
     HostName heimdall115.jetdata.eu
 
-Host jdc
-    HostName 10.40.4.103
-
 Host freia
     HostName freia022.hpc.l
+    LocalForward 6702 localhost:6702
 
 Host freia???
     HostName %h.hpc.l
 
-Host heimdall* jdc* freia* batch
+Host freia*
     User elitherl