diff --git a/.github/mergify.yml b/.github/mergify.yml
index af151c5a..8d1b4214 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,13 +1,6 @@
 queue_rules:
   - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=lint-test
-      - check-success=build
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
+    queue_conditions:
       - base=main
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
@@ -15,10 +8,16 @@ pull_request_rules:
       - check-success='build'
       - label!=do-not-merge
       - label=ready-to-merge
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success=lint-test
+      - check-success=build
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+    merge_method: merge
+
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-