diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index f329c7c5dc1..c138aba5016 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -10,7 +10,7 @@ uncollapsed_section_start piglit "Building piglit"
 # DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="708a9e365b18fdd881af989f75e1a6c1409cae8c"
+REV="68658566da1c9cd6a378b5ca36999617e26440e7"
 
 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 14be8018642..7d8d104387e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -38,9 +38,9 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20250321-s3cp-fix5"
-   DEBIAN_TEST_GL_TAG: "20250321-s3cp-fix5"
-   DEBIAN_TEST_VK_TAG: "20250325-vkd3d"
-   KERNEL_ROOTFS_TAG: "20250321-s3cp-fix5"
+   DEBIAN_TEST_GL_TAG: "20250327-piglit"
+   DEBIAN_TEST_VK_TAG: "20250327-piglit"
+   KERNEL_ROOTFS_TAG: "20250327-trace"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 2c6a441ddba..f60af00fe57 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -51,8 +51,6 @@ radeonsi-stoney-traces:
   extends:
     - .lava-piglit-traces:x86_64
     - .radeonsi-stoney-test:x86_64
-  rules:
-    - when: never # temporarily disabled due to S3 issues
   variables:
     EGL_PLATFORM: surfaceless
     PIGLIT_TRACES_FILE: traces-amd.yml
@@ -97,8 +95,6 @@ radv-raven-traces-restricted:
     - .radv-raven-test:x86_64
     - .lava-lenovo-TPad-C13-Yoga-zork:x86_64
     - .radv-collabora-restricted-rules
-  rules:
-    - when: never # temporarily disabled due to S3 issues
   variables:
     HWCI_START_WESTON: 1
     PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1"
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 2edbb70661e..1a3377ef78a 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -88,8 +88,7 @@ v3d-rpi4-rusticl:arm64:
   variables:
     DEQP_SUITE: v3d-rusticl
 
-# Disabled until piglit's trace download is fixed
-.v3d-rpi4-traces:arm64:
+v3d-rpi4-traces:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
     - .piglit-traces-test
@@ -222,8 +221,7 @@ v3d-rpi5-rusticl:arm64:
   variables:
     DEQP_SUITE: v3d-rusticl
 
-# Disabled until piglit's trace download is fixed
-.v3d-rpi5-traces:arm64:
+v3d-rpi5-traces:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
     - .piglit-traces-test
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 193219372f9..d90b896f056 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -44,11 +44,12 @@ a306-piglit-shader:
     FDO_CI_CONCURRENT: 6
     HWCI_START_WESTON: 1
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a306-traces:
+a306-traces:
   extends:
     - .google-freedreno-test-traces
     - .a306-test
+  rules:
+    - when: never # Google nginx needs updating
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a306"
     PIGLIT_RESULTS: "freedreno-a306-replay"
@@ -62,11 +63,12 @@ a530-gl:
     FDO_CI_CONCURRENT: 3  # if 4, sometimes "deqp-gles31, not enough memory for the allocation" appears
   parallel: 6
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a530-traces:
+a530-traces:
   extends:
     - .google-freedreno-test-traces
     - .a530-test
+  rules:
+    - when: never # Google nginx needs updating
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a530"
     PIGLIT_RESULTS: "freedreno-a530-replay"
@@ -197,8 +199,7 @@ a618-piglit-cl:
     HWCI_START_WESTON: 1
     PIGLIT_PROFILES: cl
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a618-traces:
+a618-traces:
   extends:
     - .lava-piglit-traces:arm64
     - .lava-sc7180-trogdor-kingoftown:arm64
@@ -217,10 +218,9 @@ a618-piglit-cl:
     MESA_GL_VERSION_OVERRIDE: "4.6"
     PIGLIT_TRACES_FILE: traces-freedreno.yml
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a618-traces-performance:
+a618-traces-performance:
   extends:
-    - .a618-traces
+    - a618-traces
     - .piglit-performance:arm64
     - .collabora-freedreno-rules-performance
   variables:
@@ -228,7 +228,7 @@ a618-piglit-cl:
     # a618 tag starts with cbg-1 (not cbg-0) for some reason
     LAVA_TAGS: "cbg-1"
   needs:
