diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 722782c38fd..f920ef4eb56 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -40,7 +40,7 @@
 # repository's container registry, so that the image from the main
 # repository's registry will be used there as well.
 
-.debian-container:
+.debian-container-version:
   variables:
     FDO_DISTRIBUTION_VERSION: bookworm-slim
 
@@ -65,7 +65,7 @@ debian/x86_64_build-base:
   extends:
     - .fdo.container-build@debian
     - .container
-    - .debian-container
+    - .debian-container-version
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
   rules:
@@ -76,7 +76,7 @@ debian/x86_64_build-base:
 .use-debian/x86_64_build-base:
   extends:
     - .fdo.container-build@debian
-    - .debian-container
+    - .debian-container-version
     - .use-base-image
   variables:
     MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
@@ -185,7 +185,7 @@ debian/x86_64_test-base:
 .use-debian/x86_64_test-base:
   extends:
     - .fdo.container-build@debian
-    - .debian-container
+    - .debian-container-version
     - .use-base-image
   variables:
     MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
@@ -247,7 +247,7 @@ debian/arm64_build:
   extends:
     - .fdo.container-build@debian
     - .container
-    - .debian-container
+    - .debian-container-version
   tags:
     - aarch64
   variables:
@@ -318,7 +318,7 @@ fedora/x86_64_build:
 .kernel+rootfs:
   extends:
     - .container+build-rules
-    - .debian-container
+    - .debian-container-version
   stage: container
   variables:
     GIT_STRATEGY: fetch
@@ -367,7 +367,7 @@ kernel+rootfs_arm32:
   extends:
     - .fdo.container-build@debian
     - .container
-    - .debian-container
+    - .debian-container-version
     # Don't want the .container rules
     - .container+build-rules
   variables: