diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aea3bd37..cedf8b8a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         cc: [gcc, clang]
-        os: [ubuntu-latest, ubuntu-18.04]
+        os: [ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..3461807d
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,26 @@
+queue_rules:
+  - name: default
+    queue_conditions:
+      - base=master
+      - label="merge-when-passing"
+      - label!="work-in-progress"
+      - -title~=^\[*[Ww][Ii][Pp]
+      - "approved-reviews-by=@chaos/diod-admins"
+      - "#approved-reviews-by>0"
+      - "#changes-requested-reviews-by=0"
+    merge_conditions:
+      - base=master
+      - label="merge-when-passing"
+      - label!="work-in-progress"
+      - "approved-reviews-by=@chaos/diod-admins"
+      - "#approved-reviews-by>0"
+      - "#changes-requested-reviews-by=0"
+      - -title~=^\[*[Ww][Ii][Pp]
+    update_method: rebase
+    merge_method: merge
+
+pull_request_rules:
+  - name: rebase and merge when passing all checks
+    conditions: []
+    actions:
+      queue: