diff --git a/.ci/build.sh b/.ci/build.sh
index deaae31..c319836 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -7,7 +7,11 @@ for i in "$TOPDIR"/../patches/*.patch; do
     patch -Np1 -i "$i"
 done
 
-export CFLAGS="-ftree-vectorize -flto"
+CFLAGS="-ftree-vectorize -flto"
+if [[ "$(uname -m)" == "aarch64" ]]; then
+    CFLAGS="$CFLAGS -march=armv8-a+crc+crypto"
+fi
+export CFLAGS
 export CXXFLAGS="$CFLAGS"
 export LDFLAGS="-flto -fuse-linker-plugin"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e305e3e..63204ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,13 +7,17 @@ on:
   pull_request:
     branches: [ master ]
   workflow_dispatch:
-    inputs:
+    inputs: {}
   schedule:
     - cron: '0 7 * * 0'
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [amd64, arm64]
     steps:
       - uses: actions/checkout@v2
       - name: Set up QEMU
@@ -29,6 +33,6 @@ jobs:
       - name: Build Image
         uses: docker/build-push-action@v2
         with:
-          platforms: 'linux/amd64,linux/arm64'
+          platforms: linux/${{ matrix.arch }}
           push: ${{ (github.ref == 'refs/heads/master') && (github.repository == 'citra-emu/citra-multiplayer-dedicated') }}
           tags: citraemu/citra-multiplayer-dedicated:latest