diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 399b87c9..a17630f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,20 +83,29 @@ jobs:
       - name: Determine macOS runner type
         id: mac_runner_type
         run: |
-          RUNNER_TYPE='["namespace-profile-mac-ci"]'
+          # Stock GitHub-hosted macOS runner. Upstream Warp uses a Namespace.so
+          # profile (namespace-profile-mac-ci) that isn't provisioned in the
+          # OpenCoven org, so we fall back to the free shared pool here.
+          RUNNER_TYPE='["macos-latest"]'
           echo "value=$RUNNER_TYPE" >> $GITHUB_OUTPUT
 
       - name: Determine wasm runner type
         id: wasm_runner_type
         run: |
-          # Use a larger (16 core, 64GB ram) runner on Linux to speed up execution time.
-          # https://github.com/warpdotdev/warp-internal/settings/actions/runners
-          RUNNER_TYPE='["ubuntu-latest-large"]'
+          # Stock GitHub-hosted Linux runner. Upstream Warp uses
+          # ubuntu-latest-large (16-core/64GB) provisioned at the warpdotdev org
+          # level; OpenCoven doesn't have larger runners enabled, so we fall
+          # back to the free shared pool. Slower but actually executes.
+          RUNNER_TYPE='["ubuntu-latest"]'
           echo "value=$RUNNER_TYPE" >> $GITHUB_OUTPUT
 
   tests:
     name: Run ${{ matrix.name }} tests
-    timeout-minutes: 25
+    # Stock GitHub-hosted runners (2-core Linux, 4-core Windows) are roughly
+    # 6× slower than the larger SKUs the upstream Warp workflow assumed, so
+    # the previous 25-minute ceiling was triggering cancellations before
+    # tests finished compiling. 90m leaves headroom on cold caches.
+    timeout-minutes: 90
     env:
       # The public CastCodes repo does not provision hosted SSH test fixtures.
       # Tests that need those fixtures include `_ssh_` in their name.
@@ -113,17 +122,13 @@ jobs:
 
           - os: "linux"
             name: "Linux"
-            # Use a larger (16 core, 64GB ram) runner on Linux to speed up execution time.
-            # https://github.com/warpdotdev/warp-internal/settings/actions/runners
-            runner: ubuntu-latest-large
-            # We don't (yet) have any self-hosted Linux runners.
+            runner: ubuntu-latest
             is_self_hosted: false
             extra_test_args: ""
 
           - os: "windows"
             name: "Windows"
-            runner: windows-latest-large
-            # We don't (yet) have any self-hosted Windows runners.
+            runner: windows-latest
             is_self_hosted: false
             extra_test_args: "--exclude command-signatures-v2 --exclude warp_js"
     runs-on: ${{ matrix.runner }}
@@ -469,18 +474,14 @@ jobs:
 
           - os: "linux"
             name: "Linux"
-            # Use a larger (16 core, 64GB ram) runner on Linux to speed up execution time.
-            # https://github.com/warpdotdev/warp-internal/settings/actions/runners
-            runner: ubuntu-latest-large
-            # We don't (yet) have any self-hosted Linux runners.
+            runner: ubuntu-latest
             is_self_hosted: false
             null_device: "/dev/null"
             clippy_excludes: "--exclude warp_completer"
 
           - os: "windows"
             name: "Windows"
-            runner: windows-latest-large
-            # We don't (yet) have any self-hosted Windows runners.
+            runner: windows-latest
             is_self_hosted: false
             null_device: "NUL"
             clippy_excludes: "--exclude warp_js --exclude command-signatures-v2"
@@ -632,17 +633,13 @@ jobs:
 
           - os: "linux"
             name: "Linux"
-            # Use a larger (16 core, 64GB ram) runner on Linux to speed up execution time.
-            # https://github.com/warpdotdev/warp-internal/settings/actions/runners
-            runner: ubuntu-latest-large
-            # We don't (yet) have any self-hosted Linux runners.
+            runner: ubuntu-latest
             is_self_hosted: false
             null_device: "/dev/null"
 
           - os: "windows"
             name: "Windows"
-            runner: windows-latest-large
-            # We don't (yet) have any self-hosted Windows runners.
+            runner: windows-latest
             is_self_hosted: false
             null_device: "NUL"