diff --git a/.gitlab-ci/container/strip-rootfs.sh b/.gitlab-ci/container/strip-rootfs.sh
index a8d3286b3d5..ddc59c37d4f 100644
--- a/.gitlab-ci/container/strip-rootfs.sh
+++ b/.gitlab-ci/container/strip-rootfs.sh
@@ -40,7 +40,7 @@ UNNEEDED_PACKAGES=(
   hostname
   adduser
   debian-archive-keyring
-  "*mesa*"
+  libgl1-mesa-dri mesa-vulkan-drivers mesa-va-drivers mesa-vdpau-drivers i965-va-driver
   intel-media-va-driver
   gnupg2
   software-properties-common
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 84d8f456122..de9e761d613 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -27,10 +27,10 @@ variables:
    DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_TEST_ANDROID_TAG: "20241016-zz-top"
-   DEBIAN_TEST_GL_TAG: "20241017-piglit-79"
-   DEBIAN_TEST_VK_TAG: "20241017-piglit-79"
-   KERNEL_ROOTFS_TAG: "20241018-oblique"
+   DEBIAN_TEST_ANDROID_TAG: "20241022-delete-mesa"
+   DEBIAN_TEST_GL_TAG: "20241022-delete-mesa"
+   DEBIAN_TEST_VK_TAG: "20241022-delete-mesa"
+   KERNEL_ROOTFS_TAG: "20241022-delete-mesa"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"