diff --git a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
index ae020c57c02..cf3744f01ca 100755
--- a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
+++ b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
@@ -2,6 +2,7 @@
 
 VARS=(
     ACO_DEBUG
+    ANGLE_TAG
     ANV_VIDEO_DECODE
     ANV_VIDEO_ENCODE
     ARTIFACTS_BASE_URL
diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index 0b0cbb2935c..1026385d256 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1 +1,2 @@
 variables:
+  CONDITIONAL_BUILD_ANGLE_TAG: fec96cc945650c5fe9f7188cabe80d8a
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 75461b8d8cc..bb577e078eb 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -9,6 +9,10 @@ set -uex
 
 uncollapsed_section_start angle "Building ANGLE"
 
+# Do a very early check to make sure the tag is correct without the need of
+# setting up the environment variables locally
+ci_tag_build_time_check "ANGLE_TAG"
+
 ANGLE_REV="6abdc11741c4932e8e64ec055e67f556a7cbb5b1"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 3d6169c6c6c..7b83a3fd44f 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -61,6 +61,32 @@
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
 
+.container-builds-angle:
+  variables:
+    ANGLE_TAG: "${CONDITIONAL_BUILD_ANGLE_TAG}"
+
+.container-builds-android:
+  extends:
+    - .container-builds-angle
+  variables:
+    # CI_BUILD_COMPONENTS is a space-separated list of components used during early tag checks
+    # If this job inherits from multiple .container-builds-*, it needs to combine them
+    # e.g: inherits from .container-builds-angle and .container-builds-piglit
+    # should make CI_BUILD_COMPONENTS="angle piglit"
+    CI_BUILD_COMPONENTS: "angle"
+
+.container-builds-x86_64:
+  extends:
+    - .container-builds-angle
+  variables:
+    CI_BUILD_COMPONENTS: "angle"
+
+.container-builds-arm64:
+  extends:
+    - .container-builds-angle
+  variables:
+    CI_BUILD_COMPONENTS: "angle"
+
 .use-base-image:
   extends:
     - .container
@@ -177,6 +203,7 @@ debian/s390x_build:
 debian/android_build:
   extends:
     - .android-variables
+    - .container-builds-android
     - .use-debian/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
@@ -460,7 +487,9 @@ debian/arm32_test-vk:
 debian/arm64_test-gl:
   tags:
     - aarch64
-  extends: .use-debian/arm64_test-base
+  extends:
+    - .use-debian/arm64_test-base
+    - .container-builds-arm64
   variables:
     MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG}
 
@@ -532,6 +561,7 @@ kernel+rootfs_x86_64:
     - .use-debian/x86_64_build-base
     - .kernel+rootfs
     - .firmware_x86_64
+    - .container-builds-x86_64
   image: "$FDO_BASE_IMAGE"
   variables:
     DEBIAN_ARCH: "amd64"
@@ -543,6 +573,7 @@ kernel+rootfs_arm64:
     - .use-debian/arm64_build
     - .kernel+rootfs
     - .firmware_arm64
+    - .container-builds-arm64
   tags:
     - aarch64
   variables:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 122e1ecb4c7..16a96d2df0d 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -40,7 +40,7 @@ variables:
    DEBIAN_TEST_ANDROID_TAG: "20250217-wrappers"
    DEBIAN_TEST_GL_TAG: "20250223-way-prot"
    DEBIAN_TEST_VK_TAG: "20250223-way-prot"
-   KERNEL_ROOTFS_TAG: "20250215-tag-file"
+   KERNEL_ROOTFS_TAG: "20250215-buildtags"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"