diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 585e4474c17..888d7386316 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -181,11 +181,7 @@
   # built as part of the CI in the boot2container project.
   image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
   extends:
-    # Only pull in what is needed to build up the MESA_IMAGE (which is
-    # called for clarity IMAGE_UNDER_TEST). This is in distinction to
-    # the image within which the job runs on the runner machines. The
-    # IMAGE_UNDER_TEST is deployed to the DUTs.
-    - .incorporate-base-tag+templates-commit
+    - .use-debian/x86_test-vk
   variables:
     # No need by default to pull the whole repo
     GIT_STRATEGY: none
@@ -206,8 +202,11 @@
     B2C_TIMEOUT_OVERALL_MINUTES: 240
     B2C_TIMEOUT_RETRIES: 0
 
-    MESA_IMAGE_PATH: "debian/x86_test-vk"
-    IMAGE_UNDER_TEST: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
+    # As noted in the top description, we make a distinction between the
+    # container used by gitlab-runner to queue the work, and the container
+    # used by the DUTs/test machines. To make this distinction quite clear,
+    # we rename the MESA_IMAGE variable into IMAGE_UNDER_TEST.
+    IMAGE_UNDER_TEST: "$MESA_IMAGE"
 
     INSTALL_TARBALL: "./artifacts/install.tar"
     CI_VALVE_ARTIFACTS: "./artifacts/valve"