diff --git a/.mergify.yml b/.mergify.yml
index e23d66ce..14f01d8c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,13 +1,6 @@
 queue_rules:
-  - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - status-success=Run Unit Tests
-      - status-success=Semantic Pull Request
-
-pull_request_rules:
-  - name: Automatically merge on CI success and review approval
-    conditions:
+  - name: duplicated default from Automatically merge on CI success and review approval
+    queue_conditions:
       - base~=main|integ-tests
       - "#approved-reviews-by>=1"
       - approved-reviews-by=@aws-actions/aws-ecr
@@ -19,11 +12,28 @@ pull_request_rules:
       - -merged
       - -closed
       - author!=dependabot[bot]
-    actions:
-      queue:
-        method: squash
-        name: default
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+    merge_method: squash
+  - name: duplicated default from Automatically approve and merge Dependabot PRs
+    queue_conditions:
+      - base=main
+      - author=dependabot[bot]
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge)
+      - -merged
+      - -closed
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+    merge_method: squash
 
+pull_request_rules:
   - name: Automatically approve and merge Dependabot PRs
     conditions:
       - base=main
@@ -37,6 +47,8 @@ pull_request_rules:
     actions:
       review:
         type: APPROVE
+  - name: Automatically approve and merge Dependabot PRs + Automatically merge on
+      CI success and review approval
+    conditions: []
+    actions:
       queue:
-        method: squash
-        name: default