diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 84396da2..ce1d367a 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -67,6 +67,11 @@ jobs:
           args: --timeout=5m
 
   build:
+    strategy:
+      matrix:
+        arch:
+          - "none"
+          - "aarch64"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -76,11 +81,15 @@ jobs:
         with:
           go-version: '1.21'
       - name: Build
-        run: go build -ldflags "-X github.com/FreifunkBremen/yanic/cmd.VERSION=$(git describe --tags)" -v
-        env:
-          CGO_ENABLED: 0
+        uses: uraimo/run-on-arch-action@v2
+        with:
+          arch: ${{ matrix.arch }}
+          distro: ubuntu_latest
+          run: go build -ldflags "-X github.com/FreifunkBremen/yanic/cmd.VERSION=$(git describe --tags)" -v -o yanic_${{ matrix.arch }}
+          env: |
+            CGO_ENABLED: 0
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build
-          path: yanic
+          name: build-${{ matrix.arch }}
+          path: yanic_${{ matrix.arch }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8e4308de..5218ec27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: build*
+          pattern: build-*
           path: build/
           merge-multiple: true
           run-id: ${{ github.event.workflow_run.workflow_id }}