diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94b1b007c912..980a1be55b61 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -415,8 +415,6 @@ jobs:
     if: needs.job_build.outputs.changed_bun == 'true' || github.event_name != 'pull_request'
     timeout-minutes: 10
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4
@@ -442,8 +440,6 @@ jobs:
     if: needs.job_build.outputs.changed_deno == 'true' || github.event_name != 'pull_request'
     timeout-minutes: 10
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4
@@ -475,7 +471,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, '^24.0.1']
+        node: [18, 20, 22, 24]
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
         uses: actions/checkout@v4
@@ -885,18 +881,11 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.4.0
-      # TODO: Remove this once the repo is bumped to 20.19.2 or higher
-      - name: Set up Node for Angular 20
-        if: matrix.test-application == 'angular-20'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19.2'
+          version: 9.15.9
       - name: Set up Node
-        if: matrix.test-application != 'angular-20'
         uses: actions/setup-node@v4
         with:
-          node-version-file: 'dev-packages/e2e-tests/package.json'
+          node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
       - name: Set up Bun
         if: matrix.test-application == 'node-exports-test-app'
         uses: oven-sh/setup-bun@v2
@@ -1012,11 +1001,11 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.4.0
+          version: 9.15.9
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: 'dev-packages/e2e-tests/package.json'
+          node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         with:
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 27abae270d73..49f603e8235c 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -125,18 +125,12 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.4.0
-      # TODO: Remove this once the repo is bumped to 20.19.2 or higher
-      - name: Set up Node for Angular 20
-        if: matrix.test-application == 'angular-20'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19.2'
+          version: 9.15.9
       - name: Set up Node
         if: matrix.test-application != 'angular-20'
         uses: actions/setup-node@v4
         with:
-          node-version-file: 'dev-packages/e2e-tests/package.json'
+          node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
 
       - name: Restore canary cache
         uses: actions/cache/restore@v4
diff --git a/dev-packages/e2e-tests/test-applications/angular-20/package.json b/dev-packages/e2e-tests/test-applications/angular-20/package.json
index 34ce69c6ea44..bfd14c64c93f 100644
--- a/dev-packages/e2e-tests/test-applications/angular-20/package.json
+++ b/dev-packages/e2e-tests/test-applications/angular-20/package.json
@@ -46,6 +46,7 @@
     "typescript": "~5.8.3"
   },
   "volta": {
-    "extends": "../../package.json"
+    "extends": "../../package.json",
+    "node": "20.19.2"
   }
 }
diff --git a/package.json b/package.json
index 13e1a600e83d..db3e22a73769 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "volta": {
     "node": "20.18.2",
     "yarn": "1.22.22",
-    "pnpm": "9.15.0"
+    "pnpm": "9.15.9"
   },
   "workspaces": [
     "packages/angular",