diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 3b0b05da28c..f87ae27ecbb 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -20,10 +20,10 @@ include:
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20250310-update-tag"
+   DEBIAN_BASE_TAG: "20250321-s3cp-fix5"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20250303-setup-env"
+   DEBIAN_BUILD_TAG: "20250321-s3cp-fix5"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base"
@@ -37,17 +37,17 @@ 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: "20250312-assets"
-   DEBIAN_TEST_GL_TAG: "20250307-piglit-70"
-   DEBIAN_TEST_VK_TAG: "20250312-bda-fix"
-   KERNEL_ROOTFS_TAG: "20250312-bda-fix"
+   DEBIAN_TEST_ANDROID_TAG: "20250321-s3cp-fix5"
+   DEBIAN_TEST_GL_TAG: "20250321-s3cp-fix5"
+   DEBIAN_TEST_VK_TAG: "20250321-s3cp-fix5"
+   KERNEL_ROOTFS_TAG: "20250321-s3cp-fix5"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
-   DEBIAN_PYUTILS_TAG: "20250303-hypothesis"
+   DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"
 
-   ALPINE_X86_64_BUILD_TAG: "20250223-way-prot"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
-   FEDORA_X86_64_BUILD_TAG: "20250223-way-prot"
+   ALPINE_X86_64_BUILD_TAG: "20250321-s3cp-fix5"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20250321-s3cp-fix5"
+   FEDORA_X86_64_BUILD_TAG: "20250321-s3cp-fix5"
 
    KERNEL_TAG: "v6.13-rc4-mesa-a328"
    KERNEL_REPO: "gfx-ci/linux"