-    - !reference [.a618-traces, needs]
+    - !reference [a618-traces, needs]
     - !reference [.piglit-performance:arm64, needs]
 
 a660-angle:
@@ -379,10 +379,12 @@ a630-piglit-full:
     DEQP_SUITE: freedreno-a630-piglit-full
     TEST_PHASE_TIMEOUT_MINUTES: 55
 
-.a630-traces:
+a630-traces:
   extends:
     - .google-freedreno-test-traces
     - .a630-test
+  rules:
+    - when: never # Google nginx needs updating
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a630"
     PIGLIT_RESULTS: "freedreno-a630-replay"
@@ -392,21 +394,23 @@ a630-piglit-full:
     MESA_GL_VERSION_OVERRIDE: "4.6"
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri="
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a630-traces-restricted:
+a630-traces-restricted:
   extends:
-    - .a630-traces
+    - a630-traces
     - .google-freedreno-rules-restricted
+  rules:
+    - when: never # Google nginx needs updating
   variables:
     PIGLIT_TRACES_FILE: restricted-traces-freedreno.yml
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}"
   allow_failure: true
 
-# https://gitlab.freedesktop.org/mesa/piglit/-/issues/113
-.a630-traces-performance:
+a630-traces-performance:
   extends:
-    - .a630-traces
+    - a630-traces
     - .google-freedreno-rules-performance
+  rules:
+    - when: never # Google nginx needs updating
   variables:
     PIGLIT_REPLAY_SUBCOMMAND: "profile"
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/"
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 7c4f57917f8..25e61b31216 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -12,8 +12,7 @@ llvmpipe-piglit-rusticl:
     DEQP_SUITE: llvmpipe-rusticl
     GPU_VERSION: llvmpipe-rusticl
 
-# Disabled until piglit's trace download is fixed
-.llvmpipe-traces:
+llvmpipe-traces:
   extends:
     - .test-gl
     - .piglit-traces-test
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 595ae51f9af..e9ad05abde4 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -32,8 +32,7 @@ virgl-on-gles:
   extends:
     - virgl-on-gl
 
-# Disabled until piglit's trace download is fixed
-.virgl-traces:
+virgl-traces:
   extends:
     - .virgl-test
     - .piglit-traces-test
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index a75fe6ded3c..9361d0437e7 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -200,8 +200,6 @@
     # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get
     # dependencies right.
     - .lava-traces-base
-  rules:
-    - when: never # temporarily disabled due to S3 issues
   variables:
     VK_DRIVER: intel
     GPU_VERSION: zink-anv-adl
@@ -227,8 +225,6 @@
     # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get
     # dependencies right.
     - .lava-traces-base
-  rules:
-    - when: never # temporarily disabled due to S3 issues
   variables:
     VK_DRIVER: intel
     GPU_VERSION: zink-anv-tgl
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 633593a4a1d..b33487a987b 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -150,18 +150,18 @@ zink-tu-a618-full:
   parallel: null
   timeout: 1h
 
-.zink-tu-a618-traces:
+zink-tu-a618-traces:
   extends:
-    - .a618-traces
+    - a618-traces
     - .zink-turnip-collabora-rules
     - .zink-trace-test
   parallel: null
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "zink-a618"
 
-.zink-tu-a618-traces-performance:
+zink-tu-a618-traces-performance:
   extends:
-    - .zink-tu-a618-traces
+    - zink-tu-a618-traces
     - .zink-turnip-collabora-manual-rules
     - .piglit-performance:arm64
   rules:
@@ -172,7 +172,7 @@ zink-tu-a618-full:
     # a618 tag starts with cbg-1 (not cbg-0) for some reason
     LAVA_TAGS: "cbg-1"
   needs:
-    - !reference [.zink-tu-a618-traces, needs]
+    - !reference [zink-tu-a618-traces, needs]
     - !reference [.piglit-performance:arm64, needs]
 
 zink-tu-a750:
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 7db848e22ab..7c20aec5ecb 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -419,8 +419,6 @@
 .iris-traces:
   extends:
     - .lava-traces-base
-  rules:
-    - when: never # temporarily disabled due to S3 issues
   variables:
     EGL_PLATFORM: surfaceless
     PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"