diff --git a/.mergify.yml b/.mergify.yml
index 10df2e73..9fa098ed 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,5 +1,67 @@
 # https://blog.mergify.com/strict-mode-deprecation/
 queue_rules:
+  - name: duplicated default from Merge owner PR when all checks passed
+    queue_conditions:
+      - author=puremourning
+      - base=master
+      - status-success=code-review/reviewable
+      - "#changes-requested-reviews-by=0"
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
+  - name: duplicated default from Merge auto pr when approved
+    queue_conditions:
+      - author=VimspectorUpdateBot
+      - label=auto
+      - base=master
+      - status-success=code-review/reviewable
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
+  - name: duplicated default from Merge PR when all checks passed
+    queue_conditions:
+      - author!=puremourning
+      - base=master
+      - status-success=code-review/reviewable
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - approved-reviews-by=puremourning
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
   - name: default
     # These define the conditions to get out of the merge queue
     conditions:
@@ -11,6 +73,7 @@ queue_rules:
       - status-success=MacOS (vim)
       #- status-success=MacOS (nvim)
 
+
 pull_request_rules:
   - name: Merge owner PR when all checks passed
     # These define the conditions to get into the merge queue
@@ -28,11 +91,7 @@ pull_request_rules:
       - status-success=MacOS (vim)
       #- status-success=MacOS (nvim)
     actions: &merge-actions
-      queue:
-        method: merge
-        name: default
       delete_head_branch: {}
-
   - name: Merge auto pr when approved
     conditions:
       - author=VimspectorUpdateBot
@@ -44,7 +103,6 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
     actions:
       <<: *merge-actions
-
   - name: Merge PR when all checks passed
     # These define the conditions to get into the merge queue
     conditions:
@@ -66,3 +124,8 @@ pull_request_rules:
       <<: *merge-actions
       comment:
         message: Thanks for sending a PR!
+  - name: Merge PR when all checks passed + Merge auto pr when approved + Merge owner
+      PR when all checks passed
+    conditions: []
+    actions:
+      queue: