diff --git a/.github/renovate/basics/commitMessage.json5 b/.github/renovate/basics/commitMessage.json5
index aa105eeda4b..1672249c7fa 100644
--- a/.github/renovate/basics/commitMessage.json5
+++ b/.github/renovate/basics/commitMessage.json5
@@ -6,12 +6,22 @@
   "prefix": "chore(deps)",
   "packageRules": [
     {
-      "matchManagers": ["docker", "helm-values"],
-      "commitMessageTopic": "OCI-image {{depName}}",
+      "matchManagers": ["helm-values"],
+      "commitMessageTopic": "image {{depName}}",
+      "prefix": "chore(helm)"
+    },
+    {
+      "matchManagers": ["docker"],
+      "commitMessageTopic": "image {{depName}}",
       "prefix": "chore(container)"
     },
     {
-      "matchManagers": ["helm"],
+      "matchManagers": ["flux"],
+      "commitMessageTopic": "image/chart {{depName}}",
+      "prefix": "chore(flux)"
+    },
+    {
+      "matchManagers": ["helmv3"],
       "commitMessageTopic": "chart {{depName}}",
       "prefix": "chore(helm)"
     }