diff --git a/bucket/volta.json b/bucket/volta.json
index 19b25e2dbe..7258394942 100644
--- a/bucket/volta.json
+++ b/bucket/volta.json
@@ -26,19 +26,20 @@
             "        Remove-Item \"$dir\\$original\" -Force",
             "    }",
             "}",
-            "UpdateExeFile 'volta-shim.exe' 'node.exe'",
-            "UpdateExeFile 'volta-shim.exe' 'npm.exe'",
-            "UpdateExeFile 'volta-shim.exe' 'npx.exe'",
-            "UpdateExeFile 'volta-shim.exe' 'yarn.exe'",
-            "UpdateExeFile 'volta.exe' 'volta.exe' -Removal",
-            "UpdateExeFile 'volta-migrate.exe' 'volta-migrate.exe' -Removal",
-            "UpdateExeFile 'volta-shim.exe' 'volta-shim.exe' -Removal"
+            "@('node', 'npm', 'npx', 'pnpm', 'yarn') | ForEach-Object {",
+            "    UpdateExeFile 'volta-shim.exe' \"$_.exe\"",
+            "    $content = \"@echo off`n`\"%~dpn0.exe`\" %*\"",
+            "    Set-Content \"$persist_dir\\appdata\\bin\\$_.cmd\" $content -Encoding ascii",
+            "}",
+            "@('volta', 'volta-migrate', 'volta-shim') | ForEach-Object {",
+            "    UpdateExeFile \"$_.exe\" \"$_.exe\" -Removal",
+            "}"
         ]
     },
+    "env_add_path": "appdata\\bin",
     "env_set": {
         "VOLTA_HOME": "$dir\\appdata"
     },
-    "env_add_path": "appdata\\bin",
     "persist": "appdata",
     "checkver": {
         "github": "https://github.com/volta-cli/volta"