diff --git a/.github/workflows/abi-cafe.yml b/.github/workflows/abi-cafe.yml
index 30dc5cb16..a32a275a0 100644
--- a/.github/workflows/abi-cafe.yml
+++ b/.github/workflows/abi-cafe.yml
@@ -25,6 +25,9 @@ jobs:
           - os: ubuntu-latest
             env:
               TARGET_TRIPLE: x86_64-unknown-linux-gnu
+          - os: ubuntu-24.04-arm
+            env:
+              TARGET_TRIPLE: aarch64-unknown-linux-gnu
           - os: macos-latest
             env:
               TARGET_TRIPLE: x86_64-apple-darwin
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a8333df77..362c80952 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,13 +53,12 @@ jobs:
           - os: ubuntu-latest
             env:
               TARGET_TRIPLE: x86_64-unknown-linux-gnu
+          - os: ubuntu-24.04-arm
+            env:
+              TARGET_TRIPLE: aarch64-unknown-linux-gnu
           - os: macos-latest
             env:
               TARGET_TRIPLE: x86_64-apple-darwin
-          - os: ubuntu-latest
-            env:
-              TARGET_TRIPLE: aarch64-unknown-linux-gnu
-            apt_deps: gcc-aarch64-linux-gnu qemu-user
           - os: macos-latest
             env:
               TARGET_TRIPLE: aarch64-apple-darwin
@@ -192,6 +191,9 @@ jobs:
           - os: ubuntu-20.04
             env:
               TARGET_TRIPLE: x86_64-unknown-linux-gnu
+          - os: ubuntu-24.04-arm
+            env:
+              TARGET_TRIPLE: aarch64-unknown-linux-gnu
           - os: macos-latest
             env:
               TARGET_TRIPLE: x86_64-apple-darwin