diff --git a/.mergify.yml b/.mergify.yml
index 39d8118..204197c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,8 +2,16 @@
 
 queue_rules:
   - name: default
-    update_method: merge
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - -label~=(do-not-merge)
+      - status-success=build
+      - status-success=package-js
+      - status-success=package-java
+      - status-success=package-python
+      - status-success=package-dotnet
+      - status-success=package-go
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)
       - status-success=build
@@ -12,17 +20,18 @@ queue_rules:
       - status-success=package-python
       - status-success=package-dotnet
       - status-success=package-go
+    update_method: merge
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+
 pull_request_rules:
   - name: Automatic merge on approval and successful build
     actions:
       delete_head_branch: {}
       queue:
-        method: squash
-        name: default
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
     conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)