diff --git a/.mergify.yml b/.mergify.yml
index b160cf7f..39d81185 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,16 +2,8 @@
 
 queue_rules:
   - name: default
-    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:
+    update_method: merge
+    conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)
       - status-success=build
@@ -20,17 +12,17 @@ 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)
@@ -40,7 +32,3 @@ pull_request_rules:
       - status-success=package-python
       - status-success=package-dotnet
       - status-success=package-go
-  - name: Automatic merge on approval and successful build
-    conditions: []
-    actions:
-      queue: