diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e167c3ea27..f221cce8090 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -306,6 +306,7 @@ x86_build-base:
   variables:
     MESA_BASE_IMAGE: "debian/x86_build-base"
     MESA_BASE_TAG: *x86_build-base
+    MESA_ARTIFACTS_BASE_TAG: *x86_build-base
   needs:
     - x86_build-base
 
@@ -438,6 +439,7 @@ arm_build:
   variables:
     MESA_IMAGE_PATH: "debian/arm_build"
     MESA_IMAGE_TAG: *arm_build
+    MESA_ARTIFACTS_TAG: *arm_build
   needs:
     - arm_build
 
@@ -449,7 +451,7 @@ arm_build:
     GIT_STRATEGY: fetch
     KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-2a4a4fa4407f/v5.13-rc2-for-mesa-ci-2a4a4fa4407f.tar.bz2"
     MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-21-panfrost-oops"
-    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
 
@@ -460,7 +462,7 @@ kernel+rootfs_amd64:
   image: "$FDO_BASE_IMAGE"
   variables:
     DEBIAN_ARCH: "amd64"
-    DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
 
 kernel+rootfs_arm64:
   extends:
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 6983ce7a2bb..e919a50bdbd 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -98,7 +98,7 @@
     TEST_SUITE: "deqp"
     LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
-    - .use-x86_build-base # for same $MESA_BASE_TAG as in kernel+rootfs_amd64
+    - .use-x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
     - .use-arm_build # ARM because it must match the architecture of the runner
     - .lava-test
     - .use-kernel+rootfs-amd64