diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 63d4e412420..ff898a46488 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -63,64 +63,52 @@
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/container_job_trampoline.sh "${CI_JOB_NAME}"'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
+    CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT"
 
 .container-builds-angle:
   variables:
     ANGLE_TAG: "${CONDITIONAL_BUILD_ANGLE_TAG}"
+    CI_BUILD_COMPONENTS_ANGLE: angle
 
 .container-builds-crosvm:
   variables:
     CROSVM_TAG: "${CONDITIONAL_BUILD_CROSVM_TAG}"
+    CI_BUILD_COMPONENTS_CROSVM: crosvm
 
 .container-builds-fluster:
   variables:
     FLUSTER_TAG: "${CONDITIONAL_BUILD_FLUSTER_TAG}"
+    CI_BUILD_COMPONENTS_FLUSTER: fluster
 
 .container-builds-piglit:
   variables:
     PIGLIT_TAG: "${CONDITIONAL_BUILD_PIGLIT_TAG}"
+    CI_BUILD_COMPONENTS_PIGLIT: piglit
 
 .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-base:
-  extends:
-    - .container-builds-crosvm
-  variables:
-    CI_BUILD_COMPONENTS: "crosvm"
-
-.container-builds-video:
-  extends:
-    - .container-builds-fluster
-  variables:
-    CI_BUILD_COMPONENTS: "fluster"
-
-.container-builds-x86_64:
-  extends:
-    - .container-builds-angle
-    - .container-builds-piglit
-  variables:
-    CI_BUILD_COMPONENTS: "angle piglit"
 
 .container-builds-arm32:
   extends:
     - .container-builds-piglit
-  variables:
-    CI_BUILD_COMPONENTS: "piglit"
 
-.container-builds-arm64:
+.container-builds-base:
+  extends:
+    - .container-builds-crosvm
+
+.container-builds-gl:
   extends:
     - .container-builds-angle
     - .container-builds-piglit
-  variables:
-    CI_BUILD_COMPONENTS: "angle piglit"
+
+.container-builds-video:
+  extends:
+    - .container-builds-fluster
+
+.container-builds-vk:
+  extends:
+    - .container-builds-piglit
 
 # Export the container rootfs and upload it to S3
 .export-container:
@@ -449,7 +437,7 @@ debian/arm64_test-base:
 debian/x86_64_test-gl:
   extends:
     - .use-debian/x86_64_test-base
-    - .container-builds-x86_64
+    - .container-builds-gl
     - .export-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG}
@@ -471,7 +459,7 @@ debian/x86_64_test-gl:
 debian/x86_64_test-vk:
   extends:
     - .use-debian/x86_64_test-base
-    - .container-builds-x86_64
+    - .container-builds-vk
     - .export-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG}
@@ -607,7 +595,7 @@ debian/arm64_test-gl:
     - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
   extends:
     - .use-debian/arm64_test-base
-    - .container-builds-arm64
+    - .container-builds-gl
     - .export-container
   variables:
     MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG}
@@ -631,7 +619,7 @@ debian/arm64_test-vk:
     - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
   extends:
     - .use-debian/arm64_test-base
-    - .container-builds-arm64
+    - .container-builds-vk
     - .export-container
   variables:
     MESA_IMAGE_TAG: &debian-arm64_test-vk ${DEBIAN_TEST_VK_TAG}