diff --git a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch b/pkgs/by-name/cl/cloud-init/0001-add-nixos-support.patch
similarity index 100%
rename from pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch
rename to pkgs/by-name/cl/cloud-init/0001-add-nixos-support.patch
diff --git a/pkgs/tools/virtualization/cloud-init/0002-fix-test-logs-on-nixos.patch b/pkgs/by-name/cl/cloud-init/0002-fix-test-logs-on-nixos.patch
similarity index 100%
rename from pkgs/tools/virtualization/cloud-init/0002-fix-test-logs-on-nixos.patch
rename to pkgs/by-name/cl/cloud-init/0002-fix-test-logs-on-nixos.patch
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/by-name/cl/cloud-init/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/cloud-init/default.nix
rename to pkgs/by-name/cl/cloud-init/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39a2b6c7aa9f..c4f99dc65177 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1647,8 +1647,6 @@ with pkgs;
 
   clickgen = with python3Packages; toPythonApplication clickgen;
 
-  cloud-init = callPackage ../tools/virtualization/cloud-init { inherit systemd; };
-
   coloredlogs = with python3Packages; toPythonApplication coloredlogs;
 
   czkawka-full = czkawka.wrapper.override {