diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..67253140
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,28 @@
+queue_rules:
+  - name: default
+    conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success=DCO
+      - check-success=docker-images
+      - check-success=validation
+
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - base=main
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - "#review-requested=0"
+      - check-success=DCO
+      - check-success=docker-images
+      - check-success=validation
+      - label!=do-not-merge
+      - label=ready-to-merge
+    actions:
+      queue:
+        method: merge
+        name: default
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+
+          {{ body }}
diff --git a/.mergify.yml b/.mergify.yml
deleted file mode 100644
index c5dbe993..00000000
--- a/.mergify.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - base=main
-      - "#approved-reviews-by>=1"
-      - "#review-requested=0"
-      - "#changes-requested-reviews-by=0"
-      - label=ready-to-merge
-      - label!=do-not-merge
-    actions:
-      merge:
-        commit_message: title+body
-        strict: smart+fastpath