diff --git a/.github/renovate.json5 b/.github/renovate.json5
index d644dc2a3acab..07bdc46b8801f 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -25,7 +25,8 @@
   "onboarding": false,
   "requireConfig": "optional",
   "dependencyDashboardTitle": "Renovate Dashboard 🤖",
-  "suppressNotifications": ["prIgnoreNotification"],
+  "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"],
+  "rebaseWhen": "conflicted",
   "ignorePaths": [
     "**/*.sops.*",
     "**/.archive/**",