diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index c496407c1d1..9b1dce34360 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -33,6 +33,9 @@ vk_cts_commits_to_backport=(
 
     # Remove "unused shader stages" tests
     7dac86c6bbd15dec91d7d9a98cd6dd57c11092a7
+
+    # Emit point size from "many indirect draws" test
+    771e56d1c4d03e073ddb7f1200ad6d57e0a0c979
 )
 
 # shellcheck disable=SC2034
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 953dfdca2d3..a9c5ff51d17 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -26,8 +26,8 @@ variables:
 
    DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
    DEBIAN_X86_64_TEST_GL_TAG: "20240428-piglit-7a"
-   DEBIAN_X86_64_TEST_VK_TAG: "20240428-piglit-7a"
-   KERNEL_ROOTFS_TAG: "20240503-mold"
+   DEBIAN_X86_64_TEST_VK_TAG: "20240506-pointsize"
+   KERNEL_ROOTFS_TAG: "20240506-pointsize"
 
    ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index d58772397ab..9a7122bb3ce 100644
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -589,5 +589,3 @@ spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 8,Fai
 
 # This seems to be a Vulkan Loader issue. Can be fixed by compiling the loader from the Github repo.
 dEQP-VK.api.get_device_proc_addr.non_enabled,Fail
-# This is a bug in CTS: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5096
-dEQP-VK.api.command_buffers.many_indirect_draws_on_secondary,Fail
diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt
index b0e1f35b70b..c135121eeec 100644
--- a/src/broadcom/ci/broadcom-rpi5-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi5-fails.txt
@@ -3,7 +3,6 @@ dEQP-VK.query_pool.performance_query.query_compute,Fail
 dEQP-VK.query_pool.performance_query.query_compute_copy,Fail
 dEQP-VK.query_pool.performance_query.query_graphic,Fail
 dEQP-VK.query_pool.performance_query.query_graphic_copy,Fail
+
 # This seems to be a Vulkan Loader issue. Can be fixed by compiling the loader from the Github repo.
 dEQP-VK.api.get_device_proc_addr.non_enabled,Fail
-# This is a bug in CTS: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5096
-dEQP-VK.api.command_buffers.many_indirect_draws_on_secondary,Fail