diff --git a/.mergify.yml b/.mergify.yml
index 7b4fca9..e8fca0c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,33 +1,29 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=master
-      - status-success="validate commits"
-      - status-success="ubuntu"
-      - status-success="macos"
-      - status-success="coverage"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - "approved-reviews-by=@chaos/chaos-developers"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~=^\[*[Ww][Ii][Pp]
- 
-pull_request_rules:
-  - name: rebase and merge when passing all checks
-    conditions:
+    merge_conditions:
       - base=master
+      - status-success="validate commits"
+      - status-success="ubuntu"
+      - status-success="macos"
+      - status-success="coverage"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - "approved-reviews-by=@chaos/chaos-developers"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~=^\[*[Ww][Ii][Pp]
-    actions:
-      queue:
-        name: default
-        method: merge
-        update_method: rebase
+    update_method: rebase
+    merge_method: merge
+
+pull_request_rules:
   - name: remove outdated approved reviews
     conditions:
       - author!=@chaos-developers
@@ -38,3 +34,7 @@ pull_request_rules:
         message: |
           Approving reviews have been dismissed because this pull request
           was updated.
+  - name: rebase and merge when passing all checks
+    conditions: []
+    actions:
+      queue: