diff --git a/.gitlab/container_build/docker_windows_agent7.yml b/.gitlab/container_build/docker_windows_agent7.yml
index 4a3c9393d5ba15..30f5561772eace 100644
--- a/.gitlab/container_build/docker_windows_agent7.yml
+++ b/.gitlab/container_build/docker_windows_agent7.yml
@@ -2,7 +2,7 @@
 docker_build_agent7_windows1809:
   extends:
     - .docker_build_agent7_windows_common
-  tags: ["runner:windows-docker", "windowsversion:1809"]
+    - .windows_docker_2019
   variables:
     VARIANT: 1809
     TAG_SUFFIX: -7
@@ -11,7 +11,7 @@ docker_build_agent7_windows1809:
 docker_build_agent7_windows1809_jmx:
   extends:
     - .docker_build_agent7_windows_common
-  tags: ["runner:windows-docker", "windowsversion:1809"]
+    - .windows_docker_2019
   variables:
     VARIANT: 1809
     TAG_SUFFIX: -7-jmx
@@ -20,7 +20,7 @@ docker_build_agent7_windows1809_jmx:
 docker_build_agent7_windows2022_jmx:
   extends:
     - .docker_build_agent7_windows_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: -7-jmx
@@ -29,7 +29,7 @@ docker_build_agent7_windows2022_jmx:
 docker_build_agent7_windows2022:
   extends:
     - .docker_build_agent7_windows_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: "-7"
@@ -38,7 +38,7 @@ docker_build_agent7_windows2022:
 docker_build_agent7_windows1809_core:
   extends:
     - .docker_build_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:1809"]
+    - .windows_docker_2019
   variables:
     VARIANT: 1809
     TAG_SUFFIX: -7
@@ -47,7 +47,7 @@ docker_build_agent7_windows1809_core:
 docker_build_agent7_windows1809_core_jmx:
   extends:
     - .docker_build_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:1809"]
+    - .windows_docker_2019
   variables:
     VARIANT: 1809
     TAG_SUFFIX: -7-jmx
@@ -56,7 +56,7 @@ docker_build_agent7_windows1809_core_jmx:
 docker_build_agent7_windows2022_core:
   extends:
     - .docker_build_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: "-7"
@@ -65,7 +65,7 @@ docker_build_agent7_windows2022_core:
 docker_build_agent7_windows2022_core_jmx:
   extends:
     - .docker_build_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: -7-jmx
@@ -74,7 +74,7 @@ docker_build_agent7_windows2022_core_jmx:
 docker_build_fips_agent7_windows2022_core:
   extends:
     - .docker_build_fips_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: "-7-fips"
@@ -83,7 +83,7 @@ docker_build_fips_agent7_windows2022_core:
 docker_build_fips_agent7_windows2022_core_jmx:
   extends:
     - .docker_build_fips_agent7_windows_servercore_common
-  tags: ["runner:windows-docker", "windowsversion:2022"]
+    - .windows_docker_2022
   variables:
     VARIANT: ltsc2022
     TAG_SUFFIX: -7-fips-jmx