diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/by-name/ya/yarn-berry/package.nix
similarity index 100%
rename from pkgs/development/tools/yarn-berry/default.nix
rename to pkgs/by-name/ya/yarn-berry/package.nix
diff --git a/pkgs/development/tools/yarn-berry/update.sh b/pkgs/by-name/ya/yarn-berry/update.sh
similarity index 100%
rename from pkgs/development/tools/yarn-berry/update.sh
rename to pkgs/by-name/ya/yarn-berry/update.sh
diff --git a/pkgs/by-name/ya/yarn-berry_3/package.nix b/pkgs/by-name/ya/yarn-berry_3/package.nix
new file mode 100644
index 0000000000000..ae8d931bf872f
--- /dev/null
+++ b/pkgs/by-name/ya/yarn-berry_3/package.nix
@@ -0,0 +1,7 @@
+{
+  yarn-berry,
+}:
+
+yarn-berry.override {
+  berryVersion = 3;
+}
diff --git a/pkgs/by-name/ya/yarn-berry_4/package.nix b/pkgs/by-name/ya/yarn-berry_4/package.nix
new file mode 100644
index 0000000000000..1030d18b1dd6d
--- /dev/null
+++ b/pkgs/by-name/ya/yarn-berry_4/package.nix
@@ -0,0 +1,7 @@
+{
+  yarn-berry,
+}:
+
+yarn-berry.override {
+  berryVersion = 4;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b01880c6f686..22747bb2739b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5944,18 +5944,6 @@ with pkgs;
 
   yapf = with python3Packages; toPythonApplication yapf;
 
-  inherit
-    ({
-      yarn-berry_3 = callPackage ../development/tools/yarn-berry { berryVersion = 3; };
-
-      yarn-berry_4 = callPackage ../development/tools/yarn-berry { };
-    })
-    yarn-berry_3
-    yarn-berry_4
-    ;
-
-  yarn-berry = yarn-berry_4;
-
   yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
 
   inherit (yarn2nix-moretea)