diff --git a/.github/mergify.yml b/.github/mergify.yml
index 5a7068a2..c1e10fc8 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -6,22 +6,18 @@ defaults:
 
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>=1"
-
-pull_request_rules:
-  - name: automerge to the base branch with label automerge and branch protection passing
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - base=v21.x
       - label=A:automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+    merge_conditions:
+      - "#approved-reviews-by>=1"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_method: squash
+
+pull_request_rules:
   - name: backport patches to osmosis-main branch
     conditions:
       - base=v22.x
@@ -62,3 +58,8 @@ pull_request_rules:
       backport:
         branches:
           - v25.x
+  - name: automerge to the base branch with label automerge and branch protection
+      passing
+    conditions: []
+    actions:
+      queue: