diff --git a/.github/mergify.yml b/.github/mergify.yml
index 51f0a018a..292defc72 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,21 +1,21 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - check-success=all
       - label=automerge
       - base=main
       - "#changes-requested-reviews-by=0"
       - "#approved-reviews-by>=1"
-
-pull_request_rules:
-  - name: automatic merge when CI passes on main
-    conditions:
+    merge_conditions:
       - check-success=all
       - label=automerge
       - base=main
       - "#changes-requested-reviews-by=0"
       - "#approved-reviews-by>=1"
+    merge_method: merge
+
+pull_request_rules:
+  - name: automatic merge when CI passes on main
+    conditions: []
     actions:
       queue:
-        name: default
-        method: merge