diff --git a/.github/workflows/test-js-sdk.yml b/.github/workflows/test-js-sdk.yml
index a9efc094..e18c1f3e 100644
--- a/.github/workflows/test-js-sdk.yml
+++ b/.github/workflows/test-js-sdk.yml
@@ -20,11 +20,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: "20"
-      - name: Install pnpm
-        run: npm install -g pnpm
+          cache: "npm"
       - name: Install dependencies
-        run: pnpm install
+        run: npm install
         working-directory: ./apps/js-sdk/firecrawl
       - name: Run tests
-        run: pnpm run test
+        run: npm run test
         working-directory: ./apps/js-sdk/firecrawl
diff --git a/.github/workflows/test-server-self-host.yml b/.github/workflows/test-server-self-host.yml
index 8f7a06d0..58a3d148 100644
--- a/.github/workflows/test-server-self-host.yml
+++ b/.github/workflows/test-server-self-host.yml
@@ -19,12 +19,15 @@ jobs:
           - 6379:6379
     steps:
       - uses: actions/checkout@v3
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
           node-version: "20"
-      - name: Install pnpm
-        run: npm install -g pnpm
+          cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
         working-directory: ./apps/api
diff --git a/.github/workflows/test-server.yml b/.github/workflows/test-server.yml
index 2af418d6..84b6e5a1 100644
--- a/.github/workflows/test-server.yml
+++ b/.github/workflows/test-server.yml
@@ -50,12 +50,15 @@ jobs:
           oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
           oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
           tags: tag:ci
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
           node-version: "20"
-      - name: Install pnpm
-        run: npm install -g pnpm
+          cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
         working-directory: ./apps/api