diff --git a/.changeset/gentle-pandas-live.md b/.changeset/gentle-pandas-live.md
deleted file mode 100644
index f5393be9bb..0000000000
--- a/.changeset/gentle-pandas-live.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@pnpm/resolve-dependencies": major
----
-
-Optional dependencies are always marked as `requiresBuild` as they are not always fetched and as a result there is no way to check whethere they need to be built or not.
diff --git a/.changeset/selfish-clocks-bow.md b/.changeset/selfish-clocks-bow.md
deleted file mode 100644
index 597ceb120f..0000000000
--- a/.changeset/selfish-clocks-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@pnpm/package-requester": minor
----
-
-Do not fetch optional packages that are not installable on the target system.
diff --git a/.changeset/sweet-pianos-sniff.md b/.changeset/sweet-pianos-sniff.md
deleted file mode 100644
index 07a823fbe9..0000000000
--- a/.changeset/sweet-pianos-sniff.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"pnpm": patch
----
-
-Those optional dependencies that don't support the target system should not be downloaded from the registry.
diff --git a/packages/artifacts/linux-x64/package.json b/packages/artifacts/linux-x64/package.json
index fdea9abd03..3b01d303cc 100644
--- a/packages/artifacts/linux-x64/package.json
+++ b/packages/artifacts/linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/linux-x64",
-  "version": "0.0.2-6.13.0",
+  "version": "0.0.2-6.14.0-0",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/macos-arm64/package.json b/packages/artifacts/macos-arm64/package.json
index 5118128c59..6a68a8d8c9 100644
--- a/packages/artifacts/macos-arm64/package.json
+++ b/packages/artifacts/macos-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/macos-arm64",
-  "version": "0.0.2-6.13.0",
+  "version": "0.0.2-6.14.0-0",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/macos-x64/package.json b/packages/artifacts/macos-x64/package.json
index 25ee249ead..47cd9d3e47 100644
--- a/packages/artifacts/macos-x64/package.json
+++ b/packages/artifacts/macos-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/macos-x64",
-  "version": "0.0.2-6.13.0",
+  "version": "0.0.2-6.14.0-0",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/win-x64/package.json b/packages/artifacts/win-x64/package.json
index fd236b52a2..9b342d671a 100644
--- a/packages/artifacts/win-x64/package.json
+++ b/packages/artifacts/win-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/win-x64",
-  "version": "0.0.2-6.13.0",
+  "version": "0.0.2-6.14.0-0",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/beta/package.json b/packages/beta/package.json
index b9e4d37430..38c302855e 100644
--- a/packages/beta/package.json
+++ b/packages/beta/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnpm/beta",
   "description": "Fast, disk space efficient package manager",
