diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ba6ff4..726ed8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,10 @@ variables:
 build_windows:
   stage: build
   tags:
+    - saas-windows-medium-amd64
     - shared-windows
+    - windows
+    - windows-1809
   script:
     - dotnet --info
     - dotnet restore
@@ -35,7 +38,10 @@ build_windows:
 publish_release:
   stage: publish
   tags:
+    - saas-windows-medium-amd64
     - shared-windows
+    - windows
+    - windows-1809
   needs:
     - build_windows
   script: