diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix
index b3f5dc7..8a47f8c 100644
--- a/machines/moritz-desktop/configuration.nix
+++ b/machines/moritz-desktop/configuration.nix
@@ -27,7 +27,7 @@
   # Set this for clan commands use ssh i.e. `clan machines update`
   # If you change the hostname, you need to update this line to root@<new-hostname>
   # This only works however if you have avahi running on your admin machine else use IP
-  clan.core.networking.targetHost = "root@192.168.0.14";
+  clan.core.networking.targetHost = "root@moritz-desktop";
 
   my = {
     ai.enable = true;
diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix
index 92f80c8..547e782 100644
--- a/machines/moritz-server/configuration.nix
+++ b/machines/moritz-server/configuration.nix
@@ -9,7 +9,7 @@
   # Set this for clan commands use ssh i.e. `clan machines update`
   # If you change the hostname, you need to update this line to root@<new-hostname>
   # This only works however if you have avahi running on your admin machine else use IP
-  clan.core.networking.targetHost = "root@192.168.0.3";
+  clan.core.networking.targetHost = "root@moritz-server";
 
   networking = {
     interfaces.enp2s0 = {
diff --git a/modules/shared.nix b/modules/shared.nix
index d7457ea..75d24ad 100644
--- a/modules/shared.nix
+++ b/modules/shared.nix
@@ -9,6 +9,8 @@
     clan-core.clanModules.machine-id
   ];
 
+  networking.hosts."fd77:acc0:1d56:2265:499:9367:28e0:97d3" = [ "moritz-remarkable" ];
+
   # Locale service discovery and mDNS
   services.avahi.enable = true;