diff --git a/.mergify.yml b/.mergify.yml
index 33b4df7e..04dbda78 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,17 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>1"
+      - label=automerge
+    merge_conditions:
       - base~=cosmos/
+    commit_message_template: >
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
 
 pull_request_rules:
-  - name: automerge with label automerge and branch protection passing
-    conditions:
-      - "#approved-reviews-by>1"
-      - label=automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: >
-          {{ title }} (#{{ number }})
-          
-          {{ body }}
   - name: backport patches to v0.47.x branch
     conditions:
       - base=cosmos/v0.50.x
@@ -23,4 +19,8 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - cosmos/v0.47.x
\ No newline at end of file
+          - cosmos/v0.47.x
+  - name: automerge with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue: