diff --git a/renovate.json b/renovate.json
index b4b1bc1..506581f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -3,6 +3,24 @@
   "automergeStrategy": "merge-commit",
   "automergeType": "pr",
   "assignees": [ "volker.raschek" ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/postfixadmin-fetchmail", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/postfixadmin-fetchmail", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "postfixadmin-fetchmail" ],
+      "matchManagers": [ "regex" ],
+      "matchUpdateTypes": [ "minor", "patch"]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "description": "Update container image reference",
@@ -12,8 +30,9 @@
       "matchStrings": [
         "appVersion: \"(?<currentValue>.*?)\"\\s+"
       ],
-      "depNameTemplate": "docker.io/volkerraschek/postfixadmin-fetchmail",
-      "datasourceTemplate": "docker"
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "postfixadmin-fetchmail",
+      "lookupNameTemplate": "docker.io/volkerraschek/postfixadmin-fetchmail"
     }
   ]
 }
\ No newline at end of file