diff --git a/.github/workflows/m68k.yml b/.github/workflows/cross.yml
similarity index 82%
rename from .github/workflows/m68k.yml
rename to .github/workflows/cross.yml
index f1eea87374c..0d4bbc61d93 100644
--- a/.github/workflows/m68k.yml
+++ b/.github/workflows/cross.yml
@@ -1,6 +1,6 @@
 # TODO: check if qemu-user-static-binfmt is needed (perhaps to run some tests since it probably calls exec).
 
-name: m68k CI
+name: Cross-compilation CI
 
 on:
   - push
@@ -20,6 +20,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        arch: [
+          "m68k",
+          "arm",
+        ]
         commands: [
           "--mini-tests",
           "--std-tests",
@@ -49,20 +53,20 @@ jobs:
         sudo apt-get install qemu qemu-user-static
 
     - name: Download artifact
-      run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-13.deb
+      run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-${{ matrix.arch }}-13.deb
 
     - name: Download VM artifact
       uses: dawidd6/action-download-artifact@v2
       with:
-          workflow: m68k.yml
-          name: debian-m68k
+          workflow: ${{ matrix.arch }}.yml
+          name: debian-${{ matrix.arch }}
           repo: cross-cg-gcc-tools/vms
           branch: master
           event: push
 
     - name: Setup path to libgccjit
       run: |
-          sudo dpkg -i gcc-m68k-13.deb
+          sudo dpkg -i gcc-${{ matrix.arch }}-13.deb
           echo /usr/lib/ > gcc_path
 
     - name: Set env
@@ -83,16 +87,16 @@ jobs:
     - name: Prepare VM
       run: |
         mkdir vm
-        sudo mount debian-m68k.img vm
-        sudo cp $(which qemu-m68k-static) vm/usr/bin/
+        sudo mount debian-${{ matrix.arch }}.img vm
+        sudo cp $(which qemu-${{ matrix.arch }}-static) vm/usr/bin/
 
     - name: Build
       run: |
         ./y.sh prepare --only-libcore --cross
         # TODO: remove --features master when it is back to the default.
-        ./y.sh build --target-triple m68k-unknown-linux-gnu --features master
+        ./y.sh build --target-triple ${{ matrix.arch }}-unknown-linux-gnu --features master
         # TODO: remove --features master when it is back to the default.
-        CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test --features master
+        CG_GCC_TEST_TARGET=${{ matrix.arch }}-unknown-linux-gnu cargo test --features master
         ./y.sh clean all
 
     - name: Prepare dependencies