diff --git a/.mergify.yml b/.mergify.yml
index 6fbd703a..7702fabd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,15 +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
-    merge_conditions:
+    update_method: merge
+    conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)
       - status-success=build
@@ -18,18 +11,18 @@ queue_rules:
       - status-success=package-java
       - status-success=package-python
       - status-success=package-dotnet
-    update_method: merge
-    merge_method: merge
+    merge_method: squash
     commit_message_template: |-
       {{ title }} (#{{ number }})
 
       {{ body }}
-
 pull_request_rules:
   - name: Automatic merge on approval and successful build
     actions:
       delete_head_branch: {}
       queue:
+        name: default
+        method: merge
     conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)