diff --git a/.github/mergify.yml b/.github/mergify.yml
index a7a7cc22..309a1004 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,4 +1,3 @@
----
 #
 # Shared keys
 shared:
@@ -11,6 +10,7 @@ shared:
 #
 # Pull request rules https://docs.mergify.com/configuration/#pull-request-rules
 # N.B. Evaluated in order defined
+
 pull_request_rules:  # yamllint disable-line rule:key-ordering
   #
   # PR.1) Remove stale approvals or changes requests
@@ -27,7 +27,8 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
   # PR.2) Require all conversations to be resolved
   - actions:
       comment:
-        message: "This Pull Request needs all conversation threads to be resolved. Could you fix it @{{author}}? 🙏"
+        message: "This Pull Request needs all conversation threads to be resolved.
+          Could you fix it @{{author}}? 🙏"
       label:
         add:
           - question
@@ -48,7 +49,8 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
   # PR.4) Require all changes requested reviews to be resolved
   - actions:
       comment:
-        message: "This Pull Request needs all changes requested to be resolved. Could you fix it @{{author}}? 🙏"
+        message: "This Pull Request needs all changes requested to be resolved. Could
+          you fix it @{{author}}? 🙏"
       label:
         add:
           - changes requested
@@ -68,7 +70,8 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
   # PR.6) If Pull Request check fails, request resolution (prevent stalling the merge queue)
   - actions:
       comment:
-        message: "This Pull Request needs all checks to run successfully. Could you fix it @{{author}}? 🙏"
+        message: "This Pull Request needs all checks to run successfully. Could you
+          fix it @{{author}}? 🙏"
       label:
         add:
           - invalid
@@ -92,10 +95,6 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
       label:
         remove:
           - invalid
-      queue:
-        commit_message_template: "{{ commits[0] }}"
-        method: squash
-        name: default
     conditions:
       - base=main
       - label!=work in progress
@@ -107,13 +106,15 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
       - check-success="CI (Summary Code Coverage)"
       - check-success="Lint Blue"
       # - check-success="Lint Green"
-      - and: *common_merge_criteria
+      - &id001
+        and: *common_merge_criteria
     name: Automatic merge on approval for Pull Requests
   #
   # PR.8) Detect when Pull Request has conflicts and add conflicts label
   - actions:
       comment:
-        message: "This Pull Request is now in conflict. Could you fix it @{{author}}? 🙏"
+        message: "This Pull Request is now in conflict. Could you fix it @{{author}}?
+          🙏"
       label:
         add:
           - conflict
@@ -260,10 +261,27 @@ pull_request_rules:  # yamllint disable-line rule:key-ordering
     name: remove refactor label
 #
 # Merge queue rules https://docs.mergify.com/actions/queue/#queue-rules
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue:
 queue_rules:  # yamllint disable-line rule:key-ordering
   #
   # Q.1) Add this Pull Request to the merge queue
-  - conditions:
+  - name: default
+    queue_conditions:
+      - base=main
+      - label!=work in progress
+      - label!=do not merge
+      - check-success="CI"
+      - check-success="CI (Ansible devel sanity Lint)"
+      - check-success="CI (Ansible devel sanity Sanity)"
+      - check-success="CI (Ansible devel sanity Units)"
+      - check-success="CI (Summary Code Coverage)"
+      - check-success="Lint Blue"
+      - *id001
+    merge_conditions:
       - base=main
       - and: *common_merge_criteria
-    name: default
+    commit_message_template: "{{ commits[0] }}"
+    merge_method: squash