diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index f13f685..38bfd9e 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    runs-on: linux/amd64
+    runs-on: ubuntu-latest
     container:
       image: gitea.tourolle.paris/dtourolle/jray-builder:latest
 
diff --git a/.gitea/workflows/latest.yaml b/.gitea/workflows/latest.yaml
index 91e4809..fea7a40 100644
--- a/.gitea/workflows/latest.yaml
+++ b/.gitea/workflows/latest.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   latest-release:
-    runs-on: linux/amd64
+    runs-on: ubuntu-latest
     container:
       image: gitea.tourolle.paris/dtourolle/jray-builder:latest
 
diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index f145b75..43c81bb 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build-and-release:
-    runs-on: linux/amd64
+    runs-on: ubuntu-latest
     container:
       image: gitea.tourolle.paris/dtourolle/jray-builder:latest
 
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
index c74fcb0..19cdbea 100644
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   test:
-    runs-on: linux/amd64
+    runs-on: ubuntu-latest
     container:
       image: gitea.tourolle.paris/dtourolle/jray-builder:latest
 
diff --git a/Dockerfile.builder b/Dockerfile.builder
index bd51cf0..cac8615 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,7 +1,10 @@
 # JRay Builder Image
 # Pre-built image with .NET SDK and JPRM for building Jellyfin plugins
-# Build: docker build -f Dockerfile.builder -t gitea.tourolle.paris/dtourolle/jray-builder:latest .
-# Push:  docker push gitea.tourolle.paris/dtourolle/jray-builder:latest
+# Multi-arch (amd64 + arm64): CI runs on ubuntu-latest, which both the amd64 and the
+# ARM runners carry, so the image must exist for both.
+# Build + push (needs a docker-container buildx builder and arm64 binfmt/QEMU):
+#   docker buildx build -f Dockerfile.builder --platform linux/amd64,linux/arm64 \
+#       -t gitea.tourolle.paris/dtourolle/jray-builder:latest --push .
 
 FROM mcr.microsoft.com/dotnet/sdk:9.0