diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dfa3585d..32c4e2241 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,9 @@ stages:
 .os-debian:
   variables:
     BUILD_OS: debian
+    LLVM_VERSION: 11
     FDO_DISTRIBUTION_VERSION: bullseye
-    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} BUILD_ARCH=${BUILD_ARCH} KERNEL_IMAGE=${KERNEL_IMAGE} KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG} bash .gitlab-ci/debian-install.sh'
+    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} BUILD_ARCH=${BUILD_ARCH} KERNEL_IMAGE=${KERNEL_IMAGE} KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG} LLVM_VERSION=$(LLVM_VERSION} bash .gitlab-ci/debian-install.sh'
 
 .ci-rules:
   rules:
@@ -170,8 +171,8 @@ aarch64-debian-container_prep:
 
 .build-with-clang:
   variables:
-    CC: clang-11
-    CC_LD: lld-11
+    CC: clang-$LLVM_VERSION
+    CC_LD: lld-$LLVM_VERSION
     MESON_TOOLCHAIN_OPTIONS: "$MESON_OPTIONS -Db_lundef=false" # clang+ASan+undef=boom
 
 # Extends the core build templates to also provide for running our testing. We
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 758890816..5b1d2959a 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -22,13 +22,13 @@ MESA_DEV_PKGS="
 	libxrandr-dev
 	libxshmfence-dev
 	libxrandr-dev
-	llvm-11-dev
+	llvm-${LLVM_VERSION}-dev
 	python3-mako
 "
 
 # Needed for running the custom-built mesa
 MESA_RUNTIME_PKGS="
-	libllvm11
+	libllvm${LLVM_VERSION}
 "
 
 apt-get update
@@ -36,7 +36,7 @@ apt-get -y --no-install-recommends install \
 	autoconf \
 	automake \
 	build-essential \
-	clang-11 \
+	clang-${LLVM_VERSION} \
 	curl \
 	doxygen \
 	graphviz \
@@ -103,9 +103,9 @@ apt-get -y --no-install-recommends install \
 	libxkbcommon-dev \
 	libxml2-dev \
 	libxxf86vm-dev \
-	lld-11 \
-	llvm-11 \
-	llvm-11-dev \
+	lld-${LLVM_VERSION} \
+	llvm-${LLVM_VERSION} \
+	llvm-${LLVM_VERSION}-dev \
 	mesa-common-dev \
 	ninja-build \
 	pkg-config \