diff --git a/renovate.json b/renovate.json
index 7bf6266..5d62c9d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,6 +6,7 @@
     "main"
   ],
   "rangeStrategy": "bump",
+  "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "fileMatch": [
@@ -38,6 +39,14 @@
       "groupName": [
         "base dependencies"
       ]
+    },
+    {
+      "datasources": [
+        "docker"
+      ],
+      "groupName": [
+        "docker images"
+      ]
     }
   ]
 }