diff --git a/renovate.json b/renovate.json
index 638138c4..15eff026 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,10 +7,7 @@
   "labels": [
     "🛠️ dependencies"
   ],
-  "dependencyDashboardApproval": true,
-  "postUpdateOptions": [
-    "gomodTidy"
-  ],
+  "dependencyDashboardApproval": true,	
   "ignoreDeps": [
     "github.com/jkroepke/openvpn-auth-oauth2"
   ],
@@ -20,8 +17,20 @@
       "matchManagers": [
         "github-actions"
       ]
+    },
+    {
+      "groupName": "Go tools",
+      "matchPackagePatterns": [
+        "*"
+      ],
+      "matchFileNames": [
+        "tools/**"
+      ]
     }
   ],
+  "postUpdateOptions": [
+    "gomodTidy"
+  ],
   "regexManagers": [
     {
       "fileMatch": [
@@ -31,7 +40,7 @@
       "matchStrings": [
         "\\s*#\\s?renovate: (?<datasource>.*?)=(?<depName>.*?)(\\s+versioning=(?<versioning>.*?))?\\s+[\\w+\\.\\-]+(?:[:=]|\\s+\\S+)\\s*[\\\"']?(?<currentValue>[\\w+\\.\\-]*)(?:@(?<currentDigest>sha256:[a-f0-9]+))?[\\\"']?"
       ],
-      "datasourceTemplate": "{{#if (equals datasource 'github')}}github-releases{{else}}{{{datasource}}}{{/if}}",
+      "datasourceTemplate": "{{#if (equals datasource 'github')}}github-tags{{else}}{{{datasource}}}{{/if}}",
       "versioningTemplate": "{{#if (equals datasource 'docker')}}docker{{else if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     }
   ]