diff --git a/.github/renovate.json b/.github/renovate.json
index b7ba389e34..0dd504bb53 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,6 +7,7 @@
     "main",
     "/^v[0-9]+/"
   ],
+  "rebaseWhen": "conflicted",
   "packageRules": [
     {
       "matchBaseBranches": [ "/^v[0-9]+/" ],