diff --git a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/pkgs/by-name/wa/waagent/dont-configure-sshd.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch
rename to pkgs/by-name/wa/waagent/dont-configure-sshd.patch
diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/by-name/wa/waagent/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/waagent/default.nix
rename to pkgs/by-name/wa/waagent/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e69ca4d78f5b..4afbc9a5de7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17025,8 +17025,6 @@ with pkgs;
 
   eltclsh = callPackage ../development/tools/eltclsh { };
 
-  waagent = callPackage ../applications/networking/cluster/waagent { };
-
   wasm = ocamlPackages.wasm;
 
   wasm3 = callPackage ../development/interpreters/wasm3 { };