diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f5ed126a..3b53a42a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,12 +51,13 @@ jobs:
         name: macOS
         path: build/qdigidoc4*.zip
   ubuntu:
-    name: Build on Ubuntu ${{ matrix.container }}
-    runs-on: ubuntu-latest
+    name: Build on Ubuntu ${{ matrix.container }} ${{ matrix.arch }}
+    runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
     container: ubuntu:${{ matrix.container }}
     strategy:
       matrix:
         container: ['22.04', '24.04', '24.10']
+        arch: ['amd64', 'arm64']
     env:
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: github-actions
@@ -67,7 +68,7 @@ jobs:
       with:
         workflow: build.yml
         branch: master
-        name: ubuntu_${{ matrix.container }}
+        name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
         path: libdigidocpp-pkg
         repo: open-eid/libdigidocpp
     - name: Install dependencies
@@ -91,7 +92,7 @@ jobs:
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ubuntu_${{ matrix.container }}
+        name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
         path: qdigidoc4*.*
   fedora:
     name: Build on Fedora ${{ matrix.container }}
@@ -208,7 +209,7 @@ jobs:
       with:
         workflow: build.yml
         branch: master
-        name: ubuntu_24.04
+        name: ubuntu_24.04_amd64
         path: libdigidocpp-pkg
         repo: open-eid/libdigidocpp
     - name: Install dependencies
@@ -250,7 +251,7 @@ jobs:
       with:
         workflow: build.yml
         branch: master
-        name: ubuntu_24.04
+        name: ubuntu_24.04_amd64
         path: libdigidocpp-pkg
         repo: open-eid/libdigidocpp
     - name: Install dependencies