diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index c070f8670df..850642c77d9 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -98,7 +98,7 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 fi
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
+      -DDEQP_TARGET=${DEQP_TARGET:-default} \
       -DCMAKE_BUILD_TYPE=Release \
       $EXTRA_CMAKE_ARGS
 mold --run ninja
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 0c693bb799e..1c397dff1e2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -18,14 +18,14 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-find"
-   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-find"
-   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-find"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-default"
+   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-default"
+   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-default"
 
    ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
    FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
-   KERNEL_ROOTFS_TAG: "2024-01-10-find"
+   KERNEL_ROOTFS_TAG: "2024-01-10-default"
    KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "67f2c46b"