diff --git a/.renovate/groups.json5 b/.renovate/groups.json5
index 65396aa5..22dbac1c 100644
--- a/.renovate/groups.json5
+++ b/.renovate/groups.json5
@@ -115,8 +115,9 @@
     },
     {
       "description": "Separate all app-template updates",
-      "matchPackageNames": ["app-template"],
-      "matchDatasources": ["helm"],
+      "matchPackageNames": ["**app-template"],
+      "matchDatasources": ["helm", "oci"],
+      "semanticCommitScope": "helm/app-template",
       "separateMajorMinor": true,
       "separateMultipleMajor": true,
       "separateMinorPatch": true,
@@ -124,8 +125,8 @@
     },
     {
       "description": "Manually approve app-template major releases",
-      "matchPackageNames": ["app-template"],
-      "matchDatasources": ["helm"],
+      "matchPackageNames": ["**app-template"],
+      "matchDatasources": ["helm", "oci"],
       "matchUpdateTypes": ["major"],
       "dependencyDashboardApproval": true,
       "automerge": false,
@@ -133,8 +134,8 @@
     },
     {
       "description": "Auto merge patch app-template versions",
-      "matchPackageNames": ["app-template"],
-      "matchDatasources": ["helm"],
+      "matchPackageNames": ["**app-template"],
+      "matchDatasources": ["helm", "oci"],
       "matchUpdateTypes": ["patch"],
       "dependencyDashboardApproval": false,
       "automerge": true,
@@ -144,8 +145,8 @@
     },
     {
       "description": "Don't automerge app-template minor releases",
-      "matchPackageNames": ["app-template"],
-      "matchDatasources": ["helm"],
+      "matchPackageNames": ["**app-template"],
+      "matchDatasources": ["helm", "oci"],
       "matchUpdateTypes": ["minor"],
       "dependencyDashboardApproval": false,
       "automerge": false,
diff --git a/.renovate/preUpdateBackups.json5 b/.renovate/preUpdateBackups.json5
index f4fafad8..e231b721 100644
--- a/.renovate/preUpdateBackups.json5
+++ b/.renovate/preUpdateBackups.json5
@@ -7,7 +7,7 @@
       "managerFilePatterns": ["/^kube/.+/ks\\.ya?ml$/"],
       "matchStrings": [
         //       VS_APP_CURRENT_VERSION: "{{.IMAGENAME}}:{{.IMAGETAG}}"
-        " *(VS|PG)_APP_CURRENT_VERSION: \"?(?<packageName>[\\w\\d\\-\\_\\/\\.]+):(?<currentValue>[\\w\\d\\.\\-\\_]+)\"?"
+        " *(?:VS|PG)_APP_CURRENT_VERSION: \"?(?<packageName>[\\w\\d\\-\\_\\/\\.]+):(?<currentValue>[\\w\\d\\.\\-\\_]+)\"?"
       ],
       "datasourceTemplate": "docker",
       "versioningTemplate": "docker"