diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5399477ab04..f35a8c19f84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,7 +234,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
+    - !reference [.disable-farm-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Only rebuild containers in merge pipelines if any tags have been
@@ -284,7 +284,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
+    - !reference [.disable-farm-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Build everything in merge pipelines, if any files affecting the pipeline
@@ -343,7 +343,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
+    - !reference [.disable-farm-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Build everything in merge pipelines, if any files affecting the pipeline
diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
index c277b3dec20..ec98e930a49 100644
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -336,54 +336,41 @@
 
 # Skip container & build jobs when disabling any farm, and run them if any
 # farm gets re-enabled.
-# Only apply these rules in MR context, because otherwise we get a false
-# positive on files being 'created' when pushing to a new branch, and break
-# our pipeline
-.disable-farm-mr-rules:
+.disable-farm-rules:
   rules:
     # changes(disabled) + exists(disabled) = disabling the farm
     # Note: this cannot be simplified into a single `.ci-farms-disabled/*` rule
     # because if there are more than one disabled farm and we only re-enable
     # one, the exits(.ci-farms-disabled/*) would match and what should be
     # a farm re-enable pipeline will be detected as a farm disable pipeline.
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/microsoft ]
+    - changes: [ .ci-farms-disabled/microsoft ]
       exists: [ .ci-farms-disabled/microsoft ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/collabora ]
+    - changes: [ .ci-farms-disabled/collabora ]
       exists: [ .ci-farms-disabled/collabora ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/igalia ]
+    - changes: [ .ci-farms-disabled/igalia ]
       exists: [ .ci-farms-disabled/igalia ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/lima ]
+    - changes: [ .ci-farms-disabled/lima ]
       exists: [ .ci-farms-disabled/lima ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/anholt ]
+    - changes: [ .ci-farms-disabled/anholt ]
       exists: [ .ci-farms-disabled/anholt ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/valve-mupuf ]
+    - changes: [ .ci-farms-disabled/valve-mupuf ]
       exists: [ .ci-farms-disabled/valve-mupuf ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/valve-kws ]
+    - changes: [ .ci-farms-disabled/valve-kws ]
       exists: [ .ci-farms-disabled/valve-kws ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/austriancoder ]
+    - changes: [ .ci-farms-disabled/austriancoder ]
       exists: [ .ci-farms-disabled/austriancoder ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/ondracka ]
+    - changes: [ .ci-farms-disabled/ondracka ]
       exists: [ .ci-farms-disabled/ondracka ]
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/vmware ]
+    - changes: [ .ci-farms-disabled/vmware ]
       exists: [ .ci-farms-disabled/vmware ]
       when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'