diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index f6f9a549d79..f0435baa23d 100644
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -8,7 +8,7 @@ set -ex
 # DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="647d0725024f72bc49bbc91c686c5f61168a1fe8"
+REV="582f5490a124c27c26d3a452fee03a8c85fa9a5c"
 
 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 d82d5773677..34d8fe4b051 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: "20240423-deqp"
-   DEBIAN_TEST_GL_TAG: "20240704-libdir"
-   DEBIAN_TEST_VK_TAG: "20240704-libdir"
-   KERNEL_ROOTFS_TAG: "20240703-vvl"
+   DEBIAN_TEST_GL_TAG: "20240713-piglit-58"
+   DEBIAN_TEST_VK_TAG: "20240713-piglit-58"
+   KERNEL_ROOTFS_TAG: "20240713-piglit-58"
 
    ALPINE_X86_64_BUILD_TAG: "20240620-sphinx"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"