diff --git a/.mergify.yml b/.mergify.yml
index 4e02cf0..57be4c9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,26 +1,22 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "-merged"
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
+      - base=main
+      - label=AUTOMERGE-REQUESTED
       - status-success=Lint
       - "status-success=ci/circleci: build"
-pull_request_rules:
-  - name: Automatic rebase, CI and merge
-    conditions:
-      - "-merged"
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
-      - base=main
-      - label=AUTOMERGE-REQUESTED
       - status-success=Lint
       - "status-success=ci/circleci: build"
-    actions:
-      queue:
-        name: default
-        method: rebase
-        update_method: rebase
+    update_method: rebase
+    merge_method: rebase
 
+pull_request_rules:
   - name: Remove label after merge
     conditions:
       - merged
@@ -29,3 +25,7 @@ pull_request_rules:
       label:
         remove:
           - AUTOMERGE-REQUESTED
+  - name: Automatic rebase, CI and merge
+    conditions: []
+    actions:
+      queue: