diff --git a/assets/ssh/known_hosts b/assets/ssh/known_hosts
index 4b96cc7..a38b309 100644
--- a/assets/ssh/known_hosts
+++ b/assets/ssh/known_hosts
@@ -1,15 +1,15 @@
 # 2023-09 yodaNas with NixOS
 [192.168.178.27]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHalprb0uOHjvchbyU5dV/qpRqMs8tkQCGZ3O4K9+DMH
-[p1st.de]:2222        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHalprb0uOHjvchbyU5dV/qpRqMs8tkQCGZ3O4K9+DMH
+[yodanas.p1st.de]:2222        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHalprb0uOHjvchbyU5dV/qpRqMs8tkQCGZ3O4K9+DMH
 # 2023-09 yodaNas with NixOS SSH FDE unlcok
 [192.168.178.27]:2223 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0bfqbAh6E3sq82sg+ftcYLn7sPqCpPmPniL5Ey42Js
-[p1st.de]:2223        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0bfqbAh6E3sq82sg+ftcYLn7sPqCpPmPniL5Ey42Js
+[yodanas.p1st.de]:2223        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0bfqbAh6E3sq82sg+ftcYLn7sPqCpPmPniL5Ey42Js
 
 # 2023-11 yodaHedgehog with NixOS
 [192.168.178.196]:2226 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZmR+z+5/7xdu8mbZ54/DoqiXzoKh8rtHBU52KhwWx4
-[p1st.de]:2226 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZmR+z+5/7xdu8mbZ54/DoqiXzoKh8rtHBU52KhwWx4
+[yodahedgehog.p1st.de]:2226 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZmR+z+5/7xdu8mbZ54/DoqiXzoKh8rtHBU52KhwWx4
 [192.168.178.196]:2227 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr6z4AcZelv08eY9TMHihlF+C1g8OBLldMvNz3TvXOr
-[p1st.de]:2227 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr6z4AcZelv08eY9TMHihlF+C1g8OBLldMvNz3TvXOr
+[yodahedgehog.p1st.de]:2227 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr6z4AcZelv08eY9TMHihlF+C1g8OBLldMvNz3TvXOr
 
 # 2023-10 yodaHP with NixOS
 192.168.178.108 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDy1mNvsCIyYW5rNkNcEUCGYlDdPUJ+SyzrASd+z8q2Z
@@ -22,10 +22,10 @@ fckjpbxxim36c1gb.myfritz.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmpErjQ2DgNqs3
 
 # 2023-09 yodaYoga with NixOS
 [192.168.178.99]:2224 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsiBDYIJOPZkOA4a2wNyFGyLgKy5ihAVLH63f/+4dZJ
-[p1st.de]:2224 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsiBDYIJOPZkOA4a2wNyFGyLgKy5ihAVLH63f/+4dZJ
+[yodayoga.p1st.de]:2224 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsiBDYIJOPZkOA4a2wNyFGyLgKy5ihAVLH63f/+4dZJ
 # 2023-09 yodaYoga NixOS early SSH FDE unlock
 [192.168.178.99]:2225 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOH1sjHMLjGbxnDNke4xbY1IkSez/n0bJj3+80b4JTh+
-[p1st.de]:2225 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOH1sjHMLjGbxnDNke4xbY1IkSez/n0bJj3+80b4JTh+
+[yodayoga.p1st.de]:2225 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOH1sjHMLjGbxnDNke4xbY1IkSez/n0bJj3+80b4JTh+
 
 # 2023-08 yodaTab with NixOS
 192.168.178.53 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuZRtE5auwSJLcdR3mu+5JxG8jW8wwy2kEiIbE8nqNW
diff --git a/hosts/yodaHedgehog/ssh-client-root.nix b/hosts/yodaHedgehog/ssh-client-root.nix
index e35d6a3..811991d 100644
--- a/hosts/yodaHedgehog/ssh-client-root.nix
+++ b/hosts/yodaHedgehog/ssh-client-root.nix
@@ -8,7 +8,7 @@
       userKnownHostsFile = "~/.ssh/known_hosts ${../../assets/ssh/known_hosts}";
       matchBlocks = {
         "rootNas" = {
-          hostname = "p1st.de";
+          hostname = "rootnas.p1st.de";
           user = "root";
           port = 2222;
           compression = false;
diff --git a/modules/ssh-client.nix b/modules/ssh-client.nix
index 4b4a87e..64bec2b 100644
--- a/modules/ssh-client.nix
+++ b/modules/ssh-client.nix
@@ -28,19 +28,19 @@
 
         # local IP: 192.168.178.99
         "yodaYoga" = {
-          hostname = "p1st.de";
+          hostname = "yodayoga.p1st.de";
           user = "yoda";
           port = 2224;
           compression = true;
         };
         "rootYoga" = {
-          hostname = "p1st.de";
+          hostname = "yodayoga.p1st.de";
           user = "root";
           port = 2224;
           compression = true;
         };
         "unlockYoga" = {
-          hostname = "p1st.de";
+          hostname = "yodayoga.p1st.de";
           user = "root";
           port = 2225;
           compression = true;
@@ -88,19 +88,19 @@
 
         # local IP: 192.168.178.196
         "yodaHedgehog" = {
-          hostname = "p1st.de";
+          hostname = "yodahedgehog.p1st.de";
           user = "yoda";
           port = 2226;
           compression = true;
         };
         "rootHedgehog" = {
-          hostname = "p1st.de";
+          hostname = "yodahedgehog.p1st.de";
           user = "root";
           port = 2226;
           compression = true;
         };
         "unlockHedgehog" = {
-          hostname = "p1st.de";
+          hostname = "yodahedgehog.p1st.de";
           user = "root";
           port = 2227;
           compression = true;
@@ -108,19 +108,19 @@
 
         # local IP: 192.168.178.190
         "yodaNas" = {
-          hostname = "p1st.de";
+          hostname = "yodanas.p1st.de";
           user = "yoda";
           port = 2222;
           compression = true;
         };
         "rootNas" = {
-          hostname = "p1st.de";
+          hostname = "yodanas.p1st.de";
           user = "root";
           port = 2222;
           compression = true;
         };
         "unlockNas" = {
-          hostname = "p1st.de";
+          hostname = "yodanas.p1st.de";
           user = "root";
           port = 2223;
           compression = true;