diff --git a/flake.nix b/flake.nix
index 092200e..ecf4a65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -179,19 +179,18 @@
                 inherit nixpkgs;
               };
             };
-            drone = { lib, ... }: {
-              deployment = {
-                targetHost = "10.0.0.202";
-                targetUser = "root";
+          } // builtins.listToAttrs (map
+            (machine: {
+              name = machine;
+              value = {
+                deployment = {
+                  targetHost = machines.${machine}.deploy.host;
+                  targetUser = "root"; # machines.${machine}.deploy.sshUser;
+                };
+                imports = self.lib.systemModules (machines.${machine}.system or "x86_64-linux") machines.${machine}.config;
               };
-              imports =
-                let
-                  system = "x86_64-linux";
-                  systemConfig = import ./machines/drone/configuration.nix inputs;
-                in
-                self.lib.systemModules system systemConfig;
-            };
-          };
+            })
+            (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines)));
 
         };
 
@@ -241,11 +240,11 @@
                   just
                   pciutils
 
-                  (cryptsetup.override {
-                    withInternalArgon2 = true;
-                  })
+                  cryptsetup
 
                   disko.packages.${system}.disko
+
+                  colmena
                 ];
               };