diff --git a/.github/mergify.yml b/.github/mergify.yml
index 9abee09505ac..30bcf5f1ffeb 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,37 +1,31 @@
 queue_rules:
   - name: default
     queue_conditions:
-      # general prerequisits fo accept the PR in the queue
-      - label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
-      - label!=🤖-do-not-merge # block Mergify from merging the PR (added manually)
+      - label=🤖-automerge
+      - label!=🤖-do-not-merge
       - base=master
-      - -draft # PR is not in draft state
-      - -conflict # No merge conflicts
-
-      # Check for required reviews
-      - "#approved-reviews-by>=2" # Requires 2 approving reviews
-      - "#changes-requested-reviews-by=0" # No changes requested
-      - "#review-threads-unresolved=0" # All review threads resolved
-
+      - -draft
+      - -conflict
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - "#review-threads-unresolved=0"
     merge_conditions:
-      # list of CI checks that need to pass
       - check-success=unit-tests
       - check-success=integration-tests
       - check-success=system-tests
-
+    branch_protection_injection_mode: merge
 pull_request_rules:
   - name: update branch if behind master
     conditions:
-      - queue-name=default # only run if already queued
+      - queue-name=default
       - label=🤖-automerge
       - label!=🤖-do-not-merge
       - base=master
     actions:
       update:
-
   - name: retry CI on fails (used for flaky tests)
     conditions:
-      - queue-name=default # only run if already queued
+      - queue-name=default
       - label=🤖-automerge
       - label!=🤖-do-not-merge
       - base=master