diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
index 12510a4c8d5..24e6c2dc8af 100644
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -29,7 +29,7 @@
       when: never
     - changes: [ .ci-farms-disabled/microsoft ]
       if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: manual
+      when: on_success
     - !reference [.microsoft-farm-rules, rules]
 
 
diff --git a/.pick_status.json b/.pick_status.json
index 7d1cd8e58dc..a3ef5fe8009 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1404,7 +1404,7 @@
         "description": "ci/microsoft: when re-enabling Windows Farm, always run the container",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d3b6635663f71ef65230ea4a8b321a22a64a9e26",
         "notes": null