diff --git a/ci-matrix.py b/ci-matrix.py
index 12dffecbe..fe45b1a48 100644
--- a/ci-matrix.py
+++ b/ci-matrix.py
@@ -300,13 +300,10 @@ def generate_crate_build_matrix_entries(
         {
             "platform": platform,
             "arch": arch,
-            # Use the GitHub runner for Windows, because the Depot one is
-            # missing a Rust toolchain. On Linux, it's important that the the
-            # `python-build` runner matches the `crate-build` runner because of
-            # GLIBC version mismatches.
-            "runner": find_runner(
-                runners, platform, arch, True if platform == "windows" else False
-            ),
+            # Linux distribution jobs execute the uploaded `pythonbuild` binary.
+            # Select the same runner to avoid requiring a newer glibc than the
+            # consumer has.
+            "runner": find_runner(runners, platform, arch, False),
             "crate_artifact_name": crate_artifact_name(
                 platform,
                 arch,
diff --git a/ci-runners.yaml b/ci-runners.yaml
index e6bdd0f9b..e9e84aa5f 100644
--- a/ci-runners.yaml
+++ b/ci-runners.yaml
@@ -25,7 +25,7 @@ macos-latest:
   platform: darwin
   free: true
 
-depot-windows-2022-8:
+namespace-profile-windows-2022-x86-64-16x32:
   arch: x86_64
   platform: windows
   free: false