diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5b078e8b0d0d84172d254b007fb0e61d33bb336..b0baf4e1f2ca7f11c797de5da051de5003aaf5ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,8 +57,8 @@ workflow:
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
       when: never
     # do not spawn pipelines for Draft MRs, see https://docs.gitlab.com/ee/ci/yaml/workflow.html#skip-pipelines-for-draft-merge-requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
-      when: never
+    # - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
+    #   when: never
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       variables:
         IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
@@ -427,7 +427,8 @@ stages:
   needs: []
   timeout: "4 minutes"
   tags:
-    - ivas-windows
+    # TODO: set up ivas-basop-windows runners
+    - test-dolby-windows-runner
 
 # template for test jobs on linux that need the TESTV_DIR
 .test-job-linux-needs-testv-dir:
@@ -1014,7 +1015,7 @@ build-codec-windows-msbuild:
     - .build-job-windows
   timeout: "7 minutes"
   tags:
-    - ivas-windows    
+    - test-dolby-windows-runner
   script:
     - *print-common-info-windows
     - *activate-WX-windows