diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 770efbbed0..239150a50b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1081,7 +1081,7 @@ jobs:
     needs:
       - changes
     if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && needs.changes.outputs.docs-only == 'false' && !github.event.pull_request.head.repo.fork
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     permissions:
       # Necessary to push docker images to ghcr.io.
       packages: write
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4e8568e07d..44ebad21e1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -61,7 +61,7 @@ jobs:
   release:
     name: Build and publish
     needs: [check-perms]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     permissions:
       # Required to publish a release
       contents: write