diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2abfa041dc6..dfd1b0645a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ workflow:
 
 variables:
   FDO_UPSTREAM_REPO: mesa/mesa
-  MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
+  MESA_TEMPLATES_COMMIT: &ci-templates-commit e195d80f35b45cc73668be3767b923fd76c70ed5
   CI_PRE_CLONE_SCRIPT: |-
           set -o xtrace
           wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index c9bb45a50e9..7b7ba5cdaac 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -62,6 +62,7 @@ DEPS=(
     libxtensor-dev
     libxxf86vm-dev
     libwayland-egl-backend-dev
+    "llvm-${LLVM_VERSION}-dev"
     make
     ninja-build
     openssh-server
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 82842aee45b..adf6f1504be 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -114,6 +114,7 @@ fi
 
 # no need to remove these at end, image isn't saved at the end
 CONTAINER_EPHEMERAL=(
+    arch-test
     automake
     bc
     "clang-${LLVM_VERSION}"