diff --git a/.github/actions/setup-libpathrs/action.yml b/.github/actions/setup-libpathrs/action.yml
index d05572b..f133640 100644
--- a/.github/actions/setup-libpathrs/action.yml
+++ b/.github/actions/setup-libpathrs/action.yml
@@ -42,7 +42,12 @@ runs:
       if: steps.cache-libpathrs.outputs.cache-hit != 'true'
       shell: bash
       working-directory: ${{ runner.temp }}/libpathrs-${{ inputs.version }}
-      run: make release
+      # libpathrs links its cdylib with lld. On x86_64 Rust ships its own
+      # rust-lld, but other architectures need the system one.
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y lld
+        make release
 
     - name: install libpathrs
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74538fe..dfc48d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,11 +27,15 @@ concurrency:
 
 jobs:
   build:
-    name: go build
-    runs-on: ubuntu-latest
+    name: go build (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     permissions:
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-24.04, ubuntu-24.04-arm ]
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -101,11 +105,15 @@ jobs:
               contrib/rpm/quarry.spec
 
   go-test:
-    name: go test
-    runs-on: ubuntu-latest
+    name: go test (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     permissions:
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-24.04, ubuntu-24.04-arm ]
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with: