diff --git a/configurations/nixos/base/default.nix b/configurations/nixos/base-tofu/default.nix
similarity index 93%
rename from configurations/nixos/base/default.nix
rename to configurations/nixos/base-tofu/default.nix
index 26a9b5f..f3a4301 100644
--- a/configurations/nixos/base/default.nix
+++ b/configurations/nixos/base-tofu/default.nix
@@ -19,7 +19,7 @@ in
     enable = false;
   };
   networking = {
-    hostName = "base";
+    hostName = "base-tofu";
   };
   environment.systemPackages = [
   ];
diff --git a/configurations/nixos/caddy/default.nix b/configurations/nixos/caddy-tofu/default.nix
similarity index 86%
rename from configurations/nixos/caddy/default.nix
rename to configurations/nixos/caddy-tofu/default.nix
index ed0f9a8..862e737 100644
--- a/configurations/nixos/caddy/default.nix
+++ b/configurations/nixos/caddy-tofu/default.nix
@@ -16,10 +16,9 @@ in
   ];
   deploy = {
     enable = false;
-    address = "unknown.local";
   };
   networking = {
-    hostName = "caddy";
+    hostName = "caddy-tofu";
   };
   environment.systemPackages = [
   ];
diff --git a/configurations/nixos/forgejo-runner-tofu/default.nix b/configurations/nixos/forgejo-runner-tofu/default.nix
index 6ec8334..b463f97 100644
--- a/configurations/nixos/forgejo-runner-tofu/default.nix
+++ b/configurations/nixos/forgejo-runner-tofu/default.nix
@@ -62,9 +62,6 @@ in
       };
     };
   };
-  deploy = {
-    address = "201:ea26:66c7:657b:3599:63a6:c66c:d388";
-  };
   networking = {
     firewall.enable = lib.mkForce false;
     hostName = "forgejo-runner-tofu";
diff --git a/configurations/nixos/link-warden-tofu/default.nix b/configurations/nixos/link-warden-tofu/default.nix
index 2404728..37c1804 100644
--- a/configurations/nixos/link-warden-tofu/default.nix
+++ b/configurations/nixos/link-warden-tofu/default.nix
@@ -15,9 +15,6 @@ in
     self.nixosModules.default
     "${modulesPath}/virtualisation/lxc-container.nix"
   ];
-  deploy = {
-    address = "200:7e25:554c:6df3:2c5:2de:6f9f:a96d";
-  };
   networking = {
     hostName = "link-warden-tofu";
   };
diff --git a/configurations/nixos/medchart-tofu/default.nix b/configurations/nixos/medchart-tofu/default.nix
index 45d7e03..2ae4e24 100644
--- a/configurations/nixos/medchart-tofu/default.nix
+++ b/configurations/nixos/medchart-tofu/default.nix
@@ -19,7 +19,7 @@ in
     enable = false;
   };
   networking = {
-    hostName = "medchart";
+    hostName = "medchart-tofu";
   };
   environment.systemPackages = [
   ];
diff --git a/configurations/nixos/observer-tofu/default.nix b/configurations/nixos/observer-tofu/default.nix
index b1d30b8..4dbfd21 100644
--- a/configurations/nixos/observer-tofu/default.nix
+++ b/configurations/nixos/observer-tofu/default.nix
@@ -15,9 +15,6 @@ in
     self.nixosModules.default
     "${modulesPath}/virtualisation/lxc-container.nix"
   ];
-  deploy = {
-    address = "200:b938:d405:92df:a6e:1ffd:5213:26b";
-  };
   services = {
     uptime-kuma = {
       enable = true;
diff --git a/modules/nixos/common/deployrs.nix b/modules/nixos/common/deployrs.nix
index 61a6c68..0caf926 100644
--- a/modules/nixos/common/deployrs.nix
+++ b/modules/nixos/common/deployrs.nix
@@ -1,4 +1,7 @@
 { lib, config, ... }:
+let
+  hosts = builtins.fromJSON (builtins.readFile ../../../container_ips.json);
+in
 {
   options.deploy = {
     enable = lib.mkEnableOption "enable deployrs module" // {
@@ -6,7 +9,7 @@
     };
     address = lib.mkOption {
       type = lib.types.str;
-      default = config.networking.hostName;
+      default = hosts.${config.networking.hostName};
     };
   };
 }