diff --git a/nix/modules/nixos/services/buildbot-nix-autoscaler.nix b/nix/modules/nixos/services/buildbot-nix-autoscaler.nix
index c2d96eb..5a5d873 100644
--- a/nix/modules/nixos/services/buildbot-nix-autoscaler.nix
+++ b/nix/modules/nixos/services/buildbot-nix-autoscaler.nix
@@ -33,7 +33,7 @@ in
 
     reserveTimeoutSeconds = lib.mkOption {
       type = lib.types.int;
-      default = 1200;
+      default = 600;
       description = "Seconds CapacityGateStep waits for a ready reservation.";
     };
 
@@ -133,22 +133,20 @@ in
       }
     ];
 
-    services.buildbot-master.pythonPackages =
-      ps:
-      [
-        (
-          if cfg.extensionPackage != null then
-            ps.toPythonModule cfg.extensionPackage
-          else if builtins.hasAttr "buildbot-autoscale-ext" ps then
-            ps."buildbot-autoscale-ext"
-          else
-            throw ''
-              services.buildbot-nix.nix-build-autoscaler requires buildbot-autoscale-ext in
-              services.buildbot-master.pythonPackages set. Add a pythonPackagesExtensions overlay
-              providing buildbot-autoscale-ext, or set extensionPackage explicitly.
-            ''
-        )
-      ];
+    services.buildbot-master.pythonPackages = ps: [
+      (
+        if cfg.extensionPackage != null then
+          ps.toPythonModule cfg.extensionPackage
+        else if builtins.hasAttr "buildbot-autoscale-ext" ps then
+          ps."buildbot-autoscale-ext"
+        else
+          throw ''
+            services.buildbot-nix.nix-build-autoscaler requires buildbot-autoscale-ext in
+            services.buildbot-master.pythonPackages set. Add a pythonPackagesExtensions overlay
+            providing buildbot-autoscale-ext, or set extensionPackage explicitly.
+          ''
+      )
+    ];
 
     services.buildbot-master.extraImports = ''
       from buildbot_autoscale_ext.configurator import AutoscaleConfigurator
diff --git a/nix/modules/nixos/services/nix-builder-autoscaler.nix b/nix/modules/nixos/services/nix-builder-autoscaler.nix
index 10a9818..14b80dc 100644
--- a/nix/modules/nixos/services/nix-builder-autoscaler.nix
+++ b/nix/modules/nixos/services/nix-builder-autoscaler.nix
@@ -228,6 +228,8 @@ in
       }
     ];
 
+    environment.systemPackages = [ cfg.package ];
+
     services.haproxy = lib.mkIf cfg.haproxy.generateConfig {
       enable = true;
       config = ''