diff --git a/default.nix b/default.nix
index 99f5d3f..6f221e7 100644
--- a/default.nix
+++ b/default.nix
@@ -46,23 +46,16 @@ rec {
     })
   ) (lib.importConfig ./machines);
 
-  colmena =
-    let
-      deployableConfigurations = lib.filterAttrs (
-        _: v: builtins.hasAttr "ipv4" lib.luj.machines.${v.config.networking.hostName}
+  colmena = {
+    meta = {
+      nodeNixpkgs = builtins.mapAttrs (
+        n: _: import lib.luj.machines.${n}.nixpkgs_version
       ) nixosConfigurations;
-    in
-    {
-      meta = {
-        nodeNixpkgs = builtins.mapAttrs (
-          n: _: import lib.luj.machines.${n}.nixpkgs_version
-        ) deployableConfigurations;
-        nodeSpecialArgs = builtins.mapAttrs (
-          n: v: v._module.specialArgs // { lib = mkLibForMachine n; }
-        ) deployableConfigurations;
-      };
-    }
-    // builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) deployableConfigurations;
+      nodeSpecialArgs = builtins.mapAttrs (
+        n: v: v._module.specialArgs // { lib = mkLibForMachine n; }
+      ) nixosConfigurations;
+    };
+  } // builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) nixosConfigurations;
 
   packages = builtins.listToAttrs (
     builtins.map (plat: {
diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix
index 8cf2d93..974d527 100644
--- a/machines/core-data/default.nix
+++ b/machines/core-data/default.nix
@@ -8,8 +8,7 @@
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
-  deployment.targetHost = lib.mkForce "192.168.0.57";
-  deployment.targetPort = lib.mkForce 45;
+  deployment.tags = [ "server" ];
 
   luj.nginx.enable = true;
 
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index abdb40c..5ef63b7 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -15,6 +15,8 @@
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.useOSProber = true;
 
+  deployment.tags = [ "server" ];
+
   systemd.network.enable = true;
   systemd.network.networks."10-wan" = {
     matchConfig.Name = "ens18";
diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix
index 1bf611e..2e6102a 100644
--- a/machines/gustave/default.nix
+++ b/machines/gustave/default.nix
@@ -11,6 +11,8 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  deployment.tags = [ "server" ];
+
   disko = import ./disko.nix;
 
   systemd.network.enable = true;
diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix
index 8b9e8d2..25d9728 100644
--- a/machines/lambda/default.nix
+++ b/machines/lambda/default.nix
@@ -10,6 +10,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   deployment.buildOnTarget = true;
+  deployment.tags = [ "server" ];
 
   luj.nginx.enable = true;
 
diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index 4dd42e3..bd94728 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -17,6 +17,8 @@
     mailserver.enable = true;
   };
 
+  deployment.tags = [ "server" ];
+
   services.fail2ban.enable = true;
 
   networking.hostId = "fbb334ae";