diff --git a/api/go.mod b/api/go.mod
index 90f41e4..c6e0e63 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -1,8 +1,6 @@
 module github.com/openmcp-project/project-workspace-operator/api
 
-go 1.23.0
-
-toolchain go1.23.6
+go 1.24.2
 
 require (
 	github.com/google/uuid v1.6.0
diff --git a/go.mod b/go.mod
index db598ec..90b45ae 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/openmcp-project/project-workspace-operator
 
-go 1.23.0
-
-toolchain go1.23.6
+go 1.24.2
 
 require (
 	github.com/go-logr/logr v1.4.2
diff --git a/hack/common/Makefile b/hack/common/Makefile
index ca12e03..4c4fc61 100644
--- a/hack/common/Makefile
+++ b/hack/common/Makefile
@@ -191,11 +191,12 @@ CONTROLLER_TOOLS_VERSION ?= v0.16.4
 # renovate: datasource=github-tags depName=golang/tools
 FORMATTER_VERSION ?= v0.26.0
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-LINTER_VERSION ?= v1.61.0
+LINTER_VERSION ?= v1.64.8
 # renovate: datasource=github-releases depName=jqlang/jq
 JQ_VERSION ?= 1.7.1
 # renovate: datasource=github-releases depName=open-component-model/ocm
 OCM_VERSION ?= 0.16.2
+# renovate: datasource=github-releases depName=helm/helm
 HELM_VERSION ?= v3.13.2
 # renovate: datasource=github-releases depName=bronze1man/yaml2json
 YAML2JSON_VERSION ?= v1.3.3
diff --git a/renovate.json b/renovate.json
index 8df3dad..202ea4c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +1,24 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "minimumReleaseAge": "3 days",
   "extends": [
     "config:recommended"
   ],
   "postUpdateOptions": [
     "gomodTidy"
+  ],
+  "customManagers": [
+    {
+      "description": "Match in Makefile and Dockerfile",
+      "customType": "regex",
+      "fileMatch": [
+        "(^|/|\\.)([Dd]ocker|[Cc]ontainer)file$",
+        "(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$",
+        "(^|/)Makefile$"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV |ARG )?.+?_VERSION ?(?:\\?=|=)\"? ?(?<currentValue>.+?)\"?\\s"
+      ]
+    }
   ]
 }