diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index b3c2c4314bc..c55b8f65a3b 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -19,20 +19,35 @@ git clone \
     /VK-GL-CTS
 pushd /VK-GL-CTS
 
+# Patches to VulkanCTS may come from commits in their repo (listed in
+# cts_commits_to_backport) or patch files stored in our repo (in the patch
+# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
+# Both list variables would have comments explaining the reasons behind the
+# patches.
+
 cts_commits_to_backport=()
 
 for commit in "${cts_commits_to_backport[@]}"
 do
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch" | git am -
+  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
+  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
+    git am -
 done
 
-# Fix surfaceless build.
-git am < $OLDPWD/.gitlab-ci/container/0001-Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
+cts_patch_files=(
+  # Fix surfaceless build.
+  build-deqp_Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
+  # Android specific patches.
+  build-deqp_Allow-running-on-Android-from-the-command-line.patch
+  build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
+)
 
-# Android specific patches.
-git am < $OLDPWD/.gitlab-ci/container/0001-Allow-running-on-Android-from-the-command-line.patch
-git am < $OLDPWD/.gitlab-ci/container/0002-Android-prints-to-stdout-instead-of-logcat.patch
+for patch in "${cts_patch_files[@]}"
+do
+  echo "Apply patch to VK-GL-CTS from $patch"
+  git am < $OLDPWD/.gitlab-ci/container/patches/$patch
+done
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
diff --git a/.gitlab-ci/container/0001-Allow-running-on-Android-from-the-command-line.patch b/.gitlab-ci/container/patches/build-deqp_Allow-running-on-Android-from-the-command-line.patch
similarity index 100%
rename from .gitlab-ci/container/0001-Allow-running-on-Android-from-the-command-line.patch
rename to .gitlab-ci/container/patches/build-deqp_Allow-running-on-Android-from-the-command-line.patch
diff --git a/.gitlab-ci/container/0002-Android-prints-to-stdout-instead-of-logcat.patch b/.gitlab-ci/container/patches/build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
similarity index 100%
rename from .gitlab-ci/container/0002-Android-prints-to-stdout-instead-of-logcat.patch
rename to .gitlab-ci/container/patches/build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
diff --git a/.gitlab-ci/container/0001-Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch b/.gitlab-ci/container/patches/build-deqp_Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
similarity index 100%
rename from .gitlab-ci/container/0001-Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
rename to .gitlab-ci/container/patches/build-deqp_Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 0d481f4998d..9a49e9f2bb3 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -15,13 +15,13 @@ variables:
    DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
    DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android"
 
-   DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-12-deqp-egl"
-   DEBIAN_X86_TEST_GL_TAG: "2023-04-18-vulkan-validation-layer"
-   DEBIAN_X86_TEST_VK_TAG: "2023-04-14-dxvk-2.1-1"
+   DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-21-deqp-vkcts"
+   DEBIAN_X86_TEST_GL_TAG: "2023-04-21-deqp-vkcts"
+   DEBIAN_X86_TEST_VK_TAG: "2023-04-21-deqp-vkcts"
 
    ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
    FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
-   KERNEL_ROOTFS_TAG: "2023-04-16-kernel-6.3"
+   KERNEL_ROOTFS_TAG: "2023-04-21-deqp-vkcts"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"