diff --git a/.mergify.yml b/.mergify.yml
index 24f5698c49f27..55a700cee4e2f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,7 +4,17 @@ queue_rules:
     update_method: merge
     merge_method: merge
     conditions:
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge)
+      # Only if no-squash is set
+      - label~=no-squash
+      - -merged
+      - -closed
+      - "#approved-reviews-by>=1"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
+      - status-success=validate-pr
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -13,7 +23,16 @@ queue_rules:
     update_method: merge
     merge_method: squash
     conditions:
+      - base!=release
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge|no-squash)
+      - -merged
+      - -closed
+      - "#approved-reviews-by>=1"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
+      - status-success=validate-pr
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}