diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c874aafb04..cfff8e07ff0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -503,9 +503,10 @@ arm_test:
   extends:
     - .set-image
   variables:
+    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
     MESA_IMAGE_PATH: "windows/x64_build"
     MESA_IMAGE_TAG: "2021-03-15-tls"
-    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
 
 windows_build_vs2019:
   extends: