diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index e712fac17a46..dde5d9a92eb1 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -245,6 +245,27 @@ in
         pkgs.e2fsprogs
         pkgs.bash
 
+        pkgs.findutils
+        pkgs.gnugrep
+        pkgs.gnused
+        pkgs.iproute2
+        pkgs.iptables
+
+        # for hostname
+        pkgs.nettools
+
+        pkgs.openssh
+        pkgs.openssl
+        pkgs.parted
+
+        # for pidof
+        pkgs.procps
+
+        # for useradd, usermod
+        pkgs.shadow
+
+        pkgs.util-linux # for (u)mount, fdisk, sfdisk, mkswap
+
         # waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3
         pkgs.python39
 
diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix
index 52a95844284f..e796f95f4df0 100644
--- a/pkgs/applications/networking/cluster/waagent/default.nix
+++ b/pkgs/applications/networking/cluster/waagent/default.nix
@@ -1,18 +1,9 @@
-{ fetchFromGitHub
-, findutils
-, gnugrep
-, gnused
-, iproute2
-, iptables
+{ bash
+, coreutils
+, fetchFromGitHub
 , lib
-, nettools
-, openssh
-, openssl
-, parted
-, procps
 , python39
-, shadow
-, util-linux
+, substituteAll
 }:
 
 let
@@ -47,26 +38,6 @@ python.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = [ python.pkgs.distro ];
 
-  makeWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath [
-      findutils
-      gnugrep
-      gnused
-      iproute2
-      iptables
-      nettools # for hostname
-      openssh
-      openssl
-      parted
-      procps # for pidof
-      shadow # for useradd, usermod
-      util-linux # for (u)mount, fdisk, sfdisk, mkswap
-    ])
-  ];
-
   # The binary entrypoint and udev rules are placed to the wrong place.
   # Move them to their default location.
   preFixup = ''