diff --git a/.github/workflows/build-debian-multiarch.yml b/.github/workflows/build-multiarch.yml
similarity index 82%
rename from .github/workflows/build-debian-multiarch.yml
rename to .github/workflows/build-multiarch.yml
index a8d13b5b1a..2570a6dde1 100644
--- a/.github/workflows/build-debian-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,7 +2,7 @@
 # actively supported, but source code support for this is nice to have. We
 # don't do any releases from here.
 
-name: Debian Multiarch
+name: Multiarch
 
 # Run CI only on changes to main branch, or any PR to main. Do not run CI on
 # any other branch. Also, skip any non-source changes from running on CI
@@ -17,7 +17,7 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-debian-multiarch.yml'
+      - '!.github/workflows/build-multiarch.yml'
 
   pull_request:
     branches: main
@@ -29,22 +29,27 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-debian-multiarch.yml'
+      - '!.github/workflows/build-multiarch.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-debian-multiarch
+  group: ${{ github.workflow }}-${{ github.ref }}-multiarch
   cancel-in-progress: true
 
 jobs:
   build-multiarch:
-    name: Debian (Bullseye - 11) [${{ matrix.arch }}]
+    name: ${{ matrix.distro }} [${{ matrix.arch }}]
     runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         # maybe more things could be added in here in the future (if needed)
-        arch: [s390x, ppc64le]
+        include:
+          - { arch: s390x, distro: bullseye }
+          - { arch: ppc64le, distro: bullseye }
+          - { arch: armv6, distro: bullseye }
+          - { arch: armv7, distro: bullseye }
+          - { arch: riscv64, distro: ubuntu22.04 }
 
     steps:
     - uses: actions/checkout@v4.1.2
@@ -54,7 +59,7 @@ jobs:
       id: build
       with:
         arch: ${{ matrix.arch }}
-        distro: bullseye
+        distro: ${{ matrix.distro }}
 
         # Not required, but speeds up builds
         githubToken: ${{ github.token }}
@@ -75,9 +80,7 @@ jobs:
         # publicly in your project's package repository, so it is vital that
         # no secrets are present in the container state or logs.
         install: |
-          apt-get update --fix-missing
-          apt-get upgrade -y
-          apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev fontconfig -y
+          apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev fontconfig -y
           apt-get install python3-setuptools python3-dev python3-pip python3-wheel python3-sphinx -y
 
         # Build a wheel, install it for running unit tests