diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index d237d8485e6..5bab1626b98 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,3 +1,3 @@
 variables:
   CONDITIONAL_BUILD_ANGLE_TAG: e7c547147880538db994f480292364c7
-  CONDITIONAL_BUILD_PIGLIT_TAG: e2cb48af623fb6c8b9793679de33d5be
+  CONDITIONAL_BUILD_PIGLIT_TAG: 2fb6336d546595b0f1cd811db2797155
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index f508687128a..c566cb7cbdf 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -14,7 +14,7 @@ uncollapsed_section_start piglit "Building piglit"
 # setting up the environment variables locally
 ci_tag_build_time_check "PIGLIT_TAG"
 
-REV="0ecdebb0f5927728ddeeb851639a559b0f7d6590"
+REV="c50d9aa54f85e0af9d72fab86c73f89356d96399"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 25bc4bc2dde..d423d2d564f 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -24,9 +24,9 @@ variables:
   DEBIAN_BUILD_TAG: "20250422-ci-fairy"
 
   DEBIAN_TEST_ANDROID_TAG: "20250422-angle-f3"
-  DEBIAN_TEST_GL_TAG: "20250422-angle-f3"
-  DEBIAN_TEST_VK_TAG: "20250419-vkd3d"
-  KERNEL_ROOTFS_TAG: "20250422-angle-f3"
+  DEBIAN_TEST_GL_TAG: "20250422-piglit-c50"
+  DEBIAN_TEST_VK_TAG: "20250422-piglit-c50"
+  KERNEL_ROOTFS_TAG: "20250422-piglit-c50"
 
   DEBIAN_PYUTILS_TAG: "20250422-ci-fairy"
 
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index c3a51fd1519..1bac8205848 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -220,6 +220,8 @@ spec@glsl-4.00@execution@built-in-functions@fs-op-div-dmat4-dmat4,Fail
 # uprev Piglit in Mesa
 glx@glx-swap-pixmap-bad,Fail
 spec@arb_occlusion_query@occlusion_query_order,Fail
+spec@arb_shader_clock@execution@clock,Fail
+spec@arb_shader_clock@execution@clock2x32,Fail
 spec@glsl-1.30@execution@fs-uint-to-float-of-extract-int16,Fail
 spec@glsl-1.30@execution@fs-uint-to-float-of-extract-int8,Fail
 spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail
diff --git a/src/gallium/drivers/svga/ci/svga-fails.txt b/src/gallium/drivers/svga/ci/svga-fails.txt
index e2e799273de..abf619d5e6d 100644
--- a/src/gallium/drivers/svga/ci/svga-fails.txt
+++ b/src/gallium/drivers/svga/ci/svga-fails.txt
@@ -1082,5 +1082,7 @@ spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one,Fail
 spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one_write-z,Fail
 spec@egl_chromium_sync_control@conformance,Fail
 spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail
+spec@gl-3.1@attributeless-vertexid,Fail
+spec@glsl-1.50@execution@primitive-id-no-gs-first-vertex,Fail
 spec@glsl-1.50@execution@primitive-id-no-gs-line,Fail