diff --git a/.github/shared-actions/windows-bazel-test/action.yml b/.github/shared-actions/windows-bazel-test/action.yml
index 94582de287a0..46828512f38b 100644
--- a/.github/shared-actions/windows-bazel-test/action.yml
+++ b/.github/shared-actions/windows-bazel-test/action.yml
@@ -18,11 +18,11 @@ runs:
   steps:
     - name: Initialize WSL
       id: init_wsl
-      uses: angular/dev-infra/github-actions/setup-wsl@029d16b075db696b35d0d661d0fd3a0552a4b452
+      uses: alan-agius4/dev-infra/github-actions/setup-wsl@68825541aa5c3ade19751b37d1b2eba9b19a0706
       with:
         wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
 
-    - name: Install node modules in WSL (re-using from previous install/cache restore)
+    - name: Install node modules (inside WSL)
       run: |
         export NVM_DIR="$HOME/.nvm"
         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
@@ -72,16 +72,16 @@ runs:
         # TODO(devversion): consult with Aspect on why this is needed.
         (cd $runfiles_dir/_main && ${{steps.init_wsl.outputs.cmd_path}} /C "mklink /D external ..")
 
-    - name: Run tests
-      # Note: This is Git Bash.
-      shell: bash
-      env:
-        BAZEL_BINDIR: '.'
-        # Use D:/ for better performance see: https://github.com/actions/runner-images/issues/12744
-        E2E_TEMP: 'D:\\tmp_dir'
-      working-directory: "D:\\test"
-      run: |
-        node "${{github.workspace}}\\scripts\\windows-testing\\parallel-executor.mjs" \
-          $PWD/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles \
-          ${{inputs.test_target_name}} \
-          "${{inputs.test_args}}" \
+    # - name: Run tests
+    #   # Note: This is Git Bash.
+    #   shell: bash
+    #   env:
+    #     BAZEL_BINDIR: '.'
+    #     # Use D:/ for better performance see: https://github.com/actions/runner-images/issues/12744
+    #     E2E_TEMP: 'D:\\tmp_dir'
+    #   working-directory: "D:\\test"
+    #   run: |
+    #     node "${{github.workspace}}\\scripts\\windows-testing\\parallel-executor.mjs" \
+    #       $PWD/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles \
+    #       ${{inputs.test_target_name}} \
+    #       "${{inputs.test_args}}" \
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5c35706910c8..ccf61a01983b 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -128,11 +128,12 @@ jobs:
         run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-windows-subset:
-    needs: build
     runs-on: windows-2025
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@029d16b075db696b35d0d661d0fd3a0552a4b452
+      - name: Install node modules
+        run: pnpm install --frozen-lockfile
       - name: Setup Bazel
         uses: angular/dev-infra/github-actions/bazel/setup@029d16b075db696b35d0d661d0fd3a0552a4b452
       - name: Setup Bazel RBE
@@ -140,12 +141,7 @@ jobs:
         with:
           allow_windows_rbe: true
       - name: Run CLI E2E tests
-        uses: ./.github/shared-actions/windows-bazel-test
-        env:
-          E2E_SHARD_TOTAL: 1
-        with:
-          test_target_name: e2e_node22
-          test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
+        run: pnpm bazel test --repository_cache="c:/Users/runneradmin/.cache/bazel_repo_cache" --config=e2e //tests/legacy-cli:e2e.esbuild_node22 --test_arg="--glob=\"tests/basic/{build,rebuild}.ts\""
 
   e2e-package-managers:
     needs: build