diff --git a/package.json b/package.json
index ba4ab8a64881e..362f1ef568291 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
 {
   "name": "selenium",
-  "packageManager": "pnpm@9.15.4",
   "workspaces": [
     "javascript/grid-ui",
     "javascript/selenium-webdriver"
diff --git a/rake_tasks/bazel.rb b/rake_tasks/bazel.rb
index 4d6f2332731be..277e7aa7a05f7 100644
--- a/rake_tasks/bazel.rb
+++ b/rake_tasks/bazel.rb
@@ -25,8 +25,8 @@ def self.execute(kind, args, target, &block)
 
     puts "Executing: #{cmd.join(' ')}"
     if windows?
-      cmd += ['2>&1']
-      cmd_line = cmd.join(' ')
+      quoted = cmd.map { |a| a.match?(/[\s"]/) ? %("#{a.gsub('"', '\\"')}") : a }
+      cmd_line = "#{quoted.join(' ')} 2>&1"
       cmd_out = `#{cmd_line}`.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
       puts cmd_out if verbose
       cmd_exit_code = $CHILD_STATUS
diff --git a/rake_tasks/node.rake b/rake_tasks/node.rake
index b80294c697c08..6285d9ad63b56 100644
--- a/rake_tasks/node.rake
+++ b/rake_tasks/node.rake
@@ -111,12 +111,11 @@ task :docs_generate do
   Bazel.execute('run', [], '//javascript/selenium-webdriver:docs')
 end
 
-desc 'Install Node package locally via npm link'
+desc 'Install Node package locally via pnpm link'
 task :install do
   Bazel.execute('build', [], '//javascript/selenium-webdriver')
-  Dir.chdir('bazel-bin/javascript/selenium-webdriver/selenium-webdriver') do
-    sh 'npm', 'link'
-  end
+  pkg_dir = File.expand_path('bazel-bin/javascript/selenium-webdriver/selenium-webdriver')
+  Bazel.execute('run', ['--', '--dir', pkg_dir, 'link', '--global'], '@pnpm//:pnpm')
 end
 
 desc 'Update JavaScript changelog'