diff --git a/.github/mergify.yml b/.github/mergify.yml
index 74f285949d7..8f28c83fb50 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,22 +1,18 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=main
       - label=automerge
-
-pull_request_rules:
-  - name: Automerge to main
-    conditions:
+    merge_conditions:
       - base=main
       - label=automerge
-    actions:
-      queue:
-        method: squash
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
+    merge_method: squash
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+
+      {{ body }}
 
-          {{ body }}
+pull_request_rules:
   - name: backport patches to v0.37.x branch
     conditions:
       - base=main
@@ -33,3 +29,7 @@ pull_request_rules:
       backport:
         branches:
           - v0.34.x
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: