diff --git a/.changeset/blue-crabs-sparkle.md b/.changeset/blue-crabs-sparkle.md
deleted file mode 100644
index 9e556f7385c..00000000000
--- a/.changeset/blue-crabs-sparkle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@pnpm/git-fetcher": patch
-"@pnpm/tarball-fetcher": patch
-"pnpm": patch
----
-
-Fixes a regression introduced in pnpm v6.23.3 via [#4044](https://github.com/pnpm/pnpm/pull/4044).
-
-The temporary directory to which the Git-hosted package is downloaded should not be removed prematurely [#4064](https://github.com/pnpm/pnpm/issues/4064).
diff --git a/packages/artifacts/linux-arm64/package.json b/packages/artifacts/linux-arm64/package.json
index f98e6161c12..bb3d7a949d5 100644
--- a/packages/artifacts/linux-arm64/package.json
+++ b/packages/artifacts/linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/linux-arm64",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/linux-x64/package.json b/packages/artifacts/linux-x64/package.json
index 48cdb54d711..a846f8fc3f0 100644
--- a/packages/artifacts/linux-x64/package.json
+++ b/packages/artifacts/linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/linux-x64",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/macos-arm64/package.json b/packages/artifacts/macos-arm64/package.json
index 2c5c368796b..3542f357694 100644
--- a/packages/artifacts/macos-arm64/package.json
+++ b/packages/artifacts/macos-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/macos-arm64",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/macos-x64/package.json b/packages/artifacts/macos-x64/package.json
index 8905641ffe6..7bddfc06675 100644
--- a/packages/artifacts/macos-x64/package.json
+++ b/packages/artifacts/macos-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/macos-x64",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/artifacts/win-x64/package.json b/packages/artifacts/win-x64/package.json
index 744cb73756a..3edec64139f 100644
--- a/packages/artifacts/win-x64/package.json
+++ b/packages/artifacts/win-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/win-x64",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "license": "MIT",
   "publishConfig": {
     "bin": {
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
index 09e849e3c07..c7575ffe29e 100644
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pnpm/client
 
+## 6.0.8
+
+### Patch Changes
+
+- Updated dependencies [b13e4b452]
+  - @pnpm/git-fetcher@4.1.10
+  - @pnpm/tarball-fetcher@9.3.11
+
 ## 6.0.7
 
 ### Patch Changes
diff --git a/packages/client/package.json b/packages/client/package.json
index c191ac58438..5cfd8bc1a39 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/client",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "description": "Creates the package resolve and fetch functions",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,9 +35,9 @@
     "@pnpm/directory-fetcher": "workspace:1.0.1",
     "@pnpm/fetch": "workspace:4.2.0",
     "@pnpm/fetching-types": "workspace:2.2.1",
-    "@pnpm/git-fetcher": "workspace:4.1.9",
+    "@pnpm/git-fetcher": "workspace:4.1.10",
     "@pnpm/resolver-base": "workspace:8.1.1",
-    "@pnpm/tarball-fetcher": "workspace:9.3.10",
+    "@pnpm/tarball-fetcher": "workspace:9.3.11",
     "credentials-by-uri": "^2.0.0",
     "mem": "^8.0.0"
   },
diff --git a/packages/core/package.json b/packages/core/package.json
index 15503bf95b2..8790db4d37c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -68,7 +68,7 @@
     "@pnpm/assert-project": "workspace:*",
     "@pnpm/assert-store": "workspace:*",
     "@pnpm/cafs": "workspace:3.0.9",
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/package-store": "workspace:12.1.3",
     "@pnpm/prepare": "workspace:0.0.28",
diff --git a/packages/exe/package.json b/packages/exe/package.json
index 2506020a997..850181e1cfb 100644
--- a/packages/exe/package.json
+++ b/packages/exe/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnpm/exe",
   "description": "Fast, disk space efficient package manager",
-  "version": "6.23.5",
+  "version": "6.23.6",
   "publishConfig": {
     "bin": {
       "pnpm": "pnpm"
@@ -11,11 +11,11 @@
     "url": "https://github.com/pnpm/pnpm/issues"
   },
   "optionalDependencies": {
-    "@pnpm/linux-arm64": "workspace:6.23.5",
-    "@pnpm/linux-x64": "workspace:6.23.5",
-    "@pnpm/macos-arm64": "workspace:6.23.5",
-    "@pnpm/macos-x64": "workspace:6.23.5",
-    "@pnpm/win-x64": "workspace:6.23.5"
+    "@pnpm/linux-arm64": "workspace:6.23.6",
+    "@pnpm/linux-x64": "workspace:6.23.6",
+    "@pnpm/macos-arm64": "workspace:6.23.6",
+    "@pnpm/macos-x64": "workspace:6.23.6",
+    "@pnpm/win-x64": "workspace:6.23.6"
   },
   "devDependencies": {
     "@zkochan/pkg": "0.0.0-2",
diff --git a/packages/git-fetcher/CHANGELOG.md b/packages/git-fetcher/CHANGELOG.md
index d53cce963be..f30e8d67f5c 100644
--- a/packages/git-fetcher/CHANGELOG.md
+++ b/packages/git-fetcher/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pnpm/git-fetcher
 
+## 4.1.10
+
+### Patch Changes
+
+- b13e4b452: Fixes a regression introduced in pnpm v6.23.3 via [#4044](https://github.com/pnpm/pnpm/pull/4044).
+
+  The temporary directory to which the Git-hosted package is downloaded should not be removed prematurely [#4064](https://github.com/pnpm/pnpm/issues/4064).
+
 ## 4.1.9
 
 ### Patch Changes
diff --git a/packages/git-fetcher/package.json b/packages/git-fetcher/package.json
index 22281753cf2..e4e5fea38ff 100644
--- a/packages/git-fetcher/package.json
+++ b/packages/git-fetcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/git-fetcher",
-  "version": "4.1.9",
+  "version": "4.1.10",
   "description": "A fetcher for git-hosted packages",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/headless/package.json b/packages/headless/package.json
index e206377d4e5..242b10199ba 100644
--- a/packages/headless/package.json
+++ b/packages/headless/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@pnpm/assert-project": "workspace:*",
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/package-store": "workspace:12.1.3",
     "@pnpm/prepare": "workspace:0.0.28",
diff --git a/packages/outdated/CHANGELOG.md b/packages/outdated/CHANGELOG.md
index 2dd5bf3fe6a..773fb703a78 100644
--- a/packages/outdated/CHANGELOG.md
+++ b/packages/outdated/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/outdated
 
+## 9.0.21
+
+### Patch Changes
+
+- @pnpm/client@6.0.8
+
 ## 9.0.20
 
 ### Patch Changes
diff --git a/packages/outdated/package.json b/packages/outdated/package.json
index 861c4246ed7..821138cfaf2 100644
--- a/packages/outdated/package.json
+++ b/packages/outdated/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/outdated",
-  "version": "9.0.20",
+  "version": "9.0.21",
   "description": "Check for outdated packages",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -36,7 +36,7 @@
     "@pnpm/logger": "^4.0.0"
   },
   "dependencies": {
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/lockfile-file": "workspace:4.2.1",
diff --git a/packages/package-requester/package.json b/packages/package-requester/package.json
index 7624a1aadd0..0f351e37a1a 100644
--- a/packages/package-requester/package.json
+++ b/packages/package-requester/package.json
@@ -61,7 +61,7 @@
     "ssri": "^8.0.1"
   },
   "devDependencies": {
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/package-store": "workspace:12.1.3",
     "@types/ncp": "^2.0.4",
diff --git a/packages/package-store/package.json b/packages/package-store/package.json
index bdc9b9e5965..1cda9b4280f 100644
--- a/packages/package-store/package.json
+++ b/packages/package-store/package.json
@@ -36,7 +36,7 @@
     "write-json-file": "^4.3.0"
   },
   "devDependencies": {
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/prepare": "workspace:0.0.28",
     "@types/ramda": "0.27.39",
diff --git a/packages/plugin-commands-env/CHANGELOG.md b/packages/plugin-commands-env/CHANGELOG.md
index 613c32741d5..d86c40d79a6 100644
--- a/packages/plugin-commands-env/CHANGELOG.md
+++ b/packages/plugin-commands-env/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pnpm/plugin-commands-env
 
+## 1.2.12
+
+### Patch Changes
+
+- Updated dependencies [b13e4b452]
+  - @pnpm/tarball-fetcher@9.3.11
+  - @pnpm/package-store@12.1.3
+
 ## 1.2.11
 
 ### Patch Changes
diff --git a/packages/plugin-commands-env/package.json b/packages/plugin-commands-env/package.json
index 4c2b2b3090c..cc87bea773d 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": "1.2.11",
+  "version": "1.2.12",
   "description": "pnpm commands for managing Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,7 +37,7 @@
     "@pnpm/fetcher-base": "workspace:11.1.1",
     "@pnpm/package-store": "workspace:12.1.3",
     "@pnpm/store-path": "^5.0.0",
-    "@pnpm/tarball-fetcher": "workspace:9.3.10",
+    "@pnpm/tarball-fetcher": "workspace:9.3.11",
     "@zkochan/cmd-shim": "^5.2.1",
     "adm-zip": "^0.5.5",
     "load-json-file": "^6.2.0",
diff --git a/packages/plugin-commands-installation/CHANGELOG.md b/packages/plugin-commands-installation/CHANGELOG.md
index 4beb13bb175..4425d193f80 100644
--- a/packages/plugin-commands-installation/CHANGELOG.md
+++ b/packages/plugin-commands-installation/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @pnpm/plugin-commands-installation
 
+## 8.0.2
+
+### Patch Changes
+
+- @pnpm/core@2.0.1
+- @pnpm/outdated@9.0.21
+- @pnpm/package-store@12.1.3
+- @pnpm/store-connection-manager@3.1.14
+- @pnpm/plugin-commands-rebuild@5.3.5
+
 ## 8.0.1
 
 ### Patch Changes
diff --git a/packages/plugin-commands-installation/package.json b/packages/plugin-commands-installation/package.json
index 9adb8c86889..8403a053fc7 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": "8.0.1",
+  "version": "8.0.2",
   "description": "Commands for installation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -71,16 +71,16 @@
     "@pnpm/find-workspace-packages": "workspace:3.1.28",
     "@pnpm/graceful-fs": "workspace:1.0.0",
     "@pnpm/manifest-utils": "workspace:2.1.2",
-    "@pnpm/outdated": "workspace:9.0.20",
+    "@pnpm/outdated": "workspace:9.0.21",
     "@pnpm/package-store": "workspace:12.1.3",
     "@pnpm/parse-wanted-dependency": "workspace:2.0.0",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.3.4",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.3.5",
     "@pnpm/pnpmfile": "workspace:1.2.0",
     "@pnpm/read-project-manifest": "workspace:2.0.7",
     "@pnpm/resolver-base": "workspace:8.1.1",
     "@pnpm/semver-diff": "^1.0.2",
     "@pnpm/sort-packages": "workspace:2.1.3",
-    "@pnpm/store-connection-manager": "workspace:3.1.13",
+    "@pnpm/store-connection-manager": "workspace:3.1.14",
     "@pnpm/types": "workspace:7.6.0",
     "@yarnpkg/core": "^3.2.0-rc.4",
     "@yarnpkg/lockfile": "^1.1.0",
diff --git a/packages/plugin-commands-listing/package.json b/packages/plugin-commands-listing/package.json
index 6128ce28a45..4e3dfdf0b20 100644
--- a/packages/plugin-commands-listing/package.json
+++ b/packages/plugin-commands-listing/package.json
@@ -35,7 +35,7 @@
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/filter-workspace-packages": "workspace:4.4.8",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/plugin-commands-installation": "workspace:8.0.1",
+    "@pnpm/plugin-commands-installation": "workspace:8.0.2",
     "@pnpm/prepare": "workspace:0.0.28",
     "@types/ramda": "0.27.39",
     "execa": "npm:safe-execa@^0.1.1",
diff --git a/packages/plugin-commands-outdated/CHANGELOG.md b/packages/plugin-commands-outdated/CHANGELOG.md
index 205db503f69..7b91f99a73d 100644
--- a/packages/plugin-commands-outdated/CHANGELOG.md
+++ b/packages/plugin-commands-outdated/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/plugin-commands-outdated
 
+## 5.0.36
+
+### Patch Changes
+
+- @pnpm/outdated@9.0.21
+
 ## 5.0.35
 
 ### Patch Changes
diff --git a/packages/plugin-commands-outdated/package.json b/packages/plugin-commands-outdated/package.json
index eb65882f81d..b6c443915f1 100644
--- a/packages/plugin-commands-outdated/package.json
+++ b/packages/plugin-commands-outdated/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-outdated",
-  "version": "5.0.35",
+  "version": "5.0.36",
   "description": "The outdated command of pnpm",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/filter-workspace-packages": "workspace:4.4.8",
-    "@pnpm/plugin-commands-installation": "workspace:8.0.1",
+    "@pnpm/plugin-commands-installation": "workspace:8.0.2",
     "@pnpm/prepare": "workspace:0.0.28",
     "@pnpm/types": "workspace:7.6.0",
     "@types/lru-cache": "^5.1.0",
@@ -55,7 +55,7 @@
     "@pnpm/lockfile-file": "workspace:4.2.1",
     "@pnpm/matcher": "workspace:2.0.0",
     "@pnpm/modules-yaml": "workspace:9.0.6",
-    "@pnpm/outdated": "workspace:9.0.20",
+    "@pnpm/outdated": "workspace:9.0.21",
     "@pnpm/semver-diff": "^1.0.2",
     "@pnpm/store-path": "^5.0.0",
     "@zkochan/table": "^1.0.0",
diff --git a/packages/plugin-commands-publishing/CHANGELOG.md b/packages/plugin-commands-publishing/CHANGELOG.md
index 8f133abc05d..717dd330b38 100644
--- a/packages/plugin-commands-publishing/CHANGELOG.md
+++ b/packages/plugin-commands-publishing/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/plugin-commands-publishing
 
+## 4.2.33
+
+### Patch Changes
+
+- @pnpm/client@6.0.8
+
 ## 4.2.32
 
 ### Patch Changes
diff --git a/packages/plugin-commands-publishing/package.json b/packages/plugin-commands-publishing/package.json
index 1cc82730fea..de45f571fe2 100644
--- a/packages/plugin-commands-publishing/package.json
+++ b/packages/plugin-commands-publishing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-publishing",
-  "version": "4.2.32",
+  "version": "4.2.33",
   "description": "The pack and publish commands of pnpm",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@pnpm/cli-utils": "workspace:0.6.36",
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/config": "workspace:13.6.1",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/exportable-manifest": "workspace:2.2.0",
diff --git a/packages/plugin-commands-rebuild/CHANGELOG.md b/packages/plugin-commands-rebuild/CHANGELOG.md
index 8bf7fd193a7..d26a848869a 100644
--- a/packages/plugin-commands-rebuild/CHANGELOG.md
+++ b/packages/plugin-commands-rebuild/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pnpm/plugin-commands-rebuild
 
+## 5.3.5
+
+### Patch Changes
+
+- @pnpm/store-connection-manager@3.1.14
+
 ## 5.3.4
 
 ### Patch Changes
diff --git a/packages/plugin-commands-rebuild/package.json b/packages/plugin-commands-rebuild/package.json
index 7c2b8ce8e17..67261a4d8d5 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.3.4",
+  "version": "5.3.5",
   "description": "Commands for rebuilding dependencies",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -60,7 +60,7 @@
     "@pnpm/modules-yaml": "workspace:9.0.6",
     "@pnpm/normalize-registries": "workspace:2.0.8",
     "@pnpm/sort-packages": "workspace:2.1.3",
-    "@pnpm/store-connection-manager": "workspace:3.1.13",
+    "@pnpm/store-connection-manager": "workspace:3.1.14",
     "@pnpm/store-controller-types": "workspace:11.0.7",
     "@pnpm/types": "workspace:7.6.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 114f2c96ec3..fd7cfe099ed 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.53
+
+### Patch Changes
+
+- @pnpm/server@11.0.13
+- @pnpm/store-connection-manager@3.1.14
+
 ## 3.0.52
 
 ### Patch Changes
diff --git a/packages/plugin-commands-server/package.json b/packages/plugin-commands-server/package.json
index 253af879c35..78c6f968140 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.52",
+  "version": "3.0.53",
   "description": "Commands for controlling the store server",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,7 +41,7 @@
     "@pnpm/config": "workspace:13.6.1",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/server": "workspace:11.0.13",
-    "@pnpm/store-connection-manager": "workspace:3.1.13",
+    "@pnpm/store-connection-manager": "workspace:3.1.14",
     "@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 7be403c354e..c57d0bebcdb 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.37
+
+### Patch Changes
+
+- @pnpm/store-connection-manager@3.1.14
+
 ## 4.0.36
 
 ### Patch Changes
diff --git a/packages/plugin-commands-store/package.json b/packages/plugin-commands-store/package.json
index d498da053c0..7b7ced2e19e 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.36",
+  "version": "4.0.37",
   "description": "Commands for controlling the store",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -59,7 +59,7 @@
     "@pnpm/normalize-registries": "workspace:2.0.8",
     "@pnpm/parse-wanted-dependency": "workspace:2.0.0",
     "@pnpm/pick-registry-for-package": "workspace:2.0.6",
-    "@pnpm/store-connection-manager": "workspace:3.1.13",
+    "@pnpm/store-connection-manager": "workspace:3.1.14",
     "@pnpm/store-controller-types": "workspace:11.0.7",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/types": "workspace:7.6.0",
diff --git a/packages/pnpm/CHANGELOG.md b/packages/pnpm/CHANGELOG.md
index d8dd55e9925..0a51681eb62 100644
--- a/packages/pnpm/CHANGELOG.md
+++ b/packages/pnpm/CHANGELOG.md
@@ -1,5 +1,13 @@
 # pnpm
 
+## 6.23.6
+
+### Patch Changes
+
+- Fixes a regression introduced in pnpm v6.23.3 via [#4044](https://github.com/pnpm/pnpm/pull/4044).
+
+  The temporary directory to which the Git-hosted package is downloaded should not be removed prematurely [#4064](https://github.com/pnpm/pnpm/issues/4064).
+
 ## 6.23.5
 
 ### Patch Changes
diff --git a/packages/pnpm/package.json b/packages/pnpm/package.json
index 28796cd5584..961484cfe04 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.23.5",
+  "version": "6.23.6",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -23,7 +23,7 @@
     "@pnpm/byline": "^1.0.0",
     "@pnpm/cli-meta": "workspace:2.0.0",
     "@pnpm/cli-utils": "workspace:0.6.36",
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/command": "workspace:2.0.0",
     "@pnpm/common-cli-options-help": "workspace:0.7.1",
     "@pnpm/config": "workspace:13.6.1",
@@ -41,16 +41,16 @@
     "@pnpm/parse-cli-args": "workspace:4.3.0",
     "@pnpm/pick-registry-for-package": "workspace:2.0.6",
     "@pnpm/plugin-commands-audit": "workspace:5.1.26",
-    "@pnpm/plugin-commands-env": "workspace:1.2.11",
-    "@pnpm/plugin-commands-installation": "workspace:8.0.1",
+    "@pnpm/plugin-commands-env": "workspace:1.2.12",
+    "@pnpm/plugin-commands-installation": "workspace:8.0.2",
     "@pnpm/plugin-commands-listing": "workspace:4.0.27",
-    "@pnpm/plugin-commands-outdated": "workspace:5.0.35",
-    "@pnpm/plugin-commands-publishing": "workspace:4.2.32",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.3.4",
+    "@pnpm/plugin-commands-outdated": "workspace:5.0.36",
+    "@pnpm/plugin-commands-publishing": "workspace:4.2.33",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.3.5",
     "@pnpm/plugin-commands-script-runners": "workspace:4.5.5",
-    "@pnpm/plugin-commands-server": "workspace:3.0.52",
+    "@pnpm/plugin-commands-server": "workspace:3.0.53",
     "@pnpm/plugin-commands-setup": "workspace:1.1.21",
-    "@pnpm/plugin-commands-store": "workspace:4.0.36",
+    "@pnpm/plugin-commands-store": "workspace:4.0.37",
     "@pnpm/prepare": "workspace:0.0.28",
     "@pnpm/read-package-json": "workspace:5.0.6",
     "@pnpm/read-project-manifest": "workspace:2.0.7",
diff --git a/packages/server/package.json b/packages/server/package.json
index 09e68e5f387..5d6a8566f47 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -33,7 +33,7 @@
     "@pnpm/logger": "^4.0.0"
   },
   "devDependencies": {
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/package-requester": "workspace:15.2.3",
     "@pnpm/package-store": "workspace:12.1.3",
diff --git a/packages/store-connection-manager/CHANGELOG.md b/packages/store-connection-manager/CHANGELOG.md
index cfe5b6cea02..1ac1f2d8e28 100644
--- a/packages/store-connection-manager/CHANGELOG.md
+++ b/packages/store-connection-manager/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pnpm/store-connection-manager
 
+## 3.1.14
+
+### Patch Changes
+
+- @pnpm/client@6.0.8
+- @pnpm/package-store@12.1.3
+- @pnpm/server@11.0.13
+
 ## 3.1.13
 
 ### Patch Changes
diff --git a/packages/store-connection-manager/package.json b/packages/store-connection-manager/package.json
index cebeceb1b28..c88a546b5b7 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.1.13",
+  "version": "3.1.14",
   "description": "Create a direct pnpm store controller or connect to a running store server",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@pnpm/cli-meta": "workspace:2.0.0",
-    "@pnpm/client": "workspace:6.0.7",
+    "@pnpm/client": "workspace:6.0.8",
     "@pnpm/config": "workspace:13.6.1",
     "@pnpm/error": "workspace:2.0.0",
     "@pnpm/package-store": "workspace:12.1.3",
diff --git a/packages/tarball-fetcher/CHANGELOG.md b/packages/tarball-fetcher/CHANGELOG.md
index 9affda6e46b..97eaf34acdf 100644
--- a/packages/tarball-fetcher/CHANGELOG.md
+++ b/packages/tarball-fetcher/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pnpm/tarball-fetcher
 
+## 9.3.11
+
+### Patch Changes
+
+- b13e4b452: Fixes a regression introduced in pnpm v6.23.3 via [#4044](https://github.com/pnpm/pnpm/pull/4044).
+
+  The temporary directory to which the Git-hosted package is downloaded should not be removed prematurely [#4064](https://github.com/pnpm/pnpm/issues/4064).
+
 ## 9.3.10
 
 ### Patch Changes
diff --git a/packages/tarball-fetcher/package.json b/packages/tarball-fetcher/package.json
index b2768bcbaac..531a1bc9a0f 100644
--- a/packages/tarball-fetcher/package.json
+++ b/packages/tarball-fetcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/tarball-fetcher",
-  "version": "9.3.10",
+  "version": "9.3.11",
   "description": "Fetcher for packages hosted as tarballs",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cbc5d9797c8..abad9d32c36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -290,10 +290,10 @@ importers:
       '@pnpm/directory-fetcher': workspace:1.0.1
       '@pnpm/fetch': workspace:4.2.0
       '@pnpm/fetching-types': workspace:2.2.1
-      '@pnpm/git-fetcher': workspace:4.1.9
+      '@pnpm/git-fetcher': workspace:4.1.10
       '@pnpm/logger': ^4.0.0
       '@pnpm/resolver-base': workspace:8.1.1
-      '@pnpm/tarball-fetcher': workspace:9.3.10
+      '@pnpm/tarball-fetcher': workspace:9.3.11
       credentials-by-uri: ^2.0.0
       mem: ^8.0.0
     dependencies:
@@ -375,7 +375,7 @@ importers:
       '@pnpm/assert-store': workspace:*
       '@pnpm/build-modules': workspace:7.2.0
       '@pnpm/cafs': workspace:3.0.9
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/constants': workspace:5.0.0
       '@pnpm/core': 'link:'
       '@pnpm/core-loggers': workspace:6.0.6
@@ -705,11 +705,11 @@ importers:
   packages/exe:
     specifiers:
       '@pnpm/exe': 'link:'
-      '@pnpm/linux-arm64': workspace:6.23.5
-      '@pnpm/linux-x64': workspace:6.23.5
-      '@pnpm/macos-arm64': workspace:6.23.5
-      '@pnpm/macos-x64': workspace:6.23.5
-      '@pnpm/win-x64': workspace:6.23.5
+      '@pnpm/linux-arm64': workspace:6.23.6
+      '@pnpm/linux-x64': workspace:6.23.6
+      '@pnpm/macos-arm64': workspace:6.23.6
+      '@pnpm/macos-x64': workspace:6.23.6
+      '@pnpm/win-x64': workspace:6.23.6
       '@zkochan/pkg': 0.0.0-2
       execa: npm:safe-execa@^0.1.1
     optionalDependencies:
@@ -1036,7 +1036,7 @@ importers:
     specifiers:
       '@pnpm/assert-project': workspace:*
       '@pnpm/build-modules': workspace:7.2.0
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/constants': workspace:5.0.0
       '@pnpm/core-loggers': workspace:6.0.6
       '@pnpm/error': workspace:2.0.0
@@ -1714,7 +1714,7 @@ importers:
 
   packages/outdated:
     specifiers:
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/constants': workspace:5.0.0
       '@pnpm/error': workspace:2.0.0
       '@pnpm/lockfile-file': workspace:4.2.1
@@ -1794,7 +1794,7 @@ importers:
   packages/package-requester:
     specifiers:
       '@pnpm/cafs': workspace:3.0.9
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/core-loggers': workspace:6.0.6
       '@pnpm/error': workspace:2.0.0
       '@pnpm/fetcher-base': workspace:11.1.1
@@ -1867,7 +1867,7 @@ importers:
   packages/package-store:
     specifiers:
       '@pnpm/cafs': workspace:3.0.9
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/core-loggers': workspace:6.0.6
       '@pnpm/fetcher-base': workspace:11.1.1
       '@pnpm/logger': ^4.0.0
@@ -2031,7 +2031,7 @@ importers:
       '@pnpm/plugin-commands-env': 'link:'
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/store-path': ^5.0.0
-      '@pnpm/tarball-fetcher': workspace:9.3.10
+      '@pnpm/tarball-fetcher': workspace:9.3.11
       '@types/adm-zip': ^0.4.34
       '@zkochan/cmd-shim': ^5.2.1
       adm-zip: ^0.5.5
@@ -2089,18 +2089,18 @@ importers:
       '@pnpm/manifest-utils': workspace:2.1.2
       '@pnpm/matcher': workspace:2.0.0
       '@pnpm/modules-yaml': workspace:9.0.6
-      '@pnpm/outdated': workspace:9.0.20
+      '@pnpm/outdated': workspace:9.0.21
       '@pnpm/package-store': workspace:12.1.3
       '@pnpm/parse-wanted-dependency': workspace:2.0.0
       '@pnpm/plugin-commands-installation': 'link:'
-      '@pnpm/plugin-commands-rebuild': workspace:5.3.4
+      '@pnpm/plugin-commands-rebuild': workspace:5.3.5
       '@pnpm/pnpmfile': workspace:1.2.0
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/read-project-manifest': workspace:2.0.7
       '@pnpm/resolver-base': workspace:8.1.1
       '@pnpm/semver-diff': ^1.0.2
       '@pnpm/sort-packages': workspace:2.1.3
-      '@pnpm/store-connection-manager': workspace:3.1.13
+      '@pnpm/store-connection-manager': workspace:3.1.14
       '@pnpm/test-fixtures': workspace:*
       '@pnpm/types': workspace:7.6.0
       '@types/is-ci': ^3.0.0
@@ -2222,7 +2222,7 @@ importers:
       '@pnpm/filter-workspace-packages': workspace:4.4.8
       '@pnpm/list': workspace:6.2.13
       '@pnpm/logger': ^4.0.0
-      '@pnpm/plugin-commands-installation': workspace:8.0.1
+      '@pnpm/plugin-commands-installation': workspace:8.0.2
       '@pnpm/plugin-commands-listing': 'link:'
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/types': workspace:7.6.0
@@ -2267,8 +2267,8 @@ importers:
       '@pnpm/lockfile-file': workspace:4.2.1
       '@pnpm/matcher': workspace:2.0.0
       '@pnpm/modules-yaml': workspace:9.0.6
-      '@pnpm/outdated': workspace:9.0.20
-      '@pnpm/plugin-commands-installation': workspace:8.0.1
+      '@pnpm/outdated': workspace:9.0.21
+      '@pnpm/plugin-commands-installation': workspace:8.0.2
       '@pnpm/plugin-commands-outdated': 'link:'
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/semver-diff': ^1.0.2
@@ -2321,7 +2321,7 @@ importers:
   packages/plugin-commands-publishing:
     specifiers:
       '@pnpm/cli-utils': workspace:0.6.36
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/config': workspace:13.6.1
       '@pnpm/error': workspace:2.0.0
       '@pnpm/exportable-manifest': workspace:2.2.0
@@ -2425,7 +2425,7 @@ importers:
       '@pnpm/plugin-commands-rebuild': 'link:'
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/sort-packages': workspace:2.1.3
-      '@pnpm/store-connection-manager': workspace:3.1.13
+      '@pnpm/store-connection-manager': workspace:3.1.14
       '@pnpm/store-controller-types': workspace:11.0.7
       '@pnpm/test-fixtures': workspace:*
       '@pnpm/types': workspace:7.6.0
@@ -2557,7 +2557,7 @@ importers:
       '@pnpm/logger': ^4.0.0
       '@pnpm/plugin-commands-server': 'link:'
       '@pnpm/server': workspace:11.0.13
-      '@pnpm/store-connection-manager': workspace:3.1.13
+      '@pnpm/store-connection-manager': workspace:3.1.14
       '@pnpm/store-path': ^5.0.0
       '@types/is-windows': ^1.0.0
       '@types/ramda': 0.27.39
@@ -2629,7 +2629,7 @@ importers:
       '@pnpm/pick-registry-for-package': workspace:2.0.6
       '@pnpm/plugin-commands-store': 'link:'
       '@pnpm/prepare': workspace:0.0.28
-      '@pnpm/store-connection-manager': workspace:3.1.13
+      '@pnpm/store-connection-manager': workspace:3.1.14
       '@pnpm/store-controller-types': workspace:11.0.7
       '@pnpm/store-path': ^5.0.0
       '@pnpm/types': workspace:7.6.0
@@ -2694,7 +2694,7 @@ importers:
       '@pnpm/byline': ^1.0.0
       '@pnpm/cli-meta': workspace:2.0.0
       '@pnpm/cli-utils': workspace:0.6.36
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/command': workspace:2.0.0
       '@pnpm/common-cli-options-help': workspace:0.7.1
       '@pnpm/config': workspace:13.6.1
@@ -2712,16 +2712,16 @@ importers:
       '@pnpm/parse-cli-args': workspace:4.3.0
       '@pnpm/pick-registry-for-package': workspace:2.0.6
       '@pnpm/plugin-commands-audit': workspace:5.1.26
-      '@pnpm/plugin-commands-env': workspace:1.2.11
-      '@pnpm/plugin-commands-installation': workspace:8.0.1
+      '@pnpm/plugin-commands-env': workspace:1.2.12
+      '@pnpm/plugin-commands-installation': workspace:8.0.2
       '@pnpm/plugin-commands-listing': workspace:4.0.27
-      '@pnpm/plugin-commands-outdated': workspace:5.0.35
-      '@pnpm/plugin-commands-publishing': workspace:4.2.32
-      '@pnpm/plugin-commands-rebuild': workspace:5.3.4
+      '@pnpm/plugin-commands-outdated': workspace:5.0.36
+      '@pnpm/plugin-commands-publishing': workspace:4.2.33
+      '@pnpm/plugin-commands-rebuild': workspace:5.3.5
       '@pnpm/plugin-commands-script-runners': workspace:4.5.5
-      '@pnpm/plugin-commands-server': workspace:3.0.52
+      '@pnpm/plugin-commands-server': workspace:3.0.53
       '@pnpm/plugin-commands-setup': workspace:1.1.21
-      '@pnpm/plugin-commands-store': workspace:4.0.36
+      '@pnpm/plugin-commands-store': workspace:4.0.37
       '@pnpm/prepare': workspace:0.0.28
       '@pnpm/read-package-json': workspace:5.0.6
       '@pnpm/read-project-manifest': workspace:2.0.7
@@ -3129,7 +3129,7 @@ importers:
 
   packages/server:
     specifiers:
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/fetch': workspace:4.2.0
       '@pnpm/logger': ^4.0.0
       '@pnpm/package-requester': workspace:15.2.3
@@ -3184,7 +3184,7 @@ importers:
   packages/store-connection-manager:
     specifiers:
       '@pnpm/cli-meta': workspace:2.0.0
-      '@pnpm/client': workspace:6.0.7
+      '@pnpm/client': workspace:6.0.8
       '@pnpm/config': workspace:13.6.1
       '@pnpm/error': workspace:2.0.0
       '@pnpm/logger': ^4.0.0