diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml
index 1b7a178ceb..a2539b3dc3 100644
--- a/.github/workflows/e2e-matrix.yml
+++ b/.github/workflows/e2e-matrix.yml
@@ -73,6 +73,7 @@ jobs:
     permissions:
       contents: read
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 90
     strategy:
       matrix:
         os:
@@ -122,6 +123,11 @@ jobs:
             os_name: 'Linux'
           - os: macos-latest
             os_name: 'MacOS'
+          # test timeouts
+          - os: ubuntu-latest
+            os_timeout: 30
+          - os: macos-latest
+            os_timeout: 60
           # codeowner groups
           - project: e2e-add-nx-to-monorepo
             codeowners: 'S04SYHYKGNP'
@@ -317,7 +323,7 @@ jobs:
         if: ${{ matrix.package_manager == 'pnpm' }}
         uses: pnpm/action-setup@v2
         with:
-          version: 7.1.0
+          version: 7.30.5
 
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v3
@@ -388,6 +394,7 @@ jobs:
       - name: Run e2e tests
         id: e2e-run
         run: yarn nx run-many --target=e2e --projects="${{ join(matrix.project) }}" --parallel=1
+        timeout-minutes: ${{ matrix.os_timeout }}
         env:
           GIT_AUTHOR_EMAIL: test@test.com
           GIT_AUTHOR_NAME: Test
@@ -473,7 +480,7 @@ jobs:
               |--------------------------------|------|-------|------|`;
             failedProjects.forEach(matrix => {
               const project = matrix.project !== lastProject ? matrix.project : '...';
-              result += `\n| ${project.padEnd(30)} | ${matrix.package_manager.padEnd(4)} | ${matrix.os_name} | v${matrix.node_version.pad(3)} |`
+              result += `\n| ${project.padEnd(30)} | ${matrix.package_manager.padEnd(4)} | ${matrix.os_name} | v${matrix.node_version.toString().padEnd(3)} |`
               lastProject = matrix.project;
             });
             result += `\`\`\``;
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
index e951f33adb..b4eae057f5 100644
--- a/.github/workflows/e2e-windows.yml
+++ b/.github/workflows/e2e-windows.yml
@@ -293,6 +293,7 @@ jobs:
       - name: Run e2e tests
         id: e2e-run
         run: yarn nx run-many --target=e2e --projects="${{ join(matrix.project) }}" --parallel=1
+        timeout-minutes: 120
         env:
           GIT_AUTHOR_EMAIL: test@test.com
           GIT_AUTHOR_NAME: Test
@@ -381,7 +382,7 @@ jobs:
               | Failed project                 | Node |
               |--------------------------------|------|`;
             failedProjects.forEach(matrix => {
-              result += `\n| ${matrix.project.padEnd(30)} | v${matrix.node_version.pad(3)} |`
+              result += `\n| ${matrix.project.padEnd(30)} | v${matrix.node_version.toString().padEnd(3)} |`
             });
             result += `\`\`\``;
             const message = result.split('\n').map(l => l.trim()).join('\n');