diff --git a/img/builder.nix b/img/builder.nix
index 20bd820..67cdd05 100644
--- a/img/builder.nix
+++ b/img/builder.nix
@@ -5,7 +5,6 @@
   nix,
   nix-output-monitor,
   nodejs_24,
-  pkgs,
   podman,
   writeTextFile,
 
@@ -27,7 +26,7 @@ let
 in
 lib'.mkImage {
   name = name "builder";
-  contents = [
+  contents = lib'.basePackages ++ [
     buildah
     git
     nix
diff --git a/lib.nix b/lib.nix
index 7484ea7..26d8e00 100644
--- a/lib.nix
+++ b/lib.nix
@@ -1,21 +1,17 @@
 { pkgs, ... }:
 
 {
-  basePackages = with pkgs; rec {
-    copyToRoot = paths;
-    paths = [
-      bashInteractive
-      cacert
-      coreutils-full
-      dockerTools.binSh
-      dockerTools.caCertificates
-      dockerTools.shadowSetup
-      dockerTools.usrBinEnv
-      findutils
-      gnugrep
-      gnused
-    ];
-  };
+  basePackages = with pkgs; [
+    bashInteractive
+    cacert
+    coreutils-full
+    dockerTools.binSh
+    dockerTools.caCertificates
+    dockerTools.usrBinEnv
+    findutils
+    gnugrep
+    gnused
+  ];
 
   mkImage =
     options: