diff --git a/machines/default.nix b/machines/default.nix
index 9d68089..3022d4c 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -29,7 +29,7 @@ in
       hardware.common-pc-ssd
     ];
 
-    targetHost = "fuuko.home.sbruder.de";
+    targetHost = "fuuko.lan.shinonome-lab.de";
   };
   mayushii = {
     system = "x86_64-linux";
@@ -60,7 +60,7 @@ in
       hardware.common-pc-ssd
     ];
 
-    targetHost = "shinobu.home.sbruder.de";
+    targetHost = "shinobu.lan.shinonome-lab.de";
   };
   nazuna = {
     system = "x86_64-linux";
diff --git a/machines/renge/services/prometheus.nix b/machines/renge/services/prometheus.nix
index 3c13e49..7f4dcc6 100644
--- a/machines/renge/services/prometheus.nix
+++ b/machines/renge/services/prometheus.nix
@@ -103,7 +103,7 @@ in
         static_configs = mkStaticTarget "shinobu.vpn.sbruder.de:${toString config.services.prometheus.exporters.dnsmasq.port}";
         relabel_configs = lib.singleton {
           target_label = "instance";
-          replacement = "shinobu.home.sbruder.de";
+          replacement = "shinobu";
         };
       }
       {
diff --git a/machines/shinobu/services/router/common.nix b/machines/shinobu/services/router/common.nix
index fde0e68..de94359 100644
--- a/machines/shinobu/services/router/common.nix
+++ b/machines/shinobu/services/router/common.nix
@@ -32,22 +32,22 @@ in
     lan = {
       id = 10;
       subnet = mkSubnet "10.80.1.0/24" "fd00:80:1::/64";
-      domain = "home.sbruder.de";
+      domain = "lan.shinonome-lab.de";
     };
     management = {
       id = 20;
       subnet = mkSubnet "10.80.2.0/24" "fd00:80:2::/64";
-      domain = "management.sbruder.de";
+      domain = "management.shinonome-lab.de";
     };
     guest = {
       id = 30;
       subnet = mkSubnet "10.80.3.0/24" "fd00:80:3::/64";
-      domain = "guest.sbruder.de";
+      domain = "guest.shinonome-lab.de";
     };
     iot = {
       id = 40;
       subnet = mkSubnet "10.80.4.0/24" "fd00:80:4::/64";
-      domain = "iot.sbruder.de";
+      domain = "iot.shinonome-lab.de";
     };
   };
   tc = {
diff --git a/modules/media-mount.nix b/modules/media-mount.nix
index d86fbd1..0f080b6 100644
--- a/modules/media-mount.nix
+++ b/modules/media-mount.nix
@@ -41,8 +41,8 @@ lib.mkIf config.sbruder.gui.enable {
   system.fsPackages = with pkgs; [ sshfs ];
 
   fileSystems = {
-    "/home/simon/mounts/media" = mkMount "media@fuuko.home.sbruder.de:/data/cold/media" { };
-    "/home/simon/mounts/torrent" = mkMount "media@fuuko.home.sbruder.de:/data/hot/torrent" { };
+    "/home/simon/mounts/media" = mkMount "media@fuuko.lan.shinonome-lab.de:/data/cold/media" { };
+    "/home/simon/mounts/torrent" = mkMount "media@fuuko.lan.shinonome-lab.de:/data/hot/torrent" { };
     "/home/simon/mounts/storagebox" = mkMount "u313368@personal.storagebox.sbruder.de:" {
       port = 23;
       ro = false;
diff --git a/modules/ssh.nix b/modules/ssh.nix
index eb9123d..9111f44 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -19,7 +19,7 @@
     };
 
     hitagi = {
-      hostNames = [ "hitagi" "hitagi.home.sbruder.de" "hitagi.vpn.sbruder.de" ];
+      hostNames = [ "hitagi" "hitagi.lan.shinonome-lab.de" "hitagi.vpn.sbruder.de" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIg/622wS8SFlzS29TPW9li3pNdbdHNjlGb4XTyXR0QR";
     };
     # TODO: replace with vueko!
@@ -32,15 +32,15 @@
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDWuJy00S4eoLsuu29HR/T1RkFs4ujqe5e4tFiEINcWn vueko";
     };
     fuuko = {
-      hostNames = [ "fuuko" "fuuko.home.sbruder.de" "fuuko.sbruder.de" "fuuko.vpn.sbruder.de" ];
+      hostNames = [ "fuuko" "fuuko.lan.shinonome-lab.de" "fuuko.sbruder.de" "fuuko.vpn.sbruder.de" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIrUqI2CZh2ipzDNVCTNdBen8IdhbddgwQzEMWoQzNB";
     };
     fuuko-initrd = {
-      hostNames = [ "[fuuko.home.sbruder.de]:2222" ];
+      hostNames = [ "[fuuko.lan.shinonome-lab.de]:2222" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJxqaJgDOZ8FdY68o/r1YNlGvNatFtP86QoqV147g3Lb";
     };
     mayushii = {
-      hostNames = [ "mayushii" "mayushii.home.sbruder.de" "maushii.vpn.sbruder.de" ];
+      hostNames = [ "mayushii" "mayushii.lan.shinonome-lab.de" "maushii.vpn.sbruder.de" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKa53rGEQtBYyjGspeS8x2OZFPjLpFgm2C7+lttEKm60";
     };
     renge = {
@@ -52,7 +52,7 @@
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5HmxGDJO1jkVoUdiKEC3yXrkJ1ZWn4FurGyt2UgzYu";
     };
     nunotaba = {
-      hostNames = [ "nunotaba" "nunotaba.home.sbruder.de" "nunotaba.vpn.sbruder.de" ];
+      hostNames = [ "nunotaba" "nunotaba.lan.shinonome-lab.de" "nunotaba.vpn.sbruder.de" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHUEVBJcEibRdQzp0bDXpPqLGQ8vtQTKTcpGZU07W4eo";
     };
     okarin = {
@@ -64,7 +64,7 @@
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINJbp0kZJEXf1gSVcBsef1Bihd5iCzhzSbjgyrC1SXXT";
     };
     shinobu = {
-      hostNames = [ "shinobu" "shinobu.home.sbruder.de" "shinobu.vpn.sbruder.de" ];
+      hostNames = [ "shinobu" "shinobu.lan.shinonome-lab.de" "shinobu.vpn.sbruder.de" ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJNZPT2Mmys2nw/ovX6Z1Cb4WDAaWBWanycNwF9IEjl";
     };
     nazuna = {