diff --git a/package.json b/package.json
index d8b8ac8e4..57c81b7b1 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,8 @@
       "ws@8.11.0": "^8.17.1",
       "body-parser@1.20.2": "^1.20.3",
       "nx@19.0.4": "^19.0.8",
-      "cookie@0.5.0": "^0.7.2"
+      "cookie@0.5.0": "^0.7.2",
+      "cheerio@1.0.0": "1.0.0-rc.12"
     }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 654df5092..79fd64406 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,7 @@ overrides:
   body-parser@1.20.2: ^1.20.3
   nx@19.0.4: ^19.0.8
   cookie@0.5.0: ^0.7.2
+  cheerio@1.0.0: 1.0.0-rc.12
 
 importers:
 
diff --git a/scripts/nvms.sh b/scripts/nvms.sh
index f8b2dc3f2..457c2ed9c 100755
--- a/scripts/nvms.sh
+++ b/scripts/nvms.sh
@@ -33,13 +33,17 @@ if [[ "$(pnpm -v)" != "8."* ]]; then
 fi
 
 if [ $# -gt 0 ]; then
-    bin="$(which $1 | head -n 1)"
+    orig_cmd="$1"
+    fixed_cmd="${orig_cmd/yarn run/pnpm run}"
+    bin="$(which $fixed_cmd | head -n 1)"
     cmd="$@"
     shift
     args="$(echo $cmd | cut -d' ' -f2-)" # strip "pnpm" from "pnpm X"
     if [[ "$cmd" == *"pnpm run "* ]]; then
         args="$(echo $cmd | cut -d' ' -f3-)" # strip "pnpm run" from "pnpm run X"
     fi
+    echo "orig cmd: $orig_cmd"
+    echo "fixed cmd: $fixed_cmd"
     echo "bin: $bin"
     echo "cmd: $cmd"
     echo "args: $args"