diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 9c677be89b2..348dbf621d9 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -3,5 +3,5 @@ variables:
   CONDITIONAL_BUILD_ANGLE_TAG: 683d14557a9adc5f1b22acf880dad28e
   CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
   CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
-  CONDITIONAL_BUILD_PIGLIT_TAG: ba6cc303aa3ffe5eb580af101693266c
+  CONDITIONAL_BUILD_PIGLIT_TAG: 31939f3b6f2a619277594e671c9fbbff
   CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 167feb963fb512795aeddc9d1588bc7c
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 529403d4870..592d61dd297 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -13,7 +13,7 @@ section_start piglit "Building piglit"
 # setting up the environment variables locally
 ci_tag_build_time_check "PIGLIT_TAG"
 
-REV="517270ccca11a795d2f29bd723c362eb6ef9ce8f"
+REV="a70c33045c59310f972dbbdb33f322eb209971bc"
 
 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 c4da633cfe5..d7fb17ad987 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -24,9 +24,9 @@ variables:
 
   DEBIAN_TEST_BASE_TAG: "20250926-gitlab"
   DEBIAN_TEST_ANDROID_TAG: "20250926-gitlab"
-  DEBIAN_TEST_GL_TAG: "20250926-gitlab"
+  DEBIAN_TEST_GL_TAG: "20250930-piglit-a7"
   DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
-  DEBIAN_TEST_VK_TAG: "20250911-piglit"
+  DEBIAN_TEST_VK_TAG: "20250930-piglit-a7"
 
   ALPINE_X86_64_BUILD_TAG: "20250917-rust"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index ebae6008b3f..805813c0676 100644
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -410,9 +410,6 @@ spec@!opengl 2.1@polygon-stipple-fs,Fail
 # Works when run individually, but fail consistently on the CI
 dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgba32i_cube,Fail
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1034
-spec@glsl-1.40@uniform_buffer@two-stages,Fail
-
 # RPI4 only supports 4RT, so this tests with 8RT will fail
 spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 32 1 8 128 1,Fail
 spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 32 1 8 128 2,Fail
diff --git a/src/gallium/drivers/svga/ci/svga-fails.txt b/src/gallium/drivers/svga/ci/svga-fails.txt
index 9428d550499..62e3fc8028a 100644
--- a/src/gallium/drivers/svga/ci/svga-fails.txt
+++ b/src/gallium/drivers/svga/ci/svga-fails.txt
@@ -857,7 +857,6 @@ spec@glsl-1.10@execution@clipping@clip-plane-transformation pos_clipvert,Fail
 spec@glsl-1.30@execution@clipping@clip-plane-transformation pos,Fail
 spec@glsl-1.30@execution@fs-logic-joined-comparisons-with-nan2,Fail
 spec@glsl-1.30@execution@range_analysis_fsat_of_nan,Fail
-spec@glsl-1.40@uniform_buffer@two-stages,Fail
 spec@glsl-1.50@execution@geometry@primitive-id-restart gl_line_loop ffs,Fail
 spec@glsl-1.50@execution@geometry@primitive-id-restart gl_line_loop other,Fail
 spec@glsl-1.50@execution@geometry@primitive-id-restart gl_line_strip ffs,Fail