diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 822eae02355..b4eb25deec4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -398,8 +398,9 @@ sanity:
         ALPINE_X86_64_BUILD_TAG
         ALPINE_X86_64_LAVA_SSH_TAG
         ALPINE_X86_64_LAVA_TRIGGER_TAG
-        DEBIAN_BASE_TAG
+        DEBIAN_BUILD_BASE_TAG
         DEBIAN_BUILD_TAG
+        DEBIAN_TEST_BASE_TAG
         DEBIAN_TEST_ANDROID_TAG
         DEBIAN_TEST_GL_TAG
         DEBIAN_TEST_VK_TAG
diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index d396414f2c0..03844f5e110 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,7 +1,7 @@
 variables:
   CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7
   CONDITIONAL_BUILD_ANGLE_TAG: 9aaedd74072834a3c553656b6ddc17a7
-  CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377
+  CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
   CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9
   CONDITIONAL_BUILD_PIGLIT_TAG: 3dec1e03175e4cca1f644435e4e479d5
   CONDITIONAL_BUILD_VKD3D_PROTON_TAG: af0d99317a3483526f9b59eac3d88451
diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
index 705f488e57a..8d167816737 100644
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -3,7 +3,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 set -uex
 
diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 1b48bf410cc..058fef4b483 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -3,7 +3,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 # Do a very early check to make sure the tag is correct without the need of
 # setting up the environment variables locally
diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
index 6ccb31e667d..b806f1a4c1a 100644
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -4,7 +4,7 @@
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 set -uex
 
diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh
index ff7f1d3af4e..ac99ca3f12e 100644
--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@@ -5,8 +5,8 @@ set -ex
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
 # DEBIAN_BUILD_TAG
+# DEBIAN_TEST_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG
 
 uncollapsed_section_start mold "Building mold"
diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh
index e3616cc1b24..9f4e8b4794a 100644
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@@ -9,7 +9,8 @@ section_start rust "Building Rust toolchain"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_BUILD_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 # Pick a specific patch version from rustup so the compiler doesn't drift on us.
 RUST_VERSION=1.82.0
diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index 5d7aca5b3bc..e1fafab0b35 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -8,11 +8,8 @@ uncollapsed_section_start wayland "Building Wayland"
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
 # DEBIAN_BUILD_TAG
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_TEST_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG
 
 export LIBWAYLAND_VERSION="1.24.0"
diff --git a/.gitlab-ci/container/build-weston.sh b/.gitlab-ci/container/build-weston.sh
index 91b2fb6b019..526795b31b3 100644
--- a/.gitlab-ci/container/build-weston.sh
+++ b/.gitlab-ci/container/build-weston.sh
@@ -7,7 +7,7 @@ section_start weston "Building Weston"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 export WESTON_VERSION="14.0.1"
 
diff --git a/.gitlab-ci/container/build-xwayland.sh b/.gitlab-ci/container/build-xwayland.sh
index 04072794727..b8f523caa50 100644
--- a/.gitlab-ci/container/build-xwayland.sh
+++ b/.gitlab-ci/container/build-xwayland.sh
@@ -7,7 +7,7 @@ uncollapsed_section_start xwayland "Building XWayland"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 #
 export XORGPROTO_VERSION="xorgproto-2024.1"
 export XWAYLAND_VERSION="xwayland-24.1.8"
diff --git a/.gitlab-ci/container/debian/baremetal_arm_test.sh b/.gitlab-ci/container/debian/baremetal_arm_test.sh
index 1aaa5908812..fd781d397fc 100644
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 set -e
 
diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml
index 78183911fc3..594719ef966 100644
--- a/.gitlab-ci/container/debian/gitlab-ci.yml
+++ b/.gitlab-ci/container/debian/gitlab-ci.yml
@@ -30,7 +30,7 @@ debian/x86_64_build-base:
   extends:
     - .debian-container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
     LLVM_VERSION: &debian-x86_64-llvm 19
 
 .use-debian/x86_64_build-base:
@@ -196,7 +196,7 @@ debian/arm64_build:
   tags:
     - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
     LLVM_VERSION: &debian-arm64-llvm 19
 
 .use-debian/arm64_build:
@@ -222,7 +222,7 @@ debian/x86_64_test-base:
     - .debian-container
     - .container-builds-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
     LLVM_VERSION: *debian-x86_64-llvm
 
 .use-debian/x86_64_test-base:
@@ -250,7 +250,7 @@ debian/arm32_test-base:
     - .debian-container
     - .container-builds-base
   variables:
-    MESA_IMAGE_TAG: &debian-arm32_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm32_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
     LLVM_VERSION: *debian-arm64-llvm
     FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7"
 
@@ -280,7 +280,7 @@ debian/arm64_test-base:
     - .debian-container
     - .container-builds-base
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
     LLVM_VERSION: *debian-arm64-llvm
 
 .use-debian/arm64_test-base:
@@ -520,8 +520,8 @@ debian/baremetal_arm32_test-gl:
     - job: debian/arm32_test-gl
       optional: true
   variables:
-    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
 
 debian/baremetal_arm64_test-gl:
   extends:
@@ -530,8 +530,8 @@ debian/baremetal_arm64_test-gl:
     - job: debian/arm64_test-gl
       optional: true
   variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
 
 debian/baremetal_arm64_test-vk:
   extends:
@@ -540,8 +540,8 @@ debian/baremetal_arm64_test-vk:
     - job: debian/arm64_test-vk
       optional: true
   variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
+    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
 
 .use-debian/baremetal_arm32_test-gl:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index dfe0c320f9b..0cb49c71d81 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -3,7 +3,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
+# DEBIAN_TEST_BASE_TAG
 
 set -e
 
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index b54d5f4c23c..38e6257428b 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -3,7 +3,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
+# DEBIAN_BUILD_BASE_TAG
 
 set -e
 
diff --git a/.gitlab-ci/container/install-meson.sh b/.gitlab-ci/container/install-meson.sh
index aaca93768bd..45a837023ce 100644
--- a/.gitlab-ci/container/install-meson.sh
+++ b/.gitlab-ci/container/install-meson.sh
@@ -3,7 +3,7 @@
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BUILD_TAG
+# DEBIAN_BUILD_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG
 
 rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 7d814dd2035..7241b8e755e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,10 +19,10 @@ include:
   - .gitlab-ci/conditional-build-image-tags.yml
 
 variables:
-  DEBIAN_BASE_TAG: "20250803-noxvfb"
-
+  DEBIAN_BUILD_BASE_TAG: "20250803-noxvfb"
   DEBIAN_BUILD_TAG: "20250722-libwayland"
 
+  DEBIAN_TEST_BASE_TAG: "20250812-crosvm"
   DEBIAN_TEST_ANDROID_TAG: "20250805-vkcts"
   DEBIAN_TEST_GL_TAG: "20250805-vkcts"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"