diff --git a/.mergify.yml b/.mergify.yml
index 440c071fcf..bb9973c9b7 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,17 +1,36 @@
+shared:
+  merge_conditions: &merge_conditions
+    - label != mergify/no-merge
+    - '#approved-reviews-by >= 2'
+    - check-success = lua5.4
+    - check-success = codecov-lua5.3
+    - check-success = lua5.2
+    - check-success = luajit
+    - check-success = fixed-lgi-lua5.2
+    - check-success = lua5.1
+    - check-success = main
+    - status-success = codecov/patch
+
 pull_request_rules:
-  - name: automatic merge
+  - name: dismiss stale reviews on update
     conditions:
-      - label!=no-mergify
-      - '#approved-reviews-by>=2'
-      - check-success=lua5.4
-      - check-success=codecov-lua5.3
-      - check-success=lua5.2
-      - check-success=luajit
-      - check-success=fixed-lgi-lua5.2
-      - check-success=lua5.1
-      - check-success=main
-      - status-success=codecov/patch
+      - base = master
+      - label != mergify/no-merge
+    actions:
+      dismiss_reviews: {}
+
+  - name: automatic merge [SQUASH]
+    conditions: 
+      - and: *merge_conditions
+      - label = mergify/squash     
     actions:
       merge:
         method: squash
-      dismiss_reviews: {}
+
+  - name: automatic merge [MERGE]
+    conditions:
+      - and: *merge_conditions
+      - label != mergify/squash
+    actions:
+      merge:
+        method: merge