diff --git a/.mergify.yml b/.mergify.yml
index 90204e1003..7de69c2f62 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,6 +8,7 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
+    autosquash: true   
 
   - name: backport-0.46-queue
     batch_size: 3
@@ -15,24 +16,24 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = maint-0.46
     merge_method: merge
+    autosquash: true   
 
 pull_request_rules:
   - name: automatic merge to main or backport branch
     conditions:
-        - label = "merge"
-        - label != "do-not-merge"
-        - "#approved-reviews-by >= 1"
-        - or:
-          - base = main
-          - base = maint-0.46
+      - label = "merge"
+      - label != "do-not-merge"
+      - "#approved-reviews-by >= 1"
+      - or:
+        - base = main
+        - base = maint-0.46
     actions:
       queue:
-        autosquash: true   
 
   - name: notify when a PR is removed from the queue
     conditions:
-    - queue-dequeue-reason != none
-    - queue-dequeue-reason != pr-merged
+      - queue-dequeue-reason != none
+      - queue-dequeue-reason != pr-merged
     actions:
       comment:
         message: >