diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6d1f6de4e5aea20725b6d1727d265fb2f044e5b..b36c59ebf4235d88ce435f9cba502a1729a0a530 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -428,7 +428,6 @@ stages:
   needs: []
   timeout: "4 minutes"
   tags:
-    # TODO: set up ivas-basop-windows runners
     - ivas-windows
 
 # template for test jobs on linux that need the TESTV_DIR
@@ -1004,11 +1003,19 @@ build-codec-sanitizers-linux:
     - *activate-Werror-linux
     - bash ci/build_codec_sanitizers_linux.sh
 
-    # TODO: reactivate once windows runners are available in BASOP project
-.build-codec-windows-msbuild:
+build-codec-windows-msbuild:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web'
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # trigger build job for all MRs
+    - if: $CI_PIPELINE_SOURCE == 'schedule'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
   extends:
     - .build-job-windows
-    - .rules-basis
+  timeout: "7 minutes"
+  tags:
+    - ivas-windows    
   script:
     - *print-common-info-windows
     - *activate-WX-windows