diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml
index 147ea9d84286..5e0bde94d6f0 100644
--- a/.github/actions/pnpm-cache/action.yml
+++ b/.github/actions/pnpm-cache/action.yml
@@ -24,14 +24,10 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
 
-    # https://pnpm.io/continuous-integration#github-actions
-    # Uses `packageManagement` field from package.json
-    - name: Install pnpm
-      uses: pnpm/action-setup@v4
-      with:
-        dest: ${{ runner.tool_cache }}/pnpm
-        # Use `@pnpm/exe` for Node 16
-        standalone: ${{ inputs.node-version == '16' }}
+    - name: Enable corepack
+      shell: bash
+      run: |
+        corepack enable
 
     - name: Get pnpm store directory
       id: pnpm-cache
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 08694aeeb5c4..3f17010fd85b 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -271,6 +271,9 @@ jobs:
         with:
           node-version: 20
 
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+
       - name: Run e2e
         uses: ./.github/actions/docker-run
         with: