diff --git a/hive.nix b/hive.nix
index 498e8ba..d8246dd 100644
--- a/hive.nix
+++ b/hive.nix
@@ -70,12 +70,12 @@ in
       ];
     };
 
-  kat-r86s =
+  kat-manah =
     { users, ... }:
     {
-      deployment.targetHost = "r86s.kat";
+      deployment.targetHost = "manah.kat";
       imports = [
-        ./machines/kat-r86s
+        ./machines/kat-manah
         (users.root { ssh = true; })
       ];
     };
diff --git a/machines/kat-r86s/default.nix b/machines/kat-manah/default.nix
similarity index 100%
rename from machines/kat-r86s/default.nix
rename to machines/kat-manah/default.nix
diff --git a/machines/kat-r86s/hardware-configuration.nix b/machines/kat-manah/hardware-configuration.nix
similarity index 100%
rename from machines/kat-r86s/hardware-configuration.nix
rename to machines/kat-manah/hardware-configuration.nix
diff --git a/machines/kat-r86s/router.nix b/machines/kat-manah/router.nix
similarity index 100%
rename from machines/kat-r86s/router.nix
rename to machines/kat-manah/router.nix
diff --git a/modules/ssh.nix b/modules/ssh.nix
index c2155cb..e65818a 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -13,7 +13,7 @@
         user = "root";
         hostname = "watcher.katvayor.net";
       };
-      "r86s.kat" = {
+      "manah.kat" = {
         user = "root";
         hostname = "100.102.49.84";
       };
@@ -25,22 +25,22 @@
       "virt.kat" = {
         user = "root";
         hostname = "fe80::2%%virbr0";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
       };
       "mail-test.kat" = {
         user = "root";
         hostname = "fe80::3%%virbr0";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
       };
       "traque.kat" = {
         user = "root";
         hostname = "fe80::4%%virbr0";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
       };
       "son.kat" = {
         user = "root";
         hostname = "fe80::5%%virbr0";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
       };
 
       "sas.ens" = {
@@ -61,18 +61,18 @@
       "netcore02.dgn" = {
         user = "root";
         hostname = "fd26:baf9:d250:8000::1001";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
         identityFile = "~/.ssh/juniper";
       };
       "netaccess01.dgn" = {
         user = "root";
         hostname = "fd26:baf9:d250:8000::2001";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
         identityFile = "~/.ssh/juniper";
       };
       "vault01.dgnum" = {
         user = "root";
-        proxyJump = "r86s.kat";
+        proxyJump = "manah.kat";
         hostname = "fd26:baf9:d250:8000::1";
       };
     };