diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 1e7380c06db..b2dcc1c2320 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -8,7 +8,7 @@ set -uex
 # DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="791e420b2628c1e35eea81b3bafdb1c904a141e8"
+REV="c2b31333926a6171c3c02d182b756efad7770410"
 
 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 6bd94d00113..6a647e6c8b8 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -28,9 +28,9 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20241022-delete-mesa"
-   DEBIAN_TEST_GL_TAG: "20241022-delete-mesa"
-   DEBIAN_TEST_VK_TAG: "20241024-vkcts-v2"
-   KERNEL_ROOTFS_TAG: "20241024-vkcts-v2"
+   DEBIAN_TEST_GL_TAG: "20241030-piglit-c2"
+   DEBIAN_TEST_VK_TAG: "20241030-piglit-c2"
+   KERNEL_ROOTFS_TAG: "20241030-piglit-c2"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"
diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 08bf2738c64..6f54144dfef 100644
--- a/src/broadcom/ci/broadcom-rpi3-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi3-fails.txt
@@ -1233,3 +1233,10 @@ arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_mirror_non_squ
 arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_clamp_non_square,Fail
 dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_mirror_non_square,Fail
 dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_clamp_non_square,Fail
+
+# uprev Piglit in Mesa
+spec@glsl-1.20@execution@vs-loop-uint-induction-var-1,Fail
+spec@glsl-1.20@execution@vs-loop-uint-induction-var-3,Fail
+spec@glsl-1.20@execution@vs-loop-uint-induction-var-2,Fail
+spec@glsl-1.20@execution@vs-loop-uint-induction-var-4,Fail
+
diff --git a/src/gallium/drivers/svga/ci/svga-flakes.txt b/src/gallium/drivers/svga/ci/svga-flakes.txt
index 9042dbdbd6c..2c975d946bb 100644
--- a/src/gallium/drivers/svga/ci/svga-flakes.txt
+++ b/src/gallium/drivers/svga/ci/svga-flakes.txt
@@ -53,4 +53,3 @@ spec@egl_chromium_sync_control@conformance
 spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test
 spec@egl_khr_gl_colorspace@linear
 spec@glsl-1.30@execution@texelfetch fs sampler3d 1x129x9-98x129x9
-
diff --git a/src/gallium/drivers/svga/ci/svga-skips.txt b/src/gallium/drivers/svga/ci/svga-skips.txt
index 622471b4248..4dfd4197df0 100644
--- a/src/gallium/drivers/svga/ci/svga-skips.txt
+++ b/src/gallium/drivers/svga/ci/svga-skips.txt
@@ -25,3 +25,7 @@ spec@ext_texture_array@fbo-depth-array stencil-layered-clear
 # low-freq intermittent tessellation failures
 spec@arb_tessellation_shader@execution@tcs-input@tcs-input-mat2
 spec@arb_tessellation_shader@execution@tcs-input@tcs-input-uvec2_2
+
+# uprev Piglit in Mesa
+spec@arb_tessellation_shader@execution@built-in-functions@tcs-degrees-vec4
+