-  "version": "0.0.2-6.13.0",
+  "version": "0.0.2-6.14.0-0",
   "publishConfig": {
     "bin": {
       "pnpm": "pnpm"
@@ -11,10 +11,10 @@
     "url": "https://github.com/pnpm/pnpm/issues"
   },
   "optionalDependencies": {
-    "@pnpm/linux-x64": "workspace:0.0.2-6.13.0",
-    "@pnpm/macos-arm64": "workspace:0.0.2-6.13.0",
-    "@pnpm/macos-x64": "workspace:0.0.2-6.13.0",
-    "@pnpm/win-x64": "workspace:0.0.2-6.13.0"
+    "@pnpm/linux-x64": "workspace:0.0.2-6.14.0-0",
+    "@pnpm/macos-arm64": "workspace:0.0.2-6.14.0-0",
+    "@pnpm/macos-x64": "workspace:0.0.2-6.14.0-0",
+    "@pnpm/win-x64": "workspace:0.0.2-6.14.0-0"
   },
   "devDependencies": {
     "@zkochan/pkg": "0.0.0-2",
diff --git a/packages/git-fetcher/package.json b/packages/git-fetcher/package.json
index e1d5f44814..f2484886d7 100644
--- a/packages/git-fetcher/package.json
+++ b/packages/git-fetcher/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@pnpm/cafs": "workspace:3.0.7",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/types": "workspace:7.4.0",
     "p-defer": "^3.0.0",
     "tempy": "^1.0.0"
diff --git a/packages/headless/CHANGELOG.md b/packages/headless/CHANGELOG.md
index 1f4ca78f6f..35d59d46db 100644
--- a/packages/headless/CHANGELOG.md
+++ b/packages/headless/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/headless
 
+## 16.0.23
+
+### Patch Changes
+
+- Updated dependencies [07e7b1c0c]
+  - @pnpm/package-requester@15.1.0
+
 ## 16.0.22
 
 ### Patch Changes
diff --git a/packages/headless/package.json b/packages/headless/package.json
index dc2fc74ffa..90d8df1642 100644
--- a/packages/headless/package.json
+++ b/packages/headless/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnpm/headless",
   "description": "Fast installation using only pnpm-lock.yaml",
-  "version": "16.0.22",
+  "version": "16.0.23",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -18,7 +18,7 @@
     "@pnpm/assert-project": "workspace:*",
     "@pnpm/client": "workspace:5.0.2",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/prepare": "workspace:0.0.26",
     "@pnpm/read-projects-context": "workspace:5.0.6",
     "@pnpm/store-path": "^5.0.0",
@@ -80,7 +80,7 @@
     "@pnpm/modules-cleaner": "workspace:11.0.10",
     "@pnpm/modules-yaml": "workspace:9.0.4",
     "@pnpm/package-is-installable": "workspace:5.0.4",
-    "@pnpm/package-requester": "workspace:15.0.7",
+    "@pnpm/package-requester": "workspace:15.1.0",
     "@pnpm/read-package-json": "workspace:5.0.4",
     "@pnpm/read-project-manifest": "workspace:2.0.5",
     "@pnpm/store-controller-types": "workspace:11.0.5",
diff --git a/packages/package-requester/CHANGELOG.md b/packages/package-requester/CHANGELOG.md
index 136773b0fb..452bef3a36 100644
--- a/packages/package-requester/CHANGELOG.md
+++ b/packages/package-requester/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/package-requester
 
+## 15.1.0
+
+### Minor Changes
+
+- 07e7b1c0c: Do not fetch optional packages that are not installable on the target system.
+
 ## 15.0.7
 
 ### Patch Changes
diff --git a/packages/package-requester/package.json b/packages/package-requester/package.json
index a4d2f42de0..71f2752bd0 100644
--- a/packages/package-requester/package.json
+++ b/packages/package-requester/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/package-requester",
-  "version": "15.0.7",
+  "version": "15.1.0",
   "description": "Concurrent downloader of npm-compatible packages",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -61,7 +61,7 @@
   "devDependencies": {
     "@pnpm/client": "workspace:5.0.2",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@types/ncp": "^2.0.4",
     "@types/normalize-path": "^3.0.0",
     "@types/ramda": "0.27.39",
diff --git a/packages/package-store/CHANGELOG.md b/packages/package-store/CHANGELOG.md
index 84644f9d4b..b0e4a1211a 100644
--- a/packages/package-store/CHANGELOG.md
+++ b/packages/package-store/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/package-store
 
+## 12.0.13
+
+### Patch Changes
+
+- Updated dependencies [07e7b1c0c]
+  - @pnpm/package-requester@15.1.0
+
 ## 12.0.12
 
 ### Patch Changes
diff --git a/packages/package-store/package.json b/packages/package-store/package.json
index bf96cf993d..8c4d399bdc 100644
--- a/packages/package-store/package.json
+++ b/packages/package-store/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnpm/package-store",
   "description": "A storage for packages",
-  "version": "12.0.12",
+  "version": "12.0.13",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -18,7 +18,7 @@
     "@pnpm/cafs": "workspace:3.0.7",
     "@pnpm/core-loggers": "workspace:6.0.4",
     "@pnpm/fetcher-base": "workspace:11.0.3",
-    "@pnpm/package-requester": "workspace:15.0.7",
+    "@pnpm/package-requester": "workspace:15.1.0",
     "@pnpm/resolver-base": "workspace:8.0.4",
     "@pnpm/store-controller-types": "workspace:11.0.5",
     "@pnpm/types": "workspace:7.4.0",
diff --git a/packages/plugin-commands-env/CHANGELOG.md b/packages/plugin-commands-env/CHANGELOG.md
index 8f642f25c2..f24ca97a4c 100644
--- a/packages/plugin-commands-env/CHANGELOG.md
+++ b/packages/plugin-commands-env/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/plugin-commands-env
 
+## 0.2.12
+
+### Patch Changes
+
+- @pnpm/package-store@12.0.13
+- @pnpm/tarball-fetcher@9.3.4
+
 ## 0.2.11
 
 ### Patch Changes
diff --git a/packages/plugin-commands-env/package.json b/packages/plugin-commands-env/package.json
index fc3d10c79a..e31189b73a 100644
--- a/packages/plugin-commands-env/package.json
+++ b/packages/plugin-commands-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-env",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "pnpm commands for managing Node.js",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,7 +33,7 @@
     "@pnpm/config": "workspace:12.4.6",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/fetch": "workspace:4.0.2",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/tarball-fetcher": "workspace:9.3.4",
     "@zkochan/cmd-shim": "^5.1.3",
diff --git a/packages/plugin-commands-import/CHANGELOG.md b/packages/plugin-commands-import/CHANGELOG.md
index 804ebec9a3..191a038996 100644
--- a/packages/plugin-commands-import/CHANGELOG.md
+++ b/packages/plugin-commands-import/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/plugin-commands-import
 
+## 3.0.13
+
+### Patch Changes
+
+- supi@0.47.13
+- @pnpm/store-connection-manager@3.0.8
+
 ## 3.0.12
 
 ### Patch Changes
diff --git a/packages/plugin-commands-import/package.json b/packages/plugin-commands-import/package.json
index 4bd50a14f7..5efea14bd1 100644
--- a/packages/plugin-commands-import/package.json
+++ b/packages/plugin-commands-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-import",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "description": "The import command",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -44,11 +44,11 @@
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/read-project-manifest": "workspace:2.0.5",
-    "@pnpm/store-connection-manager": "workspace:3.0.7",
+    "@pnpm/store-connection-manager": "workspace:3.0.8",
     "@zkochan/rimraf": "^2.1.1",
     "load-json-file": "^6.2.0",
     "render-help": "^1.0.1",
-    "supi": "workspace:0.47.12"
+    "supi": "workspace:0.47.13"
   },
   "funding": "https://opencollective.com/pnpm"
 }
diff --git a/packages/plugin-commands-installation/CHANGELOG.md b/packages/plugin-commands-installation/CHANGELOG.md
index 7290a18ee7..b5c39d24d0 100644
--- a/packages/plugin-commands-installation/CHANGELOG.md
+++ b/packages/plugin-commands-installation/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @pnpm/plugin-commands-installation
 
+## 6.0.13
+
+### Patch Changes
+
+- supi@0.47.13
+- @pnpm/package-store@12.0.13
+- @pnpm/store-connection-manager@3.0.8
+- @pnpm/plugin-commands-rebuild@5.0.9
+
 ## 6.0.12
 
 ### Patch Changes
diff --git a/packages/plugin-commands-installation/package.json b/packages/plugin-commands-installation/package.json
index 735c849fdf..69ad8f9d32 100644
--- a/packages/plugin-commands-installation/package.json
+++ b/packages/plugin-commands-installation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-installation",
-  "version": "6.0.12",
+  "version": "6.0.13",
   "description": "Commands for installation",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -66,14 +66,14 @@
     "@pnpm/find-workspace-packages": "workspace:3.1.8",
     "@pnpm/manifest-utils": "workspace:2.0.4",
     "@pnpm/outdated": "workspace:9.0.2",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/parse-wanted-dependency": "workspace:2.0.0",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.0.8",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.0.9",
     "@pnpm/pnpmfile": "workspace:1.0.5",
     "@pnpm/resolver-base": "workspace:8.0.4",
     "@pnpm/semver-diff": "^1.0.2",
     "@pnpm/sort-packages": "workspace:2.1.1",
-    "@pnpm/store-connection-manager": "workspace:3.0.7",
+    "@pnpm/store-connection-manager": "workspace:3.0.8",
     "@pnpm/types": "workspace:7.4.0",
     "@zkochan/table": "^1.0.0",
     "camelcase-keys": "^6.2.2",
@@ -89,7 +89,7 @@
     "ramda": "^0.27.1",
     "read-ini-file": "^3.1.0",
     "render-help": "^1.0.1",
-    "supi": "workspace:0.47.12",
+    "supi": "workspace:0.47.13",
     "version-selector-type": "^3.0.0"
   },
   "peerDependencies": {
diff --git a/packages/plugin-commands-listing/package.json b/packages/plugin-commands-listing/package.json
index a1edbcfd55..08ad4dc072 100644
--- a/packages/plugin-commands-listing/package.json
+++ b/packages/plugin-commands-listing/package.json
@@ -34,7 +34,7 @@
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/filter-workspace-packages": "workspace:4.1.10",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/plugin-commands-installation": "workspace:6.0.12",
+    "@pnpm/plugin-commands-installation": "workspace:6.0.13",
     "@pnpm/prepare": "workspace:0.0.26",
     "@types/ramda": "0.27.39",
     "execa": "^5.0.0",
diff --git a/packages/plugin-commands-outdated/package.json b/packages/plugin-commands-outdated/package.json
index f09a454b51..98c19269a6 100644
--- a/packages/plugin-commands-outdated/package.json
+++ b/packages/plugin-commands-outdated/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/filter-workspace-packages": "workspace:4.1.10",
-    "@pnpm/plugin-commands-installation": "workspace:6.0.12",
+    "@pnpm/plugin-commands-installation": "workspace:6.0.13",
     "@pnpm/prepare": "workspace:0.0.26",
     "@pnpm/types": "workspace:7.4.0",
     "@types/lru-cache": "^5.1.0",
diff --git a/packages/plugin-commands-rebuild/CHANGELOG.md b/packages/plugin-commands-rebuild/CHANGELOG.md
index eb59d26ab6..f18528899e 100644
--- a/packages/plugin-commands-rebuild/CHANGELOG.md
+++ b/packages/plugin-commands-rebuild/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/plugin-commands-rebuild
 
+## 5.0.9
+
+### Patch Changes
+
+- @pnpm/store-connection-manager@3.0.8
+
 ## 5.0.8
 
 ### Patch Changes
diff --git a/packages/plugin-commands-rebuild/package.json b/packages/plugin-commands-rebuild/package.json
index e6c183d4af..74b96962f3 100644
--- a/packages/plugin-commands-rebuild/package.json
+++ b/packages/plugin-commands-rebuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-rebuild",
-  "version": "5.0.8",
+  "version": "5.0.9",
   "description": "Commands for rebuilding dependencies",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -59,7 +59,7 @@
     "@pnpm/modules-yaml": "workspace:9.0.4",
     "@pnpm/normalize-registries": "workspace:2.0.4",
     "@pnpm/sort-packages": "workspace:2.1.1",
-    "@pnpm/store-connection-manager": "workspace:3.0.7",
+    "@pnpm/store-connection-manager": "workspace:3.0.8",
     "@pnpm/store-controller-types": "workspace:11.0.5",
     "@pnpm/types": "workspace:7.4.0",
     "@zkochan/npm-package-arg": "^2.0.1",
diff --git a/packages/plugin-commands-server/CHANGELOG.md b/packages/plugin-commands-server/CHANGELOG.md
index 9fd97bfad0..8095dfeb05 100644
--- a/packages/plugin-commands-server/CHANGELOG.md
+++ b/packages/plugin-commands-server/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/plugin-commands-server
 
+## 3.0.25
+
+### Patch Changes
+
+- @pnpm/server@11.0.5
+- @pnpm/store-connection-manager@3.0.8
+
 ## 3.0.24
 
 ### Patch Changes
diff --git a/packages/plugin-commands-server/package.json b/packages/plugin-commands-server/package.json
index c63caae99c..6fd61adbed 100644
--- a/packages/plugin-commands-server/package.json
+++ b/packages/plugin-commands-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-server",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "description": "Commands for controlling the store server",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -40,7 +40,7 @@
     "@pnpm/config": "workspace:12.4.6",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/server": "workspace:11.0.5",
-    "@pnpm/store-connection-manager": "workspace:3.0.7",
+    "@pnpm/store-connection-manager": "workspace:3.0.8",
     "@pnpm/store-path": "^5.0.0",
     "@zkochan/diable": "^1.0.2",
     "delay": "^5.0.0",
diff --git a/packages/plugin-commands-store/CHANGELOG.md b/packages/plugin-commands-store/CHANGELOG.md
index 69de9cc265..12ef524342 100644
--- a/packages/plugin-commands-store/CHANGELOG.md
+++ b/packages/plugin-commands-store/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/plugin-commands-store
 
+## 4.0.9
+
+### Patch Changes
+
+- @pnpm/store-connection-manager@3.0.8
+
 ## 4.0.8
 
 ### Patch Changes
diff --git a/packages/plugin-commands-store/package.json b/packages/plugin-commands-store/package.json
index ba816d4714..463059196a 100644
--- a/packages/plugin-commands-store/package.json
+++ b/packages/plugin-commands-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-store",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "Commands for controlling the store",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -58,7 +58,7 @@
     "@pnpm/normalize-registries": "workspace:2.0.4",
     "@pnpm/parse-wanted-dependency": "workspace:2.0.0",
     "@pnpm/pick-registry-for-package": "workspace:2.0.4",
-    "@pnpm/store-connection-manager": "workspace:3.0.7",
+    "@pnpm/store-connection-manager": "workspace:3.0.8",
     "@pnpm/store-controller-types": "workspace:11.0.5",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/types": "workspace:7.4.0",
diff --git a/packages/pnpm/CHANGELOG.md b/packages/pnpm/CHANGELOG.md
index cba96e13ad..732f36d562 100644
--- a/packages/pnpm/CHANGELOG.md
+++ b/packages/pnpm/CHANGELOG.md
@@ -1,5 +1,15 @@
 # pnpm
 
+## 6.14.0-0
+
+### Minor Changes
+
+- Backward-compatible change to the lockfile format. Optional dependencies will always have the `requiresBuild` field set to `true`. This change is needed to allow skipping optional dependency downloads, when the optional dependency is not compatible with the target system [#2038](https://github.com/pnpm/pnpm/issues/2038)
+
+### Patch Changes
+
+- Those optional dependencies that don't support the target system should not be downloaded from the registry [#2038](https://github.com/pnpm/pnpm/issues/2038).
+
 ## 6.13.0
 
 ### Minor Changes
diff --git a/packages/pnpm/package.json b/packages/pnpm/package.json
index 4afa1709a9..66375244d3 100644
--- a/packages/pnpm/package.json
+++ b/packages/pnpm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "6.13.0",
+  "version": "6.14.0-0",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -40,17 +40,17 @@
     "@pnpm/parse-cli-args": "workspace:4.3.0",
     "@pnpm/pick-registry-for-package": "workspace:2.0.4",
     "@pnpm/plugin-commands-audit": "workspace:5.1.5",
-    "@pnpm/plugin-commands-env": "workspace:0.2.11",
-    "@pnpm/plugin-commands-import": "workspace:3.0.12",
-    "@pnpm/plugin-commands-installation": "workspace:6.0.12",
+    "@pnpm/plugin-commands-env": "workspace:0.2.12",
+    "@pnpm/plugin-commands-import": "workspace:3.0.13",
+    "@pnpm/plugin-commands-installation": "workspace:6.0.13",
     "@pnpm/plugin-commands-listing": "workspace:4.0.7",
     "@pnpm/plugin-commands-outdated": "workspace:5.0.8",
     "@pnpm/plugin-commands-publishing": "workspace:4.2.4",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.0.8",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.0.9",
     "@pnpm/plugin-commands-script-runners": "workspace:4.1.1",
-    "@pnpm/plugin-commands-server": "workspace:3.0.24",
+    "@pnpm/plugin-commands-server": "workspace:3.0.25",
     "@pnpm/plugin-commands-setup": "workspace:^0.1.12",
-    "@pnpm/plugin-commands-store": "workspace:4.0.8",
+    "@pnpm/plugin-commands-store": "workspace:4.0.9",
     "@pnpm/prepare": "workspace:0.0.26",
     "@pnpm/read-package-json": "workspace:5.0.4",
     "@pnpm/read-project-manifest": "workspace:2.0.5",
diff --git a/packages/resolve-dependencies/CHANGELOG.md b/packages/resolve-dependencies/CHANGELOG.md
index b63d923a94..f529c91b3c 100644
--- a/packages/resolve-dependencies/CHANGELOG.md
+++ b/packages/resolve-dependencies/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/resolve-dependencies
 
+## 21.0.0
+
+### Major Changes
+
+- 07e7b1c0c: Optional dependencies are always marked as `requiresBuild` as they are not always fetched and as a result there is no way to check whethere they need to be built or not.
+
 ## 20.0.16
 
 ### Patch Changes
diff --git a/packages/resolve-dependencies/package.json b/packages/resolve-dependencies/package.json
index 5e5f2c528c..9954d80fc1 100644
--- a/packages/resolve-dependencies/package.json
+++ b/packages/resolve-dependencies/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolve-dependencies",
-  "version": "20.0.16",
+  "version": "21.0.0",
   "description": "Resolves dependency graph of a package",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/server/package.json b/packages/server/package.json
index c71d151d09..c304a96dbf 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -34,8 +34,8 @@
   "devDependencies": {
     "@pnpm/client": "workspace:5.0.2",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-requester": "workspace:15.0.7",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-requester": "workspace:15.1.0",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@types/mz": "^2.7.3",
     "@types/node-fetch": "^2.5.7",
     "@types/uuid": "^8.3.0",
diff --git a/packages/store-connection-manager/CHANGELOG.md b/packages/store-connection-manager/CHANGELOG.md
index a0185463af..7ce9cdf27d 100644
--- a/packages/store-connection-manager/CHANGELOG.md
+++ b/packages/store-connection-manager/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pnpm/store-connection-manager
 
+## 3.0.8
+
+### Patch Changes
+
+- @pnpm/package-store@12.0.13
+- @pnpm/server@11.0.5
+
 ## 3.0.7
 
 ### Patch Changes
diff --git a/packages/store-connection-manager/package.json b/packages/store-connection-manager/package.json
index 57412b305a..9edffdb742 100644
--- a/packages/store-connection-manager/package.json
+++ b/packages/store-connection-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/store-connection-manager",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Create a direct pnpm store controller or connect to a running store server",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -35,7 +35,7 @@
     "@pnpm/client": "workspace:5.0.2",
     "@pnpm/config": "workspace:12.4.6",
     "@pnpm/error": "workspace:2.0.0",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/server": "workspace:11.0.5",
     "@pnpm/store-path": "^5.0.0",
     "@zkochan/diable": "^1.0.2",
diff --git a/packages/supi/CHANGELOG.md b/packages/supi/CHANGELOG.md
index 537882d9bd..12a708c9bb 100644
--- a/packages/supi/CHANGELOG.md
+++ b/packages/supi/CHANGELOG.md
@@ -1,5 +1,15 @@
 # supi
 
+## 0.47.13
+
+### Patch Changes
+
+- Updated dependencies [07e7b1c0c]
+- Updated dependencies [07e7b1c0c]
+  - @pnpm/resolve-dependencies@21.0.0
+  - @pnpm/package-requester@15.1.0
+  - @pnpm/headless@16.0.23
+
 ## 0.47.12
 
 ### Patch Changes
diff --git a/packages/supi/package.json b/packages/supi/package.json
index 1981653808..215d915869 100644
--- a/packages/supi/package.json
+++ b/packages/supi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "supi",
   "description": "Fast, disk space efficient installation engine",
-  "version": "0.47.12",
+  "version": "0.47.13",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -21,7 +21,7 @@
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/filter-lockfile": "workspace:5.0.8",
     "@pnpm/get-context": "workspace:5.1.5",
-    "@pnpm/headless": "workspace:16.0.22",
+    "@pnpm/headless": "workspace:16.0.23",
     "@pnpm/hoist": "workspace:5.0.12",
     "@pnpm/lifecycle": "workspace:11.0.4",
     "@pnpm/link-bins": "workspace:6.0.7",
@@ -33,14 +33,14 @@
     "@pnpm/modules-cleaner": "workspace:11.0.10",
     "@pnpm/modules-yaml": "workspace:9.0.4",
     "@pnpm/normalize-registries": "workspace:2.0.4",
-    "@pnpm/package-requester": "workspace:15.0.7",
+    "@pnpm/package-requester": "workspace:15.1.0",
     "@pnpm/parse-wanted-dependency": "workspace:2.0.0",
     "@pnpm/prune-lockfile": "workspace:3.0.8",
     "@pnpm/read-modules-dir": "workspace:3.0.1",
     "@pnpm/read-package-json": "workspace:5.0.4",
     "@pnpm/read-project-manifest": "workspace:2.0.5",
     "@pnpm/remove-bins": "workspace:2.0.4",
-    "@pnpm/resolve-dependencies": "workspace:20.0.16",
+    "@pnpm/resolve-dependencies": "workspace:21.0.0",
     "@pnpm/resolver-base": "workspace:8.0.4",
     "@pnpm/store-controller-types": "workspace:11.0.5",
     "@pnpm/symlink-dependency": "workspace:4.0.5",
@@ -69,7 +69,7 @@
     "@pnpm/cafs": "workspace:3.0.7",
     "@pnpm/client": "workspace:5.0.2",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@pnpm/prepare": "workspace:0.0.26",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/test-fixtures": "workspace:*",
diff --git a/packages/tarball-fetcher/package.json b/packages/tarball-fetcher/package.json
index 3e135bc690..015f3d9c92 100644
--- a/packages/tarball-fetcher/package.json
+++ b/packages/tarball-fetcher/package.json
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@pnpm/fetch": "workspace:4.0.2",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-store": "workspace:12.0.12",
+    "@pnpm/package-store": "workspace:12.0.13",
     "@types/retry": "^0.12.0",
     "@types/ssri": "^7.1.0",
     "cp-file": "^9.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c3e05b9498..b174c819c4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -152,10 +152,10 @@ importers:
   packages/beta:
     specifiers:
       '@pnpm/beta': 'link:'
-      '@pnpm/linux-x64': workspace:0.0.2-6.13.0
-      '@pnpm/macos-arm64': workspace:0.0.2-6.13.0
-      '@pnpm/macos-x64': workspace:0.0.2-6.13.0
-      '@pnpm/win-x64': workspace:0.0.2-6.13.0
+      '@pnpm/linux-x64': workspace:0.0.2-6.14.0-0
+      '@pnpm/macos-arm64': workspace:0.0.2-6.14.0-0
+      '@pnpm/macos-x64': workspace:0.0.2-6.14.0-0
+      '@pnpm/win-x64': workspace:0.0.2-6.14.0-0
       '@zkochan/pkg': 0.0.0-2
       execa: ^5.0.0
     optionalDependencies:
@@ -740,7 +740,7 @@ importers:
       '@pnpm/cafs': workspace:3.0.7
       '@pnpm/fetcher-base': workspace:11.0.3
       '@pnpm/git-fetcher': 'link:'
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/prepare-package': workspace:1.0.3
       '@pnpm/types': workspace:7.4.0
       '@zkochan/rimraf': ^2.1.1
@@ -829,8 +829,8 @@ importers:
       '@pnpm/modules-cleaner': workspace:11.0.10
       '@pnpm/modules-yaml': workspace:9.0.4
       '@pnpm/package-is-installable': workspace:5.0.4
-      '@pnpm/package-requester': workspace:15.0.7
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-requester': workspace:15.1.0
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/read-package-json': workspace:5.0.4
       '@pnpm/read-project-manifest': workspace:2.0.5
@@ -1560,7 +1560,7 @@ importers:
       '@pnpm/logger': ^4.0.0
       '@pnpm/package-is-installable': workspace:5.0.4
       '@pnpm/package-requester': 'link:'
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/read-package-json': workspace:5.0.4
       '@pnpm/resolver-base': workspace:8.0.4
       '@pnpm/store-controller-types': workspace:11.0.5
@@ -1627,7 +1627,7 @@ importers:
       '@pnpm/core-loggers': workspace:6.0.4
       '@pnpm/fetcher-base': workspace:11.0.3
       '@pnpm/logger': ^4.0.0
-      '@pnpm/package-requester': workspace:15.0.7
+      '@pnpm/package-requester': workspace:15.1.0
       '@pnpm/package-store': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/resolver-base': workspace:8.0.4
@@ -1780,7 +1780,7 @@ importers:
       '@pnpm/config': workspace:12.4.6
       '@pnpm/error': workspace:2.0.0
       '@pnpm/fetch': workspace:4.0.2
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/plugin-commands-env': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/store-path': ^5.0.0
@@ -1830,13 +1830,13 @@ importers:
       '@pnpm/plugin-commands-import': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/read-project-manifest': workspace:2.0.5
-      '@pnpm/store-connection-manager': workspace:3.0.7
+      '@pnpm/store-connection-manager': workspace:3.0.8
       '@types/ncp': ^2.0.4
       '@zkochan/rimraf': ^2.1.1
       load-json-file: ^6.2.0
       ncp: ^2.0.0
       render-help: ^1.0.1
-      supi: workspace:0.47.12
+      supi: workspace:0.47.13
       tempy: ^1.0.0
     dependencies:
       '@pnpm/cli-utils': link:../cli-utils
@@ -1875,16 +1875,16 @@ importers:
       '@pnpm/matcher': workspace:2.0.0
       '@pnpm/modules-yaml': workspace:9.0.4
       '@pnpm/outdated': workspace:9.0.2
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/parse-wanted-dependency': workspace:2.0.0
       '@pnpm/plugin-commands-installation': 'link:'
-      '@pnpm/plugin-commands-rebuild': workspace:5.0.8
+      '@pnpm/plugin-commands-rebuild': workspace:5.0.9
       '@pnpm/pnpmfile': workspace:1.0.5
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/resolver-base': workspace:8.0.4
       '@pnpm/semver-diff': ^1.0.2
       '@pnpm/sort-packages': workspace:2.1.1
-      '@pnpm/store-connection-manager': workspace:3.0.7
+      '@pnpm/store-connection-manager': workspace:3.0.8
       '@pnpm/test-fixtures': workspace:*
       '@pnpm/types': workspace:7.4.0
       '@types/is-ci': ^3.0.0
@@ -1911,7 +1911,7 @@ importers:
       read-yaml-file: ^2.1.0
       render-help: ^1.0.1
       sinon: ^11.1.1
-      supi: workspace:0.47.12
+      supi: workspace:0.47.13
       tempy: ^1.0.0
       version-selector-type: ^3.0.0
       write-json-file: ^4.3.0
@@ -1989,7 +1989,7 @@ importers:
       '@pnpm/filter-workspace-packages': workspace:4.1.10
       '@pnpm/list': workspace:6.2.7
       '@pnpm/logger': ^4.0.0
-      '@pnpm/plugin-commands-installation': workspace:6.0.12
+      '@pnpm/plugin-commands-installation': workspace:6.0.13
       '@pnpm/plugin-commands-listing': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/types': workspace:7.4.0
@@ -2035,7 +2035,7 @@ importers:
       '@pnpm/matcher': workspace:2.0.0
       '@pnpm/modules-yaml': workspace:9.0.4
       '@pnpm/outdated': workspace:9.0.2
-      '@pnpm/plugin-commands-installation': workspace:6.0.12
+      '@pnpm/plugin-commands-installation': workspace:6.0.13
       '@pnpm/plugin-commands-outdated': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/semver-diff': ^1.0.2
@@ -2192,7 +2192,7 @@ importers:
       '@pnpm/plugin-commands-rebuild': 'link:'
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/sort-packages': workspace:2.1.1
-      '@pnpm/store-connection-manager': workspace:3.0.7
+      '@pnpm/store-connection-manager': workspace:3.0.8
       '@pnpm/store-controller-types': workspace:11.0.5
       '@pnpm/test-fixtures': workspace:*
       '@pnpm/types': workspace:7.4.0
@@ -2324,7 +2324,7 @@ importers:
       '@pnpm/logger': ^4.0.0
       '@pnpm/plugin-commands-server': 'link:'
       '@pnpm/server': workspace:11.0.5
-      '@pnpm/store-connection-manager': workspace:3.0.7
+      '@pnpm/store-connection-manager': workspace:3.0.8
       '@pnpm/store-path': ^5.0.0
       '@types/is-windows': ^1.0.0
       '@types/ramda': 0.27.39
@@ -2392,7 +2392,7 @@ importers:
       '@pnpm/pick-registry-for-package': workspace:2.0.4
       '@pnpm/plugin-commands-store': 'link:'
       '@pnpm/prepare': workspace:0.0.26
-      '@pnpm/store-connection-manager': workspace:3.0.7
+      '@pnpm/store-connection-manager': workspace:3.0.8
       '@pnpm/store-controller-types': workspace:11.0.5
       '@pnpm/store-path': ^5.0.0
       '@pnpm/types': workspace:7.4.0
@@ -2474,17 +2474,17 @@ importers:
       '@pnpm/parse-cli-args': workspace:4.3.0
       '@pnpm/pick-registry-for-package': workspace:2.0.4
       '@pnpm/plugin-commands-audit': workspace:5.1.5
-      '@pnpm/plugin-commands-env': workspace:0.2.11
-      '@pnpm/plugin-commands-import': workspace:3.0.12
-      '@pnpm/plugin-commands-installation': workspace:6.0.12
+      '@pnpm/plugin-commands-env': workspace:0.2.12
+      '@pnpm/plugin-commands-import': workspace:3.0.13
+      '@pnpm/plugin-commands-installation': workspace:6.0.13
       '@pnpm/plugin-commands-listing': workspace:4.0.7
       '@pnpm/plugin-commands-outdated': workspace:5.0.8
       '@pnpm/plugin-commands-publishing': workspace:4.2.4
-      '@pnpm/plugin-commands-rebuild': workspace:5.0.8
+      '@pnpm/plugin-commands-rebuild': workspace:5.0.9
       '@pnpm/plugin-commands-script-runners': workspace:4.1.1
-      '@pnpm/plugin-commands-server': workspace:3.0.24
+      '@pnpm/plugin-commands-server': workspace:3.0.25
       '@pnpm/plugin-commands-setup': workspace:^0.1.12
-      '@pnpm/plugin-commands-store': workspace:4.0.8
+      '@pnpm/plugin-commands-store': workspace:4.0.9
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/read-package-json': workspace:5.0.4
       '@pnpm/read-project-manifest': workspace:2.0.5
@@ -2889,8 +2889,8 @@ importers:
       '@pnpm/client': workspace:5.0.2
       '@pnpm/fetch': workspace:4.0.2
       '@pnpm/logger': ^4.0.0
-      '@pnpm/package-requester': workspace:15.0.7
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-requester': workspace:15.1.0
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/server': 'link:'
       '@pnpm/store-controller-types': workspace:11.0.5
       '@pnpm/types': workspace:7.4.0
@@ -2945,7 +2945,7 @@ importers:
       '@pnpm/config': workspace:12.4.6
       '@pnpm/error': workspace:2.0.0
       '@pnpm/logger': ^4.0.0
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/server': workspace:11.0.5
       '@pnpm/store-connection-manager': 'link:'
       '@pnpm/store-path': ^5.0.0
@@ -2992,7 +2992,7 @@ importers:
       '@pnpm/error': workspace:2.0.0
       '@pnpm/filter-lockfile': workspace:5.0.8
       '@pnpm/get-context': workspace:5.1.5
-      '@pnpm/headless': workspace:16.0.22
+      '@pnpm/headless': workspace:16.0.23
       '@pnpm/hoist': workspace:5.0.12
       '@pnpm/lifecycle': workspace:11.0.4
       '@pnpm/link-bins': workspace:6.0.7
@@ -3005,8 +3005,8 @@ importers:
       '@pnpm/modules-cleaner': workspace:11.0.10
       '@pnpm/modules-yaml': workspace:9.0.4
       '@pnpm/normalize-registries': workspace:2.0.4
-      '@pnpm/package-requester': workspace:15.0.7
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-requester': workspace:15.1.0
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/parse-wanted-dependency': workspace:2.0.0
       '@pnpm/prepare': workspace:0.0.26
       '@pnpm/prune-lockfile': workspace:3.0.8
@@ -3014,7 +3014,7 @@ importers:
       '@pnpm/read-package-json': workspace:5.0.4
       '@pnpm/read-project-manifest': workspace:2.0.5
       '@pnpm/remove-bins': workspace:2.0.4
-      '@pnpm/resolve-dependencies': workspace:20.0.16
+      '@pnpm/resolve-dependencies': workspace:21.0.0
       '@pnpm/resolver-base': workspace:8.0.4
       '@pnpm/store-controller-types': workspace:11.0.5
       '@pnpm/store-path': ^5.0.0
@@ -3177,7 +3177,7 @@ importers:
       '@pnpm/fetching-types': workspace:2.1.0
       '@pnpm/graceful-fs': workspace:1.0.0
       '@pnpm/logger': ^4.0.0
-      '@pnpm/package-store': workspace:12.0.12
+      '@pnpm/package-store': workspace:12.0.13
       '@pnpm/prepare-package': workspace:1.0.3
       '@pnpm/tarball-fetcher': 'link:'
       '@types/retry': ^0.12.0