diff --git a/.github/settings.yml b/.github/settings.yml
index db94b6109..569a41d95 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -33,3 +33,6 @@ labels:
     color: 0052cc
   - name: "wontfix"
     color: ffffff
+  - name: "merge-queue"
+    color: 0e8a16
+    description: "merge on green CI"
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000..9a924a877
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,28 @@
+pull_request_rules:
+  - name: automatic merge
+    conditions:
+      - "status-success~=buildkite/rules-nixpkgs(|/pr)"
+      - "#approved-reviews-by>=1"
+      - "label=merge-queue"
+      - "base=master"
+    actions:
+      merge:
+        method: merge
+        strict: smart
+        strict_method: rebase
+
+  - name: delete head branch after merge
+    conditions:
+      - merged
+      - closed
+    actions:
+      delete_head_branch: {}
+
+  - name: remove from merge-queue after merge
+    conditions:
+      - merged
+    actions:
+      label:
+        remove:
+          - "merge-queue"
+