diff --git a/.github/renovate/basics/commitMessage.json5 b/.github/renovate/basics/commitMessage.json5
index edf9ea424be2..3e4f0ed39f68 100644
--- a/.github/renovate/basics/commitMessage.json5
+++ b/.github/renovate/basics/commitMessage.json5
@@ -3,6 +3,7 @@
   "commitMessageTopic": "{{depName}}",
   "commitMessageExtra": "{{currentVersion}} → {{newVersion}}",
   "commitMessageSuffix": "By Renovate",
+  "prefix": "chore(deps)",
   "packageRules": [
     {
       "matchDatasources": ["helm"],
@@ -10,7 +11,7 @@
     },
     {
       "matchDatasources": ["docker", "helm-values"],
-      "commitMessageTopic": "image {{depName}}"
+      "commitMessageTopic": "OCI-image {{depName}}"
     }
   ]
 }
diff --git a/.github/renovate/basics/labels.json5 b/.github/renovate/basics/labels.json5
index 641ea6e98960..f6c861f53287 100644
--- a/.github/renovate/basics/labels.json5
+++ b/.github/renovate/basics/labels.json5
@@ -11,11 +11,19 @@
     },
     {
       "matchUpdateTypes": ["patch"],
-      "labels": ["type/patch"]
+      "labels": ["type/patch", "automerge"]
     },
     {
-      "matchUpdateTypes": ["digest"],
-      "labels": ["type/digest"]
+      "matchUpdateTypes": ["digest", "pin"],
+      "labels": ["type/digest", "automerge"]
+    },
+    {
+      "matchUpdateTypes": ["pin"],
+      "labels": ["type/pin", "automerge"]
+    },
+    {
+      "matchUpdateTypes": ["lockfile"],
+      "labels": ["type/lockfile", "automerge"]
     },
     {
       "matchDatasources": ["docker"],
diff --git a/.github/renovate/main.json5 b/.github/renovate/main.json5
index 511217dd8aaf..40654b700a56 100644
--- a/.github/renovate/main.json5
+++ b/.github/renovate/main.json5
@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
     "rebaseWhen": "conflicted",
   "prConcurrentLimit": 150,
+  "automergeType": "pr",
   "pinDigests": true,
     "semanticCommits": "enabled",
   "dependencyDashboard": true,
diff --git a/.github/renovate/special/automerge.json5 b/.github/renovate/special/automerge.json5
index a564df267291..ca1f03e043d4 100644
--- a/.github/renovate/special/automerge.json5
+++ b/.github/renovate/special/automerge.json5
@@ -2,40 +2,22 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
     {
-      "description": ["Auto-merge container digests, patch and minor updates for trusted containers"],
-      "matchDatasources": ["docker"],
+      "description": ["Auto-merge minor updates from trusted sources"],
+      "matchDatasources": ["docker", "helm", "flux"],
       "automerge": true,
-      "automergeType": "pr",
-      "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"],
-      "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
-      "branchPrefix": "docker-automerge-"
+      "matchUpdateTypes": ["minor"],
+      "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*", "tccr.io/truecharts/.*" ],
+      "branchPrefix": "trusted-automerge-",
+      "labels": ["type/minor", "automerge"]
     },
-    {
-      "description": ["Auto-merge helm-values digests, patch and minor updates for trusted containers"],
-      "matchDatasources": ["helm-values"],
-      "automerge": true,
-      "automergeType": "pr",
-      "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"],
-      "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
-      "branchPrefix": "helm-values-automerge-"
-    },
-{
-  "description": ["Auto-merge chart updates, patch, and minor updates for OCI Helm charts from tccr.io/truecharts"],
-  "matchDatasources": ["helm", "flux"], // Use 'helm' datasource to match Helm charts
-  "automerge": true,
-  "automergeType": "pr",
-  "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"], // Specify the types of updates to automate
-  "matchPackagePatterns": ["tccr.io/truecharts/.*"],
-  "branchPrefix": "helm-automerge-"
-},
     {
       "description": ["Auto-merge GitHub Actions for minor and patch"],
       "matchManagers": ["github-actions"],
       "matchDatasources": ["github-tags"],
       "automerge": true,
-      "automergeType": "pr",
-      "matchUpdateTypes": ["minor", "patch", "digest", "pin"],
-      "branchPrefix": "github-automerge-"
+      "matchUpdateTypes": ["minor"],
+      "branchPrefix": "github-automerge-",
+      "labels": ["type/minor", "automerge"]
     }
   ]
 }
diff --git a/.github/renovate/updates/lockfile.json5 b/.github/renovate/updates/lockfile.json5
index 9e4e73686b2c..05d0ef61f15f 100644
--- a/.github/renovate/updates/lockfile.json5
+++ b/.github/renovate/updates/lockfile.json5
@@ -3,7 +3,8 @@
   "packageRules": [
     {
       matchUpdateTypes: ["lockfile"],
-      automerge: true
+      automerge: true,
+      "autoApprove": true
     }
   ],
   "ignore": [
diff --git a/.github/renovate/updates/pin.json5 b/.github/renovate/updates/pin.json5
index 1ec8a4081d7b..eb8bed08966b 100644
--- a/.github/renovate/updates/pin.json5
+++ b/.github/renovate/updates/pin.json5
@@ -3,7 +3,8 @@
   "packageRules": [
     {
       matchUpdateTypes: ["pin"],
-      automerge: true
+      automerge: true,
+      "autoApprove": true
     }
   ],
   "ignore": [