diff --git a/.renovate/commitMessage.json5 b/.renovate/commitMessage.json5
index ebd57534..58403bae 100644
--- a/.renovate/commitMessage.json5
+++ b/.renovate/commitMessage.json5
@@ -32,7 +32,7 @@
       "matchDatasources": ["docker"],
       "matchDepNames": ["*/*/**"],
       "matchUpdateTypes": ["!major"],
-      "semanticCommitScope": "oci/{{#if groupName}}{{groupName}}{{else}}{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}{{ lookup (split depName '/') 5 }}{{/if}}"
+      "semanticCommitScope": "oci/{{#if groupName}}{{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"],
@@ -49,7 +49,7 @@
       "matchDatasources": ["docker"],
       "matchDepNames": ["*/*/**"],
       "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(oci/{{#if groupName}}{{groupName}}{{else}}{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}{{ lookup (split depName '/') 5 }}{{/if}})!: "
+      "commitMessagePrefix": "feat(oci/{{#if groupName}}{{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"],
diff --git a/.renovate/groups.json5 b/.renovate/groups.json5
index f25550a7..e6bf24bf 100644
--- a/.renovate/groups.json5
+++ b/.renovate/groups.json5
@@ -8,9 +8,16 @@
       "rebaseWhen": "conflicted",
       "automerge": false
     },
+    {
+      "description": "Only create GHA PRs after a week",
+      "matchManagers": ["github-actions"],
+      "matchPackageNames": ["!actions/**", "!**renovate**"],
+      "minimumReleaseAge": "7 days"
+    },
     {
       "description": "Auto merge Github Actions",
       "matchManagers": ["github-actions"],
+      "matchPackageNames": ["actions/**"],
       "automerge": true,
       "automergeType": "pr",
       "rebaseWhen": "behind-base-branch",
@@ -34,11 +41,11 @@
       "rebaseWhen": "behind-base-branch",
       "matchFileNames": ["kube/deploy/apps/**"],
       "matchUpdateTypes": ["minor", "patch", "digest"],
-      "matchCurrentVersion": "!/^0\\./", // avoid breaking changes in 0.x SemVer releases
+      "matchCurrentVersion": "!/^0\\./" // avoid breaking changes in 0.x SemVer releases
     },
     {
       "description": "Don't auto merge specific apps in path ./kube/deploy/apps",
-      "matchPackageNames": ["**/reactive-resume", "**/home-assistant"],
+      "matchPackageNames": ["**/reactive-resume", "**/home-assistant", "**/zigbee2mqtt"],
       "automerge": false,
       "matchFileNames": ["kube/deploy/apps/**"]
     },
@@ -73,6 +80,7 @@
       "description": "authentik Group",
       "groupName": "authentik",
       "matchPackageNames": ["**authentik**", "ghcr.io/goauthentik/**"],
+      "versioning": "semver-coerced",
       "sourceUrl": "https://github.com/goauthentik/authentik",
       "automerge": false,
       "separateMultipleMajor": true,