diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 7a30a8bfc76..dfc9a148876 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -59,8 +59,6 @@
     - .build-linux
     - .use-debian/x86_64_build
   stage: build-only
-  variables:
-    LLVM_VERSION: 15
   script:
     - &meson-build timeout --verbose ${BUILD_JOB_TIMEOUT_OVERRIDE:-$BUILD_JOB_TIMEOUT} .gitlab-ci/meson/build.sh
 
@@ -118,7 +116,6 @@ debian-testing:
       -D perfetto=true
       -D tools=drm-shim
     S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
-    LLVM_VERSION: 15
     RUN_MESON_TESTS: "false" # debian-build-testing already runs these
   script:
     - *meson-build
@@ -261,7 +258,6 @@ debian-build-testing:
       -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
-    LLVM_VERSION: 15
     S3_ARTIFACT_NAME: debian-build-testing
   script:
     - *meson-build
@@ -306,7 +302,6 @@ debian-release:
     - !reference [.meson-build, needs]
     - !reference [.build-for-tests-jobs]
   variables:
-    LLVM_VERSION: 15
     UNWIND: "enabled"
     C_ARGS: >
       -Wno-error=stringop-overread
@@ -423,7 +418,6 @@ fedora-release:
       -D llvm=enabled
       -D microsoft-clc=disabled
       -D shared-llvm=enabled
-    LLVM_VERSION: ""
     UNWIND: "disabled"
     VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"
 
@@ -470,7 +464,6 @@ debian-android:
       -D gallium-xa=disabled
       -D gallium-nine=false
       -D gallium-rusticl=false
-    LLVM_VERSION: "15"
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
     HOST_BUILD_OPTIONS: >
       -D build-tests=false
@@ -703,7 +696,6 @@ debian-clang:
     - !reference [.build-for-tests-jobs]
   variables:
     BUILDTYPE: debug
-    LLVM_VERSION: 15
     UNWIND: "enabled"
     C_ARGS: >
       -Wno-error=constant-conversion
@@ -793,7 +785,6 @@ debian-vulkan:
   variables:
     BUILD_JOB_TIMEOUT: 30m
     BUILDTYPE: debug
-    LLVM_VERSION: 15
     UNWIND: "disabled"
     DRI_LOADERS: >
       -D glx=disabled
@@ -834,7 +825,6 @@ debian-x86_32:
     CROSS: i386
     VULKAN_DRIVERS: intel,amd,swrast,virtio,panfrost
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,llvmpipe,softpipe,virgl,zink,crocus,d3d12,panfrost"
-    LLVM_VERSION: 15
     DRI_LOADERS:
       -D glvnd=disabled
     EXTRA_OPTION: >
@@ -872,7 +862,6 @@ debian-s390x:
     BUILDTYPE: debug
     CROSS: s390x
     GALLIUM_DRIVERS: "llvmpipe,virgl,zink"
-    LLVM_VERSION: 15
     VULKAN_DRIVERS: "swrast,virtio"
     DRI_LOADERS:
       -D glvnd=disabled
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 5656f7de8dc..8f4a3888997 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -72,6 +72,7 @@ debian/x86_64_build-base:
     - .debian-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    LLVM_VERSION: &debian-x86_64-llvm 15
 
 .use-debian/x86_64_build-base:
   extends:
@@ -82,6 +83,7 @@ debian/x86_64_build-base:
     MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
     MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_ARTIFACTS_BASE_TAG: *debian-x86_64_build-base
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/x86_64_build-base
 
@@ -91,6 +93,7 @@ debian/x86_64_build:
     - .use-debian/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
+    LLVM_VERSION: *debian-x86_64-llvm
 
 .use-debian/x86_64_build:
   extends:
@@ -99,6 +102,7 @@ debian/x86_64_build:
     MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_IMAGE_PATH}
     MESA_IMAGE_TAG: *debian-x86_64_build
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/x86_64_build
 
@@ -116,6 +120,7 @@ debian/x86_32_build:
     MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/x86_32_build"
     MESA_IMAGE_TAG: *debian-x86_32_build
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/x86_32_build
 
