diff --git a/.github/renovate.json b/.github/renovate.json
index 12460b85..c194f891 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -5,6 +5,7 @@
   "assigneesFromCodeOwners": true,
   "reviewersFromCodeOwners": true,
   "suppressNotifications": ["prIgnoreNotification"],
+  "rebaseWhen": "conflicted",
   "helm-values": {
     "enabled": false
   },