diff --git a/.mergify.yml b/.mergify.yml
index db7af58c..df24a63d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,22 @@
 queue_rules:
-  - name: default
-    conditions:
+  - name: duplicated default from Automatic merge on approval
+    queue_conditions:
+      - -files~=^noggin/security/
+      - label!=WIP
+      - -draft
+      - approved-reviews-by=@fedora-infra/authdev
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - status-success=DCO
+      - status-success=Misc tests (lint)
+      - status-success=Misc tests (format)
+      - status-success=Misc tests (security)
+      - status-success=Misc tests (docs)
+      - status-success=Unit tests (py39-unittest)
+      - status-success=Unit tests (py310-unittest)
+      - status-success=Integration tests (3.9)
+      - status-success=Integration tests (3.10)
+    merge_conditions:
       # Conditions to get out of the queue (= merged)
       - status-success=Misc tests (lint)
       - status-success=Misc tests (format)
@@ -11,23 +27,28 @@ queue_rules:
       - status-success=Unit tests (py310-unittest)
       - status-success=Integration tests (3.9)
       - status-success=Integration tests (3.10)
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    actions:
-      queue:
-        name: default
-        method: rebase
-    conditions:
-      - -files~=^noggin/security/
+    merge_method: rebase
+  - name: duplicated default from Sensitive files
+    queue_conditions:
+      - files~=^noggin/security/
       - label!=WIP
       - -draft
       - approved-reviews-by=@fedora-infra/authdev
-      - "#approved-reviews-by>=1"
+      - "#approved-reviews-by>=2"
       - "#changes-requested-reviews-by=0"
       - status-success=DCO
       - status-success=Misc tests (lint)
       - status-success=Misc tests (format)
+      - status-success=Misc tests (security)
+      - status-success=Misc tests (docs)
+      - status-success=Unit tests (py39-unittest)
+      - status-success=Unit tests (py310-unittest)
+      - status-success=Integration tests (3.9)
+      - status-success=Integration tests (3.10)
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - status-success=Misc tests (lint)
+      - status-success=Misc tests (format)
       # - status-success=Misc tests (licenses)
       - status-success=Misc tests (security)
       - status-success=Misc tests (docs)
@@ -35,20 +56,10 @@ pull_request_rules:
       - status-success=Unit tests (py310-unittest)
       - status-success=Integration tests (3.9)
       - status-success=Integration tests (3.10)
-
-  - name: Sensitive files
-    actions:
-      queue:
-        name: default
-        method: rebase
+    merge_method: rebase
+  - name: default
     conditions:
-      - files~=^noggin/security/
-      - label!=WIP
-      - -draft
-      - approved-reviews-by=@fedora-infra/authdev
-      - "#approved-reviews-by>=2"
-      - "#changes-requested-reviews-by=0"
-      - status-success=DCO
+      # Conditions to get out of the queue (= merged)
       - status-success=Misc tests (lint)
       - status-success=Misc tests (format)
       # - status-success=Misc tests (licenses)
@@ -58,3 +69,9 @@ pull_request_rules:
       - status-success=Unit tests (py310-unittest)
       - status-success=Integration tests (3.9)
       - status-success=Integration tests (3.10)
+
+pull_request_rules:
+  - name: Automatic merge on approval + Sensitive files
+    conditions: []
+    actions:
+      queue: