diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh
index b18f307606c3..4dca82ffb967 100644
--- a/.ci/build-linux-aarch64.sh
+++ b/.ci/build-linux-aarch64.sh
@@ -12,8 +12,8 @@ git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodule
 
 mkdir build && cd build || exit 1
 
-export CC=clang
-export CXX=clang++
+export CC="${CLANG_BINARY}"
+export CXX="${CLANGXX_BINARY}"
 
 cmake ..                                               \
     -DCMAKE_INSTALL_PREFIX=/usr                        \
@@ -27,8 +27,8 @@ cmake ..                                               \
     -DUSE_SYSTEM_FFMPEG=OFF                            \
     -DUSE_DISCORD_RPC=ON                               \
     -DOpenGL_GL_PREFERENCE=LEGACY                      \
+    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
     -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_LLVM=OFF                                   \
     -G Ninja
 
 ninja; build_status=$?;
diff --git a/.cirrus.yml b/.cirrus.yml
index 209d7179d993..4dce31a4e979 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -132,7 +132,7 @@ linux_aarch64_task:
   matrix:
     - name: Cirrus Linux AArch64 Clang
       arm_container:
-        image: 'docker.io/kd117/rpcs3-ci-aarch64:latest'
+        image: 'docker.io/rpcs3/rpcs3-ci-focal-aarch64:1.0'
         cpu: 8
         memory: 8G
       clang_script:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9b4ac024025f..c2f86929ee68 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -38,13 +38,13 @@ jobs:
     displayName: ccache
 
   - bash: |
-      docker pull --quiet rpcs3/rpcs3-ci-focal:1.7.1
+      docker pull --quiet rpcs3/rpcs3-ci-focal:1.8
       docker run                      \
         -v $(pwd):/rpcs3              \
         --env-file .ci/docker.env \
         -v $CCACHE_DIR:/root/.ccache  \
         -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
-        rpcs3/rpcs3-ci-focal:1.7.1 \
+        rpcs3/rpcs3-ci-focal:1.8 \
         /rpcs3/.ci/build-linux.sh
     displayName: Docker setup and build