diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d01f598..f934e5d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-      - staging
-      - release-*
   schedule:
     - cron:  '51 2 * * *'
 jobs:
diff --git a/.github/workflows/upgrade-flakes.yml b/.github/workflows/upgrade-flakes.yml
index 1f1f737..b7e91f9 100644
--- a/.github/workflows/upgrade-flakes.yml
+++ b/.github/workflows/upgrade-flakes.yml
@@ -18,9 +18,5 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@v19
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          pr-body: |
-            Automated changes by the update-flake-lock
-            ```
-            {{ env.GIT_COMMIT_MESSAGE }}
-            ```
-            bors merge
+          pr-labels: |
+            merge-queue
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..a52ac17
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,46 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=Evaluate flake.nix
+      - check-success=check age-keys [x86_64-linux]
+      - check-success=check age-keys-23_05 [x86_64-linux]
+      - check-success=check age-ssh-keys [x86_64-linux]
+      - check-success=check age-ssh-keys-23_05 [x86_64-linux]
+      - check-success=check cross-build-23_05 [x86_64-linux]
+      - check-success=check default-23_05 [x86_64-linux]
+      - check-success=check lint-23_05 [x86_64-linux]
+      - check-success=check pgp-keys [x86_64-linux]
+      - check-success=check pgp-keys-23_05 [x86_64-linux]
+      - check-success=check pruning [x86_64-linux]
+      - check-success=check pruning-23_05 [x86_64-linux]
+      - check-success=check sops-init-gpg-key-23_05 [x86_64-linux]
+      - check-success=check sops-pgp-hook-23_05 [x86_64-linux]
+      - check-success=check sops-pgp-hook-test-23_05 [x86_64-linux]
+      - check-success=check ssh-keys-23_05 [x86_64-linux]
+      - check-success=check ssh-to-pgp-23_05 [x86_64-linux]
+      - check-success=check templates [x86_64-linux]
+      - check-success=check unit-tests-23_05 [x86_64-linux]
+      - check-success=check user-passwords [x86_64-linux]
+      - check-success=devShell default [x86_64-linux]
+      - check-success=package cross-build [x86_64-linux]
+      - check-success=package default [x86_64-linux]
+      - check-success=package lint [x86_64-linux]
+      - check-success=package sops-import-keys-hook [x86_64-linux]
+      - check-success=package sops-init-gpg-key [x86_64-linux]
+      - check-success=package sops-install-secrets [x86_64-linux]
+      - check-success=package sops-pgp-hook [x86_64-linux]
+      - check-success=package sops-pgp-hook-test [x86_64-linux]
+      - check-success=package unit-tests [x86_64-linux]
+      - check-success=tests
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+      method: rebase
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=master
+      - label~=merge-queue|dependencies
+    actions:
+      queue: {}
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 858af9d..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-cut_body_after = "" # don't include text from the PR body in the merge commit message
-status = [
-  "Evaluate flake.nix",
-  "check age-keys [x86_64-linux]",
-  "check age-keys-22_11 [x86_64-linux]",
-  "check age-ssh-keys-22_11 [x86_64-linux]",
-  "check default-22_11 [x86_64-linux]",
-  "check lint-22_11 [x86_64-linux]",
-  "check pgp-keys [x86_64-linux]",
-  "check pruning-22_11 [x86_64-linux]",
-  "check restart-and-reload-22_11 [x86_64-linux]",
-  "check sops-import-keys-hook-22_11 [x86_64-linux]",
-  "check sops-init-gpg-key-22_11 [x86_64-linux]",
-  "check sops-install-secrets-22_11 [x86_64-linux]",
-  "check sops-pgp-hook-22_11 [x86_64-linux]",
-  "check sops-pgp-hook-test-22_11 [x86_64-linux]",
-  "check ssh-keys-22_11 [x86_64-linux]",
-  "check unit-tests-22_11 [x86_64-linux]",
-  "check user-passwords [x86_64-linux]",
-  "check user-passwords-22_11 [x86_64-linux]",
-  "devShell default [x86_64-linux]",
-  "devShell unit-tests [x86_64-linux]",
-  "package cross-build [x86_64-linux]",
-  "package default [x86_64-linux]",
-  "package lint [x86_64-linux]",
-  "package sops-import-keys-hook [x86_64-linux]",
-  "package sops-init-gpg-key [x86_64-linux]",
-  "package sops-install-secrets [x86_64-linux]",
-  "package sops-pgp-hook [x86_64-linux]",
-  "package sops-pgp-hook-test [x86_64-linux]",
-  "package ssh-to-pgp [x86_64-linux]",
-  "package unit-tests [x86_64-linux]",
-  "tests"
-]