diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index a81ddd2d..452f3839 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -126,6 +126,7 @@ let
         in
         (machineImports settings)
         ++ [
+          settings
           clan-core.nixosModules.clanCore
           extraConfig
           (machines.${name} or { })
diff --git a/pkgs/clan-cli/tests/test_vms_cli.py b/pkgs/clan-cli/tests/test_vms_cli.py
index a1dba225..73a614f0 100644
--- a/pkgs/clan-cli/tests/test_vms_cli.py
+++ b/pkgs/clan-cli/tests/test_vms_cli.py
@@ -40,7 +40,7 @@ def run_vm_in_thread(machine_name: str) -> None:
 # wait for qmp socket to exist
 def wait_vm_up(state_dir: Path) -> None:
     socket_file = state_dir / "qga.sock"
-    timeout: float = 120
+    timeout: float = 20
     while True:
         if timeout <= 0:
             raise TimeoutError(