diff --git a/Dockerfile b/Dockerfile
index 936e020..0b66904 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/library/php:7.4-apache
 
 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION=3.3.9
+ARG POSTFIXADMIN_VERSION
 
 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
diff --git a/Makefile b/Makefile
index 862ca95..aab943b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+# POSTFIXADMIN_VERSION
+# Only required to install a specifiy version
+POSTFIXADMIN_VERSION?=3.3.9
+
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
 # container runtime. This is needed to start and run a container image.
diff --git a/renovate.json b/renovate.json
index 6bc3381..ef0d5b8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,22 +1,38 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automerge": false,
+  "assignees": [ "volker.raschek" ],
   "automergeStrategy": "merge-commit",
   "automergeType": "pr",
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/postfixadmin", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "postfixadmin" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
   "rebaseLabel": "renovate/rebase",
   "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "description": "Update postfixadmin git tag",
       "fileMatch": [
-        "^Dockerfile$"
+        "^Makefile$"
       ],
       "matchStrings": [
-        "ARG POSTFIXADMIN_VERSION=(?<currentValue>.*?)\n"
+        "POSTFIXADMIN_VERSION\\?=(?<currentValue>.*?)\n"
       ],
-      "depNameTemplate": "postfixadmin/postfixadmin",
       "datasourceTemplate": "github-tags",
-      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s"
+      "depNameTemplate": "postfixadmin",
+      "lookupNameTemplate": "postfixadmin/postfixadmin",
+      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s$"
     }
   ]
 }