diff --git a/flake.nix b/flake.nix
index fed7c7b..9b780ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
       lib = nixpkgs.lib;
-      hosts = import hosts/hosts.nix { inherit inputs; };
+      hosts = import hosts/deployments.nix { inherit inputs; };
     in
     {
 
diff --git a/hosts/deployments.nix b/hosts/deployments.nix
new file mode 100644
index 0000000..14a2983
--- /dev/null
+++ b/hosts/deployments.nix
@@ -0,0 +1,106 @@
+{ inputs, ... }:
+let
+  hosts = import ./hosts.nix;
+in
+{
+  meta = {
+    nixpkgs = import inputs.nixpkgs {
+      system = "x86_64-linux";
+      overlays = [ ];
+    };
+    nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) inputs.self.nixosConfigurations;
+    nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) inputs.self.nixosConfigurations;
+  };
+
+  arr.deployment = {
+    targetHost = hosts.arr;
+    tags = [
+      "lxc"
+      "bacco"
+      "arr"
+    ];
+  };
+
+  caddy.deployment = {
+    targetHost = hosts.caddy;
+    tags = [
+      "lxc"
+      "bacco"
+      "arr"
+      "auth"
+      "metrics"
+      "nextcloud"
+      "portainer"
+      "vaultwarden"
+    ];
+  };
+
+  metrics.deployment = {
+    targetHost = hosts.metrics;
+    tags = [
+      "lxc"
+      "bacco"
+      "metrics"
+    ];
+  };
+
+  nextcloud.deployment = {
+    targetHost = hosts.nextcloud;
+    tags = [
+      "lxc"
+      "bacco"
+      "nextcloud"
+    ];
+  };
+
+  vaultwarden.deployment = {
+    targetHost = hosts.vaultwarden;
+    tags = [
+      "lxc"
+      "bacco"
+      "vaultwarden"
+    ];
+  };
+
+  plex.deployment = {
+    targetHost = hosts.plex;
+    tags = [
+      "lxc"
+      "node"
+    ];
+  };
+
+  portainer.deployment = {
+    targetHost = hosts.portainer;
+    tags = [
+      "lxc"
+      "node"
+      "portainer"
+    ];
+  };
+
+  authentik.deployment = {
+    targetHost = hosts.authentik;
+    tags = [
+      "lxc"
+      "node"
+      "auth"
+    ];
+  };
+
+  colmena.deployment = {
+    targetHost = hosts.colmena;
+    tags = [
+      "lxc"
+      "node"
+      "colmena"
+    ];
+  };
+
+  deadbeef.deployment = {
+    allowLocalDeployment = true;
+    targetHost = null;
+    tags = [ "local" ];
+  };
+
+}
diff --git a/hosts/hosts.nix b/hosts/hosts.nix
index faf8b3e..2caf93d 100644
--- a/hosts/hosts.nix
+++ b/hosts/hosts.nix
@@ -1,103 +1,11 @@
-{ inputs, ... }:
 {
-  meta = {
-    nixpkgs = import inputs.nixpkgs {
-      system = "x86_64-linux";
-      overlays = [ ];
-    };
-    nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) inputs.self.nixosConfigurations;
-    nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) inputs.self.nixosConfigurations;
-  };
-
-  arr.deployment = {
-    targetHost = "192.168.1.189";
-    tags = [
-      "lxc"
-      "bacco"
-      "arr"
-    ];
-  };
-
-  caddy.deployment = {
-    targetHost = "192.168.1.150";
-    tags = [
-      "lxc"
-      "bacco"
-      "arr"
-      "auth"
-      "metrics"
-      "nextcloud"
-      "portainer"
-      "vaultwarden"
-    ];
-  };
-
-  metrics.deployment = {
-    targetHost = "192.168.1.152";
-    tags = [
-      "lxc"
-      "bacco"
-      "metrics"
-    ];
-  };
-
-  nextcloud.deployment = {
-    targetHost = "192.168.1.103";
-    tags = [
-      "lxc"
-      "bacco"
-      "nextcloud"
-    ];
-  };
-
-  vaultwarden.deployment = {
-    targetHost = "192.168.1.154";
-    tags = [
-      "lxc"
-      "bacco"
-      "vaultwarden"
-    ];
-  };
-
-  plex.deployment = {
-    targetHost = "192.168.1.155";
-    tags = [
-      "lxc"
-      "node"
-    ];
-  };
-
-  portainer.deployment = {
-    targetHost = "192.168.1.156";
-    tags = [
-      "lxc"
-      "node"
-      "portainer"
-    ];
-  };
-
-  authentik.deployment = {
-    targetHost = "192.168.1.157";
-    tags = [
-      "lxc"
-      "node"
-      "auth"
-    ];
-  };
-
-  colmena.deployment = {
-    targetHost = "192.168.1.158";
-    tags = [
-      "lxc"
-      "node"
-      "colmena"
-    ];
-  };
-
-  deadbeef.deployment = {
-    allowLocalDeployment = true;
-    targetHost = null;
-    tags = [ "local" ];
-  };
-
+  authentik = "auth.internal";
+  arr = "arr.internal";
+  caddy = "caddy.internal";
+  metrics = "metrics.internal";
+  nextcloud = "nextcloud.internal";
+  vaultwarden = "vaultwarden.internal";
+  plex = "plex.internal";
+  portainer = "portainer.internal";
+  colmena = "colmena.internal";
 }