diff --git a/.github/renovate/basics/commitMessage.json5 b/.github/renovate/basics/commitMessage.json5
index 758fc3ff619..28bc7a77788 100644
--- a/.github/renovate/basics/commitMessage.json5
+++ b/.github/renovate/basics/commitMessage.json5
@@ -6,7 +6,7 @@
   "prefix": "chore(deps)",
   "packageRules": [
     {
-      "matchDatasources": ["docker", "helm-values"],
+      "matchManagers": ["docker", "helm-values"],
       "commitMessageTopic": "OCI-image {{depName}}",
       "prefix": "chore(container)"
     }
diff --git a/.github/renovate/basics/labels.json5 b/.github/renovate/basics/labels.json5
index 299e9b34eac..48158da9ed0 100644
--- a/.github/renovate/basics/labels.json5
+++ b/.github/renovate/basics/labels.json5
@@ -1,6 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
+    {
+      "matchManagers": ["helmv3"],
+      "addLabels": ["renovate/helm"]
+    },
     {
       "matchUpdateTypes": ["major"],
       "labels": ["type/major"]
@@ -26,13 +30,9 @@
       "labels": ["type/lockfile", "automerge"]
     },
     {
-      "matchDatasources": ["docker"],
+      "matchManager": ["docker", "helm-values"],
       "addLabels": ["renovate/container"]
     },
-    {
-      "matchDatasources": ["helmv3"],
-      "addLabels": ["renovate/helm"]
-    },
     {
       "matchDatasources": ["github-releases", "github-tags"],
       "addLabels": ["renovate/github-release"]