diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04210bd4980..a07dcca2e2e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -34,14 +34,17 @@ jobs:
           token: ${{ secrets.NIGHTLY_PAT }}
           fetch-depth: 0
 
+      - name: 📦 Setup pnpm
+        uses: pnpm/action-setup@v3.0.0
+
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
-          cache: "yarn"
+          cache: "pnpm"
 
       - name: 📥 Install deps
-        run: yarn --frozen-lockfile
+        run: pnpm install --frozen-lockfile
 
       - name: 🕵️ Check for changes
         id: version
@@ -74,12 +77,12 @@ jobs:
           git config --local user.email "hello@remix.run"
           git config --local user.name "Remix Run Bot"
           git checkout -b nightly/${{ steps.version.outputs.NEXT_VERSION }}
-          yarn run version ${{steps.version.outputs.NEXT_VERSION}} --skip-prompt
+          pnpm run version ${{steps.version.outputs.NEXT_VERSION}} --skip-prompt
           git push origin --tags
 
       - name: 🏗 Build
         if: steps.version.outputs.NEXT_VERSION
-        run: yarn build
+        run: pnpm build
 
       - name: 🔐 Setup npm auth
         if: steps.version.outputs.NEXT_VERSION