diff --git a/renovate.json b/renovate.json
index ca59b57564..ea306ee0b6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -25,6 +25,7 @@
     "enabled": true,
     "schedule": ["before 3am on Monday"]
   },
+  "rebaseWhen": "conflicted",
   "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0", "@types/node"],
   "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc"],
   "labels": ["dependencies"]