diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index 0e32685..8f2dd5f 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -24,4 +24,5 @@ jobs:
             ```
             {{ env.GIT_COMMIT_MESSAGE }}
             ```
-            bors merge
+          pr-labels: |                  # Labels to be set on the PR
+            merge-queue
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..f15d9bc
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,23 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=Evaluate flake.nix
+      - check-success=check lint [x86_64-linux]
+      - check-success=devShell default [x86_64-linux]
+      - check-success=lockfile
+      - check-success=package default [x86_64-linux]
+      - check-success=package test-runner-stable [x86_64-linux]
+      - check-success=package test-runner-unstable [x86_64-linux]
+      - check-success=tests (ubuntu-latest, stable)
+      - check-success=tests (ubuntu-latest, unstable)
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=main
+      - label=merge-queue
+    actions:
+      queue: {}
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 8a57a6f..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-cut_body_after = "" # don't include text from the PR body in the merge commit message
-status = [
-  "Evaluate flake.nix",
-  "check lint [x86_64-linux]",
-  "devShell default [x86_64-linux]",
-  "package default [x86_64-linux]",
-  "package test-runner-stable [x86_64-linux]",
-  "package test-runner-unstable [x86_64-linux]",
-  "tests (ubuntu-latest, stable)",
-  "tests (ubuntu-latest, unstable)"
-]