diff --git a/.mergify.yml b/.mergify.yml
index 79074c39a77..53cac489ef2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -27,7 +27,6 @@ pull_request_rules:
   # From needs: review to needs: work - reviewers request
   - name: "label needs: work when changes were requested"
     conditions:
-      - base~=feature-mergify
       # Reviewers
       - "#changes-requested-reviews-by>0"
     actions:
@@ -36,11 +35,11 @@ pull_request_rules:
           - "needs: work"
         remove: 
           - "needs: review"
+          - "needs: CI"
 
   # From needs: review to needs: work - CI failure
   - name: "label needs: work when travis-ci failed"
     conditions:
-      - base~=feature-mergify
       # Travis failing
       - status-failure~=continuous-integration/travis-ci/pr
     actions:
@@ -49,11 +48,11 @@ pull_request_rules:
           - "needs: work"
         remove: 
           - "needs: review"
+          - "needs: CI"
 
   # From needs: review to needs: work - CI failure
   - name: "label needs: work when Jenkins CI failed - pr head"
     conditions:
-      - base~=feature-mergify
       # Jenkins CI failing
       - status-failure~=continuous-integration/jenkins/pr-head
     actions:
@@ -62,11 +61,11 @@ pull_request_rules:
           - "needs: work"
         remove: 
           - "needs: review"
+          - "needs: CI"
 
   # From needs: review to needs: work - CI failure
   - name: "label needs: work when Jenkins CI failed - any of the pipeline"
     conditions:
-      - base~=feature-mergify
       # Jenkins CI failing - any of the pipeline
       - status-failure~=^jenkins-ci
     actions:
@@ -75,11 +74,11 @@ pull_request_rules:
           - "needs: work"
         remove: 
           - "needs: review"
+          - "needs: CI"
 
   # From needs: review or needs: work to needs: CI. One approval means we should be good to start CI
   - name: "label needs: CI when at least one reviewers approval"
     conditions:
-      - base~=feature-mergify
       # Labels
       - "label!=needs: preceding PR"
 
@@ -100,10 +99,18 @@ pull_request_rules:
           - "needs: review"
           - "needs: work"
 
+  # Remove reviews after the branch is updated. This yet does not allow
+  # any other action like labels, etc. See mergify-engine/issues/360
+  - name: remove outdated reviews
+    conditions: []
+    actions:
+      dismiss_reviews:
+        approved: True
+        changes_requested: True
+
   # Conflict in the PR - needs: work and a comment to notify a user
   - name: "label needs: work when there is a conflict"
     conditions:
-      - base~=feature-mergify
       - conflict
     actions:
       label:
@@ -117,7 +124,6 @@ pull_request_rules:
 
   - name: "add label feature branch for feature branch additions"
     conditions:
-      - base~=feature-mergify
       - base~=^feature
     actions:
       label:
@@ -127,7 +133,6 @@ pull_request_rules:
   # Ready for integration. Not yet auto merge, will be enabled once carefuly tested
   - name: label "ready for merge" when ready
     conditions:
-      - base~=feature-mergify
       # Labels
       - "label!=do not merge"
       - "label=needs: CI"
@@ -152,7 +157,6 @@ pull_request_rules:
   # Clean-up after merge
   - name: remove ready for merge when merged
     conditions:
-      - base~=feature-mergify
       - merged
       - "label=ready for merge"
     actions:
@@ -162,7 +166,6 @@ pull_request_rules:
 
   - name: add "do not merge" label when WIP is in title
     conditions:
-       - base~=feature-mergify
        - title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
     actions:
       label:
@@ -172,7 +175,6 @@ pull_request_rules:
   # Check if version label is applied
   - name: release version is a must for merged PRs
     conditions:
-      - base~=feature-mergify
       - merged
       - -label~=^(release-version)
     actions: