diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 43b26dfca..e58494291 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -30,7 +30,7 @@ jobs:
             platform: amd64
 
           - name: debian-12-arm64
-            runs-on: buildjet-4vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-8-core-arm64
             config-dir: debian
             base-image: arm64v8/debian:12-slim
             platform: arm64
@@ -54,7 +54,7 @@ jobs:
             platform: amd64
 
           - name: fedora-40-arm64
-            runs-on: buildjet-4vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-8-core-arm64
             config-dir: fedora
             base-image: arm64v8/fedora:40
             platform: arm64
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c66c5a07..05b1ed330 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -188,7 +188,7 @@ jobs:
         distro:
           - name: debian-12-arm64
             container: symless/synergy-core:debian-12-arm64
-            runs-on: buildjet-4vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-8-core-arm64
             extra-packages: true
 
           - name: debian-12-amd64
@@ -206,7 +206,7 @@ jobs:
 
           - name: fedora-40-arm64
             container: symless/synergy-core:fedora-40-arm64
-            runs-on: buildjet-4vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-8-core-arm64
 
           - name: fedora-40-amd64
             container: symless/synergy-core:fedora-40-amd64