diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 8bd8ceb6a21..b70dd020d8c 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -35,12 +35,9 @@
     - !reference [default, after_script]
 
 .build-windows:
-  extends: .build-common
-  tags:
-    - windows
-    - docker
-    - "2022"
-    - mesa
+  extends:
+    - .build-common
+    - .windows-docker-tags
   cache:
     key: ${CI_JOB_NAME}
     paths:
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 545404a9070..aa2d01e0cc1 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -447,17 +447,13 @@ debian/arm64_test:
   extends:
     - .container
     - .windows-docker-vs2019
+    - .windows-shell-tags
   rules:
     - !reference [.microsoft-farm-container-rules, rules]
     - !reference [.container-rules, rules]
   variables:
     GIT_STRATEGY: fetch # we do actually need the full repository though
     MESA_BASE_IMAGE: None
-  tags:
-    - windows
-    - shell
-    - "2022"
-    - mesa
   script:
     - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
 
diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index b4e7ae3dcad..bb4fe1c31ea 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -1,3 +1,18 @@
+.windows-docker-tags:
+  tags:
+    - windows
+    - docker
+    - "2022"
+    - mesa
+
+.windows-shell-tags:
+  tags:
+    - windows
+    - shell
+    - "2022"
+    - mesa
+
+
 # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
 # rules duplication manually
 .windows-build-rules: