diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 0c00be862c6..e26d6b5c8d1 100755
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -23,7 +23,7 @@ set -x
 # - the GL release produces `glcts`, and
 # - the GLES release produces `deqp-gles*` and `deqp-egl`
 
-DEQP_MAIN_COMMIT=f66e0ae866117f3d7375763bf5ec194404d88cdb
+DEQP_MAIN_COMMIT=9cc8e038994c32534b3d2c4ba88c1dc49ef53228
 DEQP_VK_VERSION=1.4.1.1
 DEQP_GL_VERSION=4.6.6.0
 DEQP_GLES_VERSION=3.2.12.0
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index f332b39f362..2bf4b3f6846 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,10 +23,10 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250611-rust"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250611-angle-c3"
-  DEBIAN_TEST_GL_TAG: "20250611-piglit-a0a"
+  DEBIAN_TEST_ANDROID_TAG: "20250616-vkcts-main"
+  DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
-  DEBIAN_TEST_VK_TAG: "20250611-piglit-a0a"
+  DEBIAN_TEST_VK_TAG: "20250616-vkcts-main"
 
   ALPINE_X86_64_BUILD_TAG: "20250611-rust"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
diff --git a/src/amd/ci/radv-hawaii-fails.txt b/src/amd/ci/radv-hawaii-fails.txt
index ed35dce82af..4a07aad492f 100644
--- a/src/amd/ci/radv-hawaii-fails.txt
+++ b/src/amd/ci/radv-hawaii-fails.txt
@@ -2,3 +2,6 @@
 dEQP-VK.video.capabilities.queue_support_query,Fail
 
 dEQP-VK.binding_model.descriptor_buffer.sparse_binding_buffer.capture_replay.compute_comp_combined_image_sampler_custom_border_color,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-navi10-fails.txt b/src/amd/ci/radv-navi10-fails.txt
index 79b36e4c74c..4a96e2ef5b0 100644
--- a/src/amd/ci/radv-navi10-fails.txt
+++ b/src/amd/ci/radv-navi10-fails.txt
@@ -8,3 +8,6 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-navi21-fails.txt b/src/amd/ci/radv-navi21-fails.txt
index 79b36e4c74c..4a96e2ef5b0 100644
--- a/src/amd/ci/radv-navi21-fails.txt
+++ b/src/amd/ci/radv-navi21-fails.txt
@@ -8,3 +8,6 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-navi31-fails.txt b/src/amd/ci/radv-navi31-fails.txt
index 562da53cde3..89cbe7e95af 100644
--- a/src/amd/ci/radv-navi31-fails.txt
+++ b/src/amd/ci/radv-navi31-fails.txt
@@ -20,3 +20,6 @@ dEQP-VK.video.synchronization2.decode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.decode_h265.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.encode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.encode_h265.basic.event.device_set_reset,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-polaris10-fails.txt b/src/amd/ci/radv-polaris10-fails.txt
index ba026d87ec0..6917826f4b1 100644
--- a/src/amd/ci/radv-polaris10-fails.txt
+++ b/src/amd/ci/radv-polaris10-fails.txt
@@ -3,3 +3,6 @@ dEQP-VK.video.synchronization.decode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization.decode_h265.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.decode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.decode_h265.basic.event.device_set_reset,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-raphael-fails.txt b/src/amd/ci/radv-raphael-fails.txt
index 99e393f26a0..d10c04ad21a 100644
--- a/src/amd/ci/radv-raphael-fails.txt
+++ b/src/amd/ci/radv-raphael-fails.txt
@@ -178,3 +178,6 @@ dEQP-VK.query_pool.statistics_query.reset_after_copy.fragment_shader_invocations
 dEQP-VK.query_pool.statistics_query.reset_after_copy.fragment_shader_invocations.primary.64bits_dstoffset_cmdcopyquerypoolresults_triangle_list_with_no_color_attachments,Fail
 dEQP-VK.query_pool.statistics_query.reset_after_copy.fragment_shader_invocations.primary.64bits_dstoffset_cmdcopyquerypoolresults_triangle_strip_with_adjacency_with_no_color_attachments,Fail
 dEQP-VK.query_pool.statistics_query.reset_after_copy.fragment_shader_invocations.primary.64bits_dstoffset_cmdcopyquerypoolresults_triangle_strip_with_no_color_attachments,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-renoir-fails.txt b/src/amd/ci/radv-renoir-fails.txt
index bf101e8bbc0..726160f6d54 100644
--- a/src/amd/ci/radv-renoir-fails.txt
+++ b/src/amd/ci/radv-renoir-fails.txt
@@ -9,3 +9,11 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
+
+# Likely a RADV bug on transfer queue
+dEQP-VK.api.copy_and_blit.copy_commands2.buffer_to_image_transfer_queue.2d_images.whole_unaligned_rgb32_sfloat_linear,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_buffer_transfer_queue.2d_images.whole_unaligned_r32g32b32_sfloat_linear,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_buffer_transfer_queue.2d_images.whole_unaligned_r32g32b32_uint_linear,Fail
diff --git a/src/amd/ci/radv-tahiti-fails.txt b/src/amd/ci/radv-tahiti-fails.txt
index 1c64e63db69..f15af792ea5 100644
--- a/src/amd/ci/radv-tahiti-fails.txt
+++ b/src/amd/ci/radv-tahiti-fails.txt
@@ -1,2 +1,5 @@
 # Video failures
 dEQP-VK.video.capabilities.queue_support_query,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-vangogh-fails.txt b/src/amd/ci/radv-vangogh-fails.txt
index 79b36e4c74c..4a96e2ef5b0 100644
--- a/src/amd/ci/radv-vangogh-fails.txt
+++ b/src/amd/ci/radv-vangogh-fails.txt
@@ -8,3 +8,6 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
diff --git a/src/amd/ci/radv-vega10-fails.txt b/src/amd/ci/radv-vega10-fails.txt
index 8d64007dad8..528a65d9284 100644
--- a/src/amd/ci/radv-vega10-fails.txt
+++ b/src/amd/ci/radv-vega10-fails.txt
@@ -15,3 +15,11 @@ dEQP-VK.video.synchronization.decode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization.decode_h265.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.decode_h264.basic.event.device_set_reset,Fail
 dEQP-VK.video.synchronization2.decode_h265.basic.event.device_set_reset,Fail
+
+# CTS bug
+dEQP-VK.reconvergence.maximal.fragment.terminate_invocation,Fail
+
+# Likely a RADV bug on transfer queue
+dEQP-VK.api.copy_and_blit.copy_commands2.buffer_to_image_transfer_queue.2d_images.whole_unaligned_rgb32_sfloat_linear,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_buffer_transfer_queue.2d_images.whole_unaligned_r32g32b32_sfloat_linear,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_buffer_transfer_queue.2d_images.whole_unaligned_r32g32b32_uint_linear,Fail