diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c374831..20cb146 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        epics-target: [RTEMS-beatnik, linux-x86_64]
+        epics-target: [RTEMS-beatnik, linux-x86_64, linux-arm]
         target: [developer, runtime]
         include:
           - epics-target: RTEMS-beatnik
@@ -31,12 +31,12 @@ jobs:
             os: ubuntu-latest
             platform: linux/amd64
 
-          # - epics-target: linux-arm
-          #   epics-host: linux-arm
-          #   image_name: linux
-          #   base_image: ubuntu:22.04
-          #   os: macos-12-xl
-          #   platform: linux/arm64
+          - epics-target: linux-arm
+            epics-host: linux-arm
+            image_name: linux
+            base_image: ubuntu:22.04
+            os: ubuntu-latest
+            platform: linux/arm64
 
     runs-on: ${{ matrix.os }}
     env:
@@ -48,10 +48,6 @@ jobs:
           submodules: recursive
           fetch-depth: 1
 
-      - name: Setup docker (missing on MacOS)
-        if: runner.os == 'macos'
-        uses: docker-practice/actions-setup-docker@fd7ecdac7caf8e2c541a48c9bcc280aae59a8461
-
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v3
         with:
@@ -59,6 +55,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3