diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index e3b51f406568..140a58bdddc3 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -54,7 +54,7 @@ jobs:
       contents: read # same as global permission
       id-token: write # for signing attestation(s) with GitHub OIDC Token
     with:
-      runner: amd64
+      runner: ubuntu-24.04
       setup-qemu: true
       artifact-name: buildkit-binaries
       artifact-upload: true
@@ -234,7 +234,7 @@ jobs:
       contents: read # same as global permission
       id-token: write # for signing attestation(s) with GitHub OIDC Token
     with:
-      runner: amd64
+      runner: ubuntu-24.04
       setup-qemu: true
       target: image-cross
       cache: true
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 1e758b075bef..d0a08a0c9415 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -137,7 +137,7 @@ jobs:
       contents: read # same as global permission
       id-token: write # for signing attestation(s) with GitHub OIDC Token
     with:
-      runner: amd64
+      runner: ubuntu-24.04
       setup-qemu: true
       target: frontend-image-cross
       cache: true