diff --git a/.renovate/commitMessage.json5 b/.renovate/commitMessage.json5
index 9626d046..01afa255 100644
--- a/.renovate/commitMessage.json5
+++ b/.renovate/commitMessage.json5
@@ -3,10 +3,8 @@
   "commitMessageTopic": "",
   "semanticCommitScope": "{{datasource}}/{{depName}}",
   "commitMessageExtra": "{{oldVersion}} ➼ {{newVersion}}",
-  "commitMessageSuffix": "",
   "packageRules": [
     {
-      "matchDatasources": ["docker", "helm"],
       "matchUpdateTypes": ["major"],
       "commitMessagePrefix": "feat({{datasource}}/{{depName}})!: "
     },
@@ -22,25 +20,33 @@
       "matchUpdateTypes": ["digest"],
       "semanticCommitType": "chore"
     },
+    {
+      "matchDatasources": ["docker"],
+      "semanticCommitScope": "{{datasource}}/{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}"
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchUpdateTypes": ["major"],
+      "commitMessagePrefix": "{{datasource}}/{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}"
+    },
+    {
+      "matchDatasources": ["github-releases", "github-tags"],
+      "semanticCommitScope": "github/{{depName}}"
+    },
     {
       "matchDatasources": ["github-releases", "github-tags"],
       "matchUpdateTypes": ["major"],
       "commitMessagePrefix": "feat(github/{{depName}})!: "
     },
     {
-      "matchDatasources": ["github-releases", "github-tags"],
+      "matchManagers": ["github-actions"],
       "matchUpdateTypes": ["minor", "patch"],
-      "semanticCommitScope": "github/{{depName}}"
+      "semanticCommitScope": "gha/{{depName}}"
     },
     {
       "matchManagers": ["github-actions"],
       "matchUpdateTypes": ["major"],
       "commitMessagePrefix": "feat(gha/{{depName}})!: "
     },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "semanticCommitScope": "gha/{{depName}}"
-    }
   ]
 }