diff --git a/rossby/default.nix b/rossby/default.nix
index daa669a..97495e7 100644
--- a/rossby/default.nix
+++ b/rossby/default.nix
@@ -239,19 +239,19 @@ let
     programs.ssh.knownHosts = {
       rossby-manage = {
         hostNames = [
-          "manage" "manage.compute.local" "rossby-manage.oceanbox.io" "172.16.239.221" "10.1.6.221"
+          "manage" "manage.cluster.local" "rossby-manage.oceanbox.io" "172.16.239.221" "10.1.6.221"
         ];
         publicKeyFile = ./manage/ssh_host_key.pub;
       };
       rossby-login = {
         hostNames = [
-          "rossby" "rossby-login" "rossby-login.compute.local" "rossby.compute.local" "rossby.oceanbox.io" "172.16.239.222" "10.1.6.222"
+          "rossby" "rossby-login" "rossby-login.cluster.local" "rossby.cluster.local" "rossby.oceanbox.io" "172.16.239.222" "10.1.6.222"
         ];
         publicKeyFile = ./login/ssh_host_key.pub;
       };
       fs-work = {
         hostNames = [
-          "fs-work" "fs-work.compute.local" "172.16.239.201" "10.1.6.210"
+          "fs-work" "fs-work.cluster.local" "172.16.239.201"
         ];
         publicKeyFile = ./fs-work/ssh_host_key.pub;
       };
@@ -261,7 +261,7 @@ let
           "${x.name}" = {
               hostNames = [
                   "${x.name}"
-                  "${x.name}.compute.local"
+                  "${x.name}.cluster.local"
                   "172.16.239.${n}"
                   "10.1.6.${n}"
               ];
diff --git a/rossby/mounts.nix b/rossby/mounts.nix
index d342a25..c980e50 100644
--- a/rossby/mounts.nix
+++ b/rossby/mounts.nix
@@ -54,7 +54,7 @@ let
   work =
       if cfg.work then {
         "/work" = {
-          device = "10.1.6.210:/work";
+          device = if cfg.rdma.enable then "10.1.6.210:/work" else "172.16.239.210:/work";
           fsType = "nfs4";
           options =  options ++ (if cfg.rdma.enable then [ "rdma" ] else []);
         };