diff --git a/.github/workflows/install-js-sdk.sh b/.github/workflows/install-js-sdk.sh
index 870e8d5..992d53d 100755
--- a/.github/workflows/install-js-sdk.sh
+++ b/.github/workflows/install-js-sdk.sh
@@ -19,12 +19,19 @@ fi
 
 complement_crypto_dir="$(dirname $0)/../../"
 
+corepack enable
 echo "Installing matrix-js-sdk @ $js_sdk_src"
 
 if [ "$js_sdk_src" = "." ]; then
     # If we install from a local directory, we have to build the js-sdk ourselves.
     echo "Building js-sdk @ $(pwd)"
-    yarn install
+
+    PM=$(cat package.json | jq -r '.packageManager')
+    if [[ $PM == "pnpm@"* ]]; then
+        pnpm install
+    else
+        yarn install
+    fi
 
     yarn_path="file:$(pwd)"
 else
diff --git a/rebuild_js_sdk.sh b/rebuild_js_sdk.sh
index b0ff0a7..a2d32c5 100755
--- a/rebuild_js_sdk.sh
+++ b/rebuild_js_sdk.sh
@@ -17,6 +17,7 @@ then
     exit 1
 fi
 
+corepack enable
 (cd ./internal/api/js/js-sdk && yarn add $1 && yarn install && yarn build)
 rm -rf ./internal/api/js/chrome/dist || echo 'no dist directory detected';
 cp -r ./internal/api/js/js-sdk/dist/. ./internal/api/js/chrome/dist