diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index c138aba5016..fc83923ce04 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="68658566da1c9cd6a378b5ca36999617e26440e7"
+REV="ebdf60e0d4b0dc23e79373cb923fdee023eb3b2b"
 
 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 d215a5f34e8..b05a450b801 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: "20250407-angle-38"
-   DEBIAN_TEST_GL_TAG: "20250407-angle-38"
-   DEBIAN_TEST_VK_TAG: "20250327-apitrace"
-   KERNEL_ROOTFS_TAG: "20250407-angle-38"
+   DEBIAN_TEST_GL_TAG: "20250407-piglit-eb"
+   DEBIAN_TEST_VK_TAG: "20250407-piglit-eb"
+   KERNEL_ROOTFS_TAG: "20250407-piglit-eb"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"