diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bafa463a93ea..0fa10ea14a69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,11 +78,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [20, 22, 24]
         subset: [esbuild, webpack]
         shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
@@ -132,11 +131,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2025]
         node: [22]
         subset: [esbuild, webpack]
         shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-2025
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
@@ -160,11 +158,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [22]
         subset: [yarn, pnpm, bun]
         shard: [0, 1, 2]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
@@ -185,11 +182,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [22]
         subset: [esbuild, webpack]
         shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1bcb672e4c58..d372b118b5ac 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -108,11 +108,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [22]
         subset: [esbuild, webpack]
         shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
@@ -178,11 +177,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [22]
         subset: [yarn, pnpm, bun]
         shard: [0, 1, 2]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a
@@ -201,11 +199,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         node: [22]
         subset: [esbuild, webpack]
         shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@73051ae248ba64911a8e7e66536d8c99ba07ef2a