diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c88690634..8a255574b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,8 +55,8 @@ jobs:
           [[ $FAIL == 1 ]] && exit 1 || echo "Branch name depth check passed."
         shell: bash
 
-  gha:
-    runs-on: ubuntu-latest
+  gha-x86:
+    runs-on: ubuntu-24.04
     needs: smoke-tests
     strategy:
       fail-fast: false
@@ -100,8 +100,8 @@ jobs:
           SSH_USER: ${{ secrets.SSH_USER }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
 
-  self-hosted-arm64:
-    runs-on: ARM64
+  gha-arm64:
+    runs-on: ubuntu-24.04-arm
     needs: smoke-tests
     strategy:
       fail-fast: false