diff --git a/.github/workflows/buildenv-diff.yml b/.github/workflows/buildenv-diff.yml
index 9e417b8..8a1cb3a 100644
--- a/.github/workflows/buildenv-diff.yml
+++ b/.github/workflows/buildenv-diff.yml
@@ -15,7 +15,7 @@ jobs:
     name: package diff
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/.github/workflows/buildenv.yml b/.github/workflows/buildenv.yml
index 52378e0..0c6fcd8 100644
--- a/.github/workflows/buildenv.yml
+++ b/.github/workflows/buildenv.yml
@@ -86,7 +86,7 @@ jobs:
     needs: build
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/.github/workflows/digestabot.yml b/.github/workflows/digestabot.yml
index 005631e..2dee9b5 100644
--- a/.github/workflows/digestabot.yml
+++ b/.github/workflows/digestabot.yml
@@ -19,7 +19,7 @@ jobs:
     name: Image digest update
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
 
     permissions:
       contents: write # to push the updates
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9aa3d02..bb4953c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
   format:
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     env:
       SHFMT_VERSION: "3.12.0"
       SHELLCHECK_VERSION: "0.11.0"
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
index 577c573..efe1e70 100644
--- a/.github/workflows/matrix.yml
+++ b/.github/workflows/matrix.yml
@@ -21,7 +21,7 @@ jobs:
     name: matrix
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
@@ -194,7 +194,7 @@ jobs:
       matrix: ${{ fromJSON(needs.matrix.outputs.merges) }}
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     env:
       KERNEL_PUBLISH: "${{ inputs.publish }}"
       KERNEL_VERSION: "${{ matrix.merges.version }}"
diff --git a/.github/workflows/refresh-nvidia.yml b/.github/workflows/refresh-nvidia.yml
index 23e481c..4de334c 100644
--- a/.github/workflows/refresh-nvidia.yml
+++ b/.github/workflows/refresh-nvidia.yml
@@ -12,7 +12,7 @@ jobs:
     name: Open PR if NVIDIA versions changed
     runs-on:
       group: Self Hosted
-      labels: edera-16
+      labels: edera-8
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/config.yaml b/config.yaml
index 7c567d8..0372522 100644
--- a/config.yaml
+++ b/config.yaml
@@ -113,11 +113,11 @@ runners:
 # Match order matters: first runner whose constraints match wins.
 - name: ubuntu-24.04-arm
   arch: aarch64
-- name: edera-24
+- name: edera-8
   arch: x86_64
   flavors:
   - host
   - zone-amdgpu
   - zone-nvidiagpu
-- name: edera-24
+- name: edera-8
   arch: x86_64