diff --git a/.renovate/commitMessage.json5 b/.renovate/commitMessage.json5
index 9a944d4c..e25bb619 100644
--- a/.renovate/commitMessage.json5
+++ b/.renovate/commitMessage.json5
@@ -1,15 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
-    {
-      "matchPackageNames": ["*"],
-      "commitMessageTopic": "",
-      "semanticCommitScope": "{{datasource}}/{{#if groupName}}/group/{{groupName}}{{else if depName}}{{depName}}{{else}}{{packageName}}{{/if}}",
-      "commitMessageExtra": "{{#if currentVersion}}{{currentVersion}}{{else if currentDigestShort}}{{currentDigestShort}}{{else}}{{currentValue}}{{/if}} ➼ {{#if newVersion}}{{newVersion}}{{else if newDigestShort}}{{newDigestShort}}{{else}}{{newValue}}{{/if}}"
-    },
     {
       "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat({{datasource}}/{{depName}})!: "
+      "commitMessagePrefix": "{{semanticCommitType}}({{semanticCommitScope}})!:"
     },
     {
       "matchUpdateTypes": ["minor"],
@@ -24,68 +18,20 @@
       "semanticCommitType": "chore"
     },
     {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["!major"],
-      "semanticCommitScope": "oci/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}}"
+      "matchPackageNames": [".*"],
+      "commitMessageTopic": "",
+      "semanticCommitScope": "{{#if datasource}}{{#if (equals datasource 'docker')}}oci{{else if (equals datasource 'github-actions')}}gha{{else if (containsString datasource 'github')}}github{{else}}{{datasource}}{{/if}}/{{/if}}{{#if groupName}}/group/{{groupName}}{{else if depName}}{{depName}}{{else}}{{packageName}}{{/if}}",
+      "commitMessageExtra": "{{#if currentVersion}}{{currentVersion}}{{else if currentDigestShort}}{{currentDigestShort}}{{else}}{{currentValue}}{{/if}} ➼ {{#if newVersion}}{{newVersion}}{{else if newDigestShort}}{{newDigestShort}}{{else}}{{newValue}}{{/if}}"
     },
     {
       "matchDatasources": ["docker"],
-      "matchDepNames": ["*/*/**"],
-      "matchUpdateTypes": ["!major"],
-      "semanticCommitScope": "oci/{{#if groupName}}/group/{{groupName}}{{else}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{/if}}"
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["*/*"],
-      "matchUpdateTypes": ["!major"],
-      "semanticCommitScope": "oci/{{#if groupName}}/group/{{groupName}}{{else}}{{ lookup (split depName '/') 1 }}{{/if}}"
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(oci/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}})!: "
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["*/*/**"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(oci/{{#if groupName}}/group/{{groupName}}{{else}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{/if}})!: "
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["*/*"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(oci/{{#if groupName}}/group/{{groupName}}{{else}}{{ lookup (split depName '/') 1 }}{{/if}})!: "
-    },
-    {
-      "matchDatasources": ["github-releases", "github-tags"],
-      "semanticCommitScope": "github/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}}"
-    },
-    {
-      "matchDatasources": ["github-releases", "github-tags"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(github/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}})!: "
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "semanticCommitScope": "gha/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}}"
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(gha/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}})!: "
+      "semanticCommitScope": "oci/{{#if groupName}}/group/{{groupName}}{{else}}{{#if (lookup (split depName '/') 2)}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{else if (lookup (split depName '/') 1)}}{{ lookup (split depName '/') 1 }}{{else}}{{depName}}{{/if}}{{/if}}"
     },
     {
       "matchDatasources": ["github-releases", "github-tags"],
       "matchFileNames": [".github/workflows/**"],
       "semanticCommitScope": "gha/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}}"
     },
-    {
-      "matchDatasources": ["github-releases", "github-tags"],
-      "matchUpdateTypes": ["major"],
-      "matchFileNames": [".github/workflows/**"],
-      "commitMessagePrefix": "feat(gha/{{#if groupName}}/group/{{groupName}}{{else}}{{depName}}{{/if}})!: "
-    },
     {
       "matchFileNames": [".mise.toml", "mise.toml"],
       "matchUpdateTypes": ["major", "minor", "patch", "digest", "rollback", "bump"],