diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 8ab85c4b63a..55e2d3c2240 100755
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -178,47 +178,6 @@ fi
 
 popd
 
-pushd /deqp-$deqp_api
-
-if [ "${DEQP_API}" = 'GLES' ]; then
-  if [ "${DEQP_TARGET}" = 'android' ]; then
-    cmake -S /VK-GL-CTS -B . -G Ninja \
-        -DDEQP_TARGET=android \
-        -DCMAKE_BUILD_TYPE=Release \
-        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-android}
-  else
-    # When including EGL/X11 testing, do that build first and save off its
-    # deqp-egl binary.
-    cmake -S /VK-GL-CTS -B . -G Ninja \
-        -DDEQP_TARGET=x11_egl_glx \
-        -DCMAKE_BUILD_TYPE=Release \
-        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-x11}
-
-    cmake -S /VK-GL-CTS -B . -G Ninja \
-        -DDEQP_TARGET=wayland \
-        -DCMAKE_BUILD_TYPE=Release \
-        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-wayland}
-  fi
-fi
-
-cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET} \
-      -DCMAKE_BUILD_TYPE=Release \
-      ${EXTRA_CMAKE_ARGS:-}
-
-# Make sure `default` doesn't silently stop detecting one of the platforms we care about
-if [ "${DEQP_TARGET}" = 'default' ]; then
-  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
-  grep -q DEQP_SUPPORT_X11=1 build.ninja
-  grep -q DEQP_SUPPORT_XCB=1 build.ninja
-fi
-
 deqp_build_targets=()
 case "${DEQP_API}" in
   VK|VK-main)
@@ -230,7 +189,7 @@ case "${DEQP_API}" in
   GLES)
     deqp_build_targets+=(deqp-gles{2,3,31})
     deqp_build_targets+=(glcts)  # needed for gles*-khr tests
-    # deqp-egl also comes from this build, but it is handled separately above.
+    # deqp-egl also comes from this build, but it is handled separately below.
     ;;
   tools)
     deqp_build_targets+=(testlog-to-xml)
@@ -239,6 +198,56 @@ case "${DEQP_API}" in
     ;;
 esac
 
+OLD_IFS="$IFS"
+IFS=";"
+CMAKE_SBT="${deqp_build_targets[*]}"
+IFS="$OLD_IFS"
+
+pushd /deqp-$deqp_api
+
+if [ "${DEQP_API}" = 'GLES' ]; then
+  if [ "${DEQP_TARGET}" = 'android' ]; then
+    cmake -S /VK-GL-CTS -B . -G Ninja \
+        -DDEQP_TARGET=android \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DSELECTED_BUILD_TARGETS="deqp-egl" \
+        ${EXTRA_CMAKE_ARGS:-}
+    ninja modules/egl/deqp-egl
+    mv modules/egl/deqp-egl{,-android}
+  else
+    # When including EGL/X11 testing, do that build first and save off its
+    # deqp-egl binary.
+    cmake -S /VK-GL-CTS -B . -G Ninja \
+        -DDEQP_TARGET=x11_egl_glx \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DSELECTED_BUILD_TARGETS="deqp-egl" \
+        ${EXTRA_CMAKE_ARGS:-}
+    ninja modules/egl/deqp-egl
+    mv modules/egl/deqp-egl{,-x11}
+
+    cmake -S /VK-GL-CTS -B . -G Ninja \
+        -DDEQP_TARGET=wayland \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DSELECTED_BUILD_TARGETS="deqp-egl" \
+        ${EXTRA_CMAKE_ARGS:-}
+    ninja modules/egl/deqp-egl
+    mv modules/egl/deqp-egl{,-wayland}
+  fi
+fi
+
+cmake -S /VK-GL-CTS -B . -G Ninja \
+      -DDEQP_TARGET=${DEQP_TARGET} \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DSELECTED_BUILD_TARGETS="${CMAKE_SBT}" \
+      ${EXTRA_CMAKE_ARGS:-}
+
+# Make sure `default` doesn't silently stop detecting one of the platforms we care about
+if [ "${DEQP_TARGET}" = 'default' ]; then
+  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
+  grep -q DEQP_SUPPORT_X11=1 build.ninja
+  grep -q DEQP_SUPPORT_XCB=1 build.ninja
+fi
+
 ninja "${deqp_build_targets[@]}"
 
 if [ "$DEQP_API" != tools ]; then
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index c69686a1886..e96d9689a42 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,7 +13,7 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20250128-llvm19-up"
+   DEBIAN_BASE_TAG: "20250130-cts-vroom"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "20250128-llvm19-up"
@@ -27,10 +27,10 @@ variables:
    DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_TEST_ANDROID_TAG: "20250129-android"
-   DEBIAN_TEST_GL_TAG: "20250128-llvm19-up"
-   DEBIAN_TEST_VK_TAG: "20250128-llvm19-up"
-   KERNEL_ROOTFS_TAG: "20250128-llvm19-up"
+   DEBIAN_TEST_ANDROID_TAG: "20250130-cts-vroom"
+   DEBIAN_TEST_GL_TAG: "20250130-cts-vroom"
+   DEBIAN_TEST_VK_TAG: "20250130-cts-vroom"
+   KERNEL_ROOTFS_TAG: "20250130-cts-vroom"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"