diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 0000000000..b649aabfdf
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,22 @@
+queue_rules:
+  - name: default
+    conditions:
+      - check-success="build_and_test (14, ubuntu-latest)"
+      - check-success="build_and_test (14, macos-latest)"
+      - check-success="examples_build_and_test (web-chat)"
+      - check-success="examples_build_and_test (cli-chat)"
+
+pull_request_rules:
+  - name: automatic merge for main when ready and CI passes
+    conditions:
+      - check-success="build_and_test (14, ubuntu-latest)"
+      - check-success="build_and_test (14, macos-latest)"
+      - check-success="examples_build_and_test (web-chat)"
+      - check-success="examples_build_and_test (cli-chat)"
+      - author=D4nte
+      - base=main
+      - label=ready-to-merge
+      - label!=work-in-progress
+    actions:
+      queue:
+        name: default
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 3df26d75ad..0000000000
--- a/bors.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-status = [
-  "build_and_test (14, ubuntu-latest)",
-  "build_and_test (14, macos-latest)",
-  "examples_build_and_test (web-chat)",
-  "examples_build_and_test (cli-chat)"
-]
-block_labels = ["work-in-progress"]
-delete_merged_branches = true