diff --git a/.mergify.yml b/.mergify.yml
index b50b3b3..ea18fb2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,9 +1,11 @@
 pull_request_rules:
   - name: automatic merge on CI success
     conditions:
-      - check-success=flake-checks
-      - check-success=builds (treefmt, ubuntu-latest)
-      - check-success=builds (treefmt, macos-latest)
+      - check-success=Evaluate flake.nix
+      - check-success=package nix-eval-jobs [x86_64-linux]
+      - check-success=devShell default [x86_64-linux]
+      - check-success=check treefmt [x86_64-linux]
+      - check-success=package default [x86_64-linux]
       - check-success=tests (ubuntu-latest)
       - check-success=tests (macos-latest)
       - author=nix-eval-jobs-bot
diff --git a/bors.toml b/bors.toml
index c9665f9..826bb37 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,2 +1,12 @@
 cut_body_after = "" # don't include text from the PR body in the merge commit message
-status = ["tests (ubuntu-latest)", "tests (macos-latest)"]
+status = [
+  # garnix
+  "Evaluate flake.nix",
+  "package nix-eval-jobs [x86_64-linux]",
+  "devShell default [x86_64-linux]",
+  "check treefmt [x86_64-linux]",
+  "package default [x86_64-linux]",
+  # github actions
+  "tests (ubuntu-latest)",
+  "tests (macos-latest)"
+]