diff --git a/.github/mergify.yml b/.github/mergify.yml
index 478be37ca6..72191a71c4 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,5 +1,11 @@
----
 pull_request_rules:
+  - name: Make sure PR are up to date before merging
+    description: This automatically updates PRs when they are out-of-date with the
+      base branch to avoid semantic conflicts (next step is using a merge
+      queue).
+    conditions: []
+    actions:
+      update:
   - name: Close all on main
     conditions:
       - base=main