diff --git a/.github/workflows/llvm_clang.yml b/.github/workflows/llvm_clang.yml
index eab212988..dcbe1e651 100644
--- a/.github/workflows/llvm_clang.yml
+++ b/.github/workflows/llvm_clang.yml
@@ -67,7 +67,6 @@ jobs:
 
       - name: Loading aarch64 toolchain
         id: aarch64_cache
-        if: false
         uses: actions/cache/restore@main
         with:
           path: build_aarch64
@@ -115,7 +114,7 @@ jobs:
           ninja -C build_i686 llvm-clang
 
       - name: Building aarch64 toolchain
-        if: false
+        if: ${{ steps.aarch64_cache.outputs.cache-matched-key == '' }}
         run: |
           cmake -DTARGET_ARCH=aarch64-w64-mingw32 -DLLVM_ENABLE_PGO=GEN -DCOMPILER_TOOLCHAIN=clang -DCMAKE_INSTALL_PREFIX=$PWD/clang_root -DMINGW_INSTALL_PREFIX=$PWD/build_aarch64/aarch64-w64-mingw32 -DSINGLE_SOURCE_LOCATION=$PWD/src_packages -DRUSTUP_LOCATION=$PWD/clang_root/install_rustup -G Ninja -B build_aarch64 -S $PWD
           ninja -C build_aarch64 llvm-clang
@@ -191,7 +190,6 @@ jobs:
           key: ${{ secrets.CACHE_VERSION }}-clang-i686_toolchain-${{ github.run_id }}
 
       - name: Saving aarch64 toolchain
-        if: false
         uses: actions/cache/save@main
         with:
           path: build_aarch64
diff --git a/.github/workflows/mpv_clang.yml b/.github/workflows/mpv_clang.yml
index 7fa4573c0..b9dd24dbf 100644
--- a/.github/workflows/mpv_clang.yml
+++ b/.github/workflows/mpv_clang.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        bit: [i686, x86_64, x86_64_v3]
+        bit: [i686, x86_64, x86_64_v3, aarch64]
     env:
       BIT: ${{ matrix.bit }}
     container:
@@ -51,6 +51,8 @@ jobs:
           elif [[ $BIT == "x86_64_v3" ]]; then
             echo "arch=x86_64" >> $GITHUB_ENV
             echo "x86_64_level=-v3" >> $GITHUB_ENV
+          elif [[ $BIT == "aarch64" ]]; then
+            echo "arch=aarch64" >> $GITHUB_ENV
           fi
 
       - name: Setup git config