diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index afaae1a7fe..dce68c60a0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -175,14 +175,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - cfg: {name: 'ubuntu20',      base: 'ubuntu20', builddir: 'ubuntu20'}
-          - cfg: {name: 'ubuntu22',      base: 'ubuntu22', builddir: 'ubuntu22'}
-          - cfg: {name: 'asserton',      base: 'asserton', builddir: 'asserton'}
-          - cfg: {name: 'ubsan',         base: 'ubsan',    builddir: 'ubsan'}
-          - cfg: {name: 'asan',          base: 'asan',     builddir: 'asan'}
-          - cfg: {name: 'ubuntu20repro', base: 'ubuntu20', builddir: 'reproducible'}
-          - cfg: {name: 'ubuntu22repro', base: 'ubuntu22', builddir: 'reproducible'}
-    runs-on: ["self-hosted", "enf-x86-midtier"]
+          - cfg: {name: 'ubuntu20',      base: 'ubuntu20', builddir: 'ubuntu20',     machine: 'enf-x86-midtier'}
+          - cfg: {name: 'ubuntu22',      base: 'ubuntu22', builddir: 'ubuntu22',     machine: 'enf-x86-midtier'}
+          - cfg: {name: 'asserton',      base: 'asserton', builddir: 'asserton',     machine: 'enf-x86-midtier'}
+          - cfg: {name: 'ubsan',         base: 'ubsan',    builddir: 'ubsan',        machine: 'enf-x86-midtier'}
+          - cfg: {name: 'asan',          base: 'asan',     builddir: 'asan',         machine: 'enf-x86-hightier'}
+          - cfg: {name: 'ubuntu20repro', base: 'ubuntu20', builddir: 'reproducible', machine: 'enf-x86-midtier'}
+          - cfg: {name: 'ubuntu22repro', base: 'ubuntu22', builddir: 'reproducible', machine: 'enf-x86-midtier'}
+    runs-on: ["self-hosted", "${{matrix.cfg.machine}}"]
     steps:
       - uses: actions/checkout@v4
       - name: Download builddir
@@ -217,14 +217,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - cfg: {name: 'ubuntu20',      base: 'ubuntu20', builddir: 'ubuntu20'}
-          - cfg: {name: 'ubuntu22',      base: 'ubuntu22', builddir: 'ubuntu22'}
-          - cfg: {name: 'asserton',      base: 'asserton', builddir: 'asserton'}
-          - cfg: {name: 'ubsan',         base: 'ubsan',    builddir: 'ubsan'}
-          - cfg: {name: 'asan',          base: 'asan',     builddir: 'asan'}
-          - cfg: {name: 'ubuntu20repro', base: 'ubuntu20', builddir: 'reproducible'}
-          - cfg: {name: 'ubuntu22repro', base: 'ubuntu22', builddir: 'reproducible'}
-    runs-on: ["self-hosted", "enf-x86-lowtier"]
+          - cfg: {name: 'ubuntu20',      base: 'ubuntu20', builddir: 'ubuntu20',     machine: 'enf-x86-lowtier'}
+          - cfg: {name: 'ubuntu22',      base: 'ubuntu22', builddir: 'ubuntu22',     machine: 'enf-x86-lowtier'}
+          - cfg: {name: 'asserton',      base: 'asserton', builddir: 'asserton',     machine: 'enf-x86-lowtier'}
+          - cfg: {name: 'ubsan',         base: 'ubsan',    builddir: 'ubsan',        machine: 'enf-x86-lowtier'}
+          - cfg: {name: 'asan',          base: 'asan',     builddir: 'asan',         machine: 'enf-x86-midtier'}
+          - cfg: {name: 'ubuntu20repro', base: 'ubuntu20', builddir: 'reproducible', machine: 'enf-x86-lowtier'}
+          - cfg: {name: 'ubuntu22repro', base: 'ubuntu22', builddir: 'reproducible', machine: 'enf-x86-lowtier'}
+    runs-on: ["self-hosted", "${{matrix.cfg.machine}}"]
     steps:
       - uses: actions/checkout@v4
       - name: Download builddir