@@ -133,6 +138,7 @@ debian/ppc64el_build:
     MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/ppc64el_build"
     MESA_IMAGE_TAG: *debian-ppc64el_build
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/ppc64el_build
 
@@ -150,6 +156,7 @@ debian/s390x_build:
     MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/s390x_build"
     MESA_IMAGE_TAG: *debian-s390x_build
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/s390x_build
 
@@ -160,6 +167,10 @@ debian/s390x_build:
     ANDROID_SDK_VERSION: 34
     ANDROID_LLVM_VERSION: llvmorg-18.1.8
     ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250103
+    # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
+    # used (LLVM 19 in our Debian system), but ANDROID_LLVM_VERSION refers to
+    # the cross-compiling LLVM toolchain used to build for the Android system.
+    LLVM_VERSION: &debian-android-llvm 19
 
 debian/android_build:
   extends:
@@ -189,6 +200,7 @@ debian/arm64_build:
     - aarch64
   variables:
     MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    LLVM_VERSION: &debian-arm64-llvm 15
 
 .use-debian/arm64_build:
   extends:
@@ -197,6 +209,7 @@ debian/arm64_build:
     MESA_IMAGE_PATH: "debian/arm64_build"
     MESA_IMAGE_TAG: *debian-arm64_build
     MESA_ARTIFACTS_TAG: *debian-arm64_build
+    LLVM_VERSION: *debian-arm64-llvm
   needs:
     - debian/arm64_build
 
@@ -250,6 +263,7 @@ fedora/x86_64_build:
   variables:
     FDO_DISTRIBUTION_VERSION: 41
     MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
+    LLVM_VERSION: &fedora-x86_64-llvm 19
 
 .use-fedora/x86_64_build:
   extends:
@@ -257,6 +271,7 @@ fedora/x86_64_build:
   variables:
     MESA_IMAGE_PATH: "fedora/x86_64_build"
     MESA_IMAGE_TAG: *fedora-x86_64_build
+    LLVM_VERSION: *fedora-x86_64-llvm
   needs:
     - fedora/x86_64_build
 
@@ -266,6 +281,7 @@ debian/x86_64_test-base:
     - .debian-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_TAG}"
+    LLVM_VERSION: *debian-x86_64-llvm
 
 .use-debian/x86_64_test-base:
   extends:
@@ -275,6 +291,7 @@ debian/x86_64_test-base:
   variables:
     MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
     MESA_BASE_TAG: *debian-x86_64_test-base
+    LLVM_VERSION: *debian-x86_64-llvm
   needs:
     - debian/x86_64_test-base
 
@@ -286,6 +303,7 @@ debian/arm64_test-base:
     - .debian-container
   variables:
     MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    LLVM_VERSION: *debian-arm64-llvm
 
 .use-debian/arm64_test-base:
   tags:
@@ -297,6 +315,7 @@ debian/arm64_test-base:
   variables:
     MESA_BASE_IMAGE: ${DEBIAN_ARM64_TEST_BASE_IMAGE}
     MESA_BASE_TAG: *debian-arm64_test-base
+    LLVM_VERSION: *debian-arm64-llvm
   needs:
     - debian/arm64_test-base
 
@@ -447,6 +466,7 @@ kernel+rootfs_x86_64:
   variables:
     DEBIAN_ARCH: "amd64"
     DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    LLVM_VERSION: *debian-x86_64-llvm
 
 kernel+rootfs_arm64:
   extends:
@@ -457,6 +477,7 @@ kernel+rootfs_arm64:
     - aarch64
   variables:
     DEBIAN_ARCH: "arm64"
+    LLVM_VERSION: *debian-arm64-llvm
 
 kernel+rootfs_arm32:
   extends:
@@ -464,6 +485,7 @@ kernel+rootfs_arm32:
     - .firmware_arm32
   variables:
     DEBIAN_ARCH: "armhf"
+    LLVM_VERSION: *debian-arm64-llvm # these are tied together as arm32 is built within aarch64
 
 # Cannot use anchors defined here from included files, so use extends: instead
 .use-kernel+rootfs-arm: