diff --git a/.mergify.yml b/.mergify.yml
index 30abd30f..a4cf27a5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,6 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=main
       - status-success=build (3.10)
       - status-success=build (3.11)
@@ -8,10 +8,7 @@ queue_rules:
       - approved-reviews-by=@sgkit-dev/committers
       - "#approved-reviews-by>=1"
       - label=auto-merge
-
-pull_request_rules:
-  - name: automatic merge
-    conditions:
+    merge_conditions:
       - base=main
       - status-success=build (3.10)
       - status-success=build (3.11)
@@ -19,10 +16,9 @@ pull_request_rules:
       - approved-reviews-by=@sgkit-dev/committers
       - "#approved-reviews-by>=1"
       - label=auto-merge
-    actions:
-      queue:
-        name: default
-        method: rebase
+    merge_method: rebase
+
+pull_request_rules:
   - name: deleting merged branch
     conditions:
       - merged
@@ -44,3 +40,7 @@ pull_request_rules:
       label:
         remove:
           - conflict
+  - name: automatic merge
+    conditions: []
+    actions:
+      queue: