diff --git a/renovate.json b/renovate.json
index 1910fc3907..e4f1dff0d3 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,7 +2,14 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
-    "helpers:pinGitHubActionDigests"
+    "helpers:pinGitHubActionDigests",
+    ":gitSignOff"
+
+  ],
+  "addLabels": ["dependencies"],
+  "postUpdateOptions": [
+    "gomodTidy",
+    "gomodMassage"
   ],
   "packageRules": [
     {
@@ -10,9 +17,31 @@
       "matchCurrentVersion": "!/^0/",
       "automerge": true
     },
+    {
+      "matchManagers": ["gomod"],
+      "addLabels": ["go"]
+    },
     {
       "matchManagers": ["github-actions"],
-      "automerge": true
+      "addLabels": ["github_actions"]
+    },
+    {
+      "matchManagers": ["dockerfile"],
+      "addLabels": ["docker"]
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "(^|\\/)Makefile$",
+        "(^|\\/)Dockerfile",
+        "(^|\\/).*\\.ya?ml$",
+        "(^|\\/).*\\.toml$",
+        "(^|\\/).*\\.sh$"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.+?) depName=(?<depName>.+?)\\s.*?_VERSION ?(\\??=|\\: ?) ?\\\"?(?<currentValue>.+?)?\\\"?\\s"
+      ]
     }
   ]
 }
\ No newline at end of file