diff --git a/.github/renovate/kinds/docker.json5 b/.github/renovate/kinds/docker.json5
index 15c717b3547..954760460aa 100644
--- a/.github/renovate/kinds/docker.json5
+++ b/.github/renovate/kinds/docker.json5
@@ -8,9 +8,9 @@
       "docker-compose\\.ya?ml\\.j2$", // Matches Jinja2 templated docker-compose files
       "\\.github/workflows/.*\\.ya?ml$", // Matches all workflow YAML files
       "\\.github/workflows/.*\\.ya?ml\\.j2$", // Matches Jinja2 templated workflow files
-      // "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$",
-      // "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
-      // "(^|/)clustertool/embeded/.+\\.ya?ml(?:\\.j2)?$"
+      // "(^|/)clusters/.+\\.ya?ml$",
+      // "(^|/)repositories/.+\\.ya?ml$",
+      // "(^|/)clustertool/embeded/.+\\.ya?ml$"
     ],
     "branchPrefix": "docker-",
     "enabled": true, // Enable Docker image updates
diff --git a/.github/renovate/kinds/flux.json5 b/.github/renovate/kinds/flux.json5
index 06c8d691228..9de115ff081 100644
--- a/.github/renovate/kinds/flux.json5
+++ b/.github/renovate/kinds/flux.json5
@@ -3,9 +3,9 @@
 
   "flux": {
     "fileMatch": [
-      "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$",
-      "(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
+      "(^|/)clusters/.+\\.ya?ml$",
+      "(^|/)repositories/.+\\.ya?ml$",
+      "(^|/)kubernetes/.+\\.ya?ml$"
     ],
     "enabled": true, // Enable Flux updates
     "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5
index b1dac11edce..0c0b4e0df82 100644
--- a/.github/renovate/kinds/helm-values.json5
+++ b/.github/renovate/kinds/helm-values.json5
@@ -3,10 +3,10 @@
 
   "helm-values": {
     "fileMatch": [
-      "(^|/)clusters/.+\\-values\\.ya?ml(?:\\.j2)?$",      // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in clusters
-      "(^|/)kubernetes/.+\\-values\\.ya?ml(?:\\.j2)?$",    // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in kubernetes
-      "(^|/)repositories/.+\\-values\\.ya?ml(?:\\.j2)?$",  // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in repositories
-      "(^|/)charts/.+\\-values\\.ya?ml(?:\\.j2)?$"         // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in charts
+      "(^|/)clusters/.+\\-values\\.ya?ml$",      // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in clusters
+      "(^|/)kubernetes/.+\\-values\\.ya?ml$",    // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in kubernetes
+      "(^|/)repositories/.+\\-values\\.ya?ml$",  // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in repositories
+      "(^|/)charts/.+\\-values\\.ya?ml$"         // Match *-values.yaml, *-values.yml, or *-values.yaml.j2 in charts
     ],
     "enabled": true, // Enable image reference updates in values.yaml
     "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
diff --git a/.github/renovate/kinds/helm.json5 b/.github/renovate/kinds/helm.json5
index 75a5e29f9df..25a70d41277 100644
--- a/.github/renovate/kinds/helm.json5
+++ b/.github/renovate/kinds/helm.json5
@@ -3,7 +3,7 @@
 
   "helmv3": {
     "fileMatch": [
-      ".+/Chart\\.ya?ml(?:\\.j2)?$" // Matches Chart.yaml or Chart.yml files, optionally with a .j2 extension
+      ".+/Chart\\.ya?ml$" // Matches Chart.yaml or Chart.yml files, optionally with a .j2 extension
     ],
     "enabled": true, // Enable Helm chart updates
     "semanticCommitScope": "helm",
diff --git a/.github/renovate/special/customClusterManagers.json5 b/.github/renovate/special/customClusterManagers.json5
index 8d54bc34e4d..eba87674a0f 100644
--- a/.github/renovate/special/customClusterManagers.json5
+++ b/.github/renovate/special/customClusterManagers.json5
@@ -3,24 +3,31 @@
   "customManagers": [
     {
       "customType": "regex",
-      "description": ["Process custom dependencies"],
-      "fileMatch": [".ya?ml(?:\\.j2)?$"],
+      "description": ["Process YAML custom dependencies"],
+      "fileMatch": [".ya?ml$"],
       "matchStrings": [
+        // # renovate: datasource=github-releases depName=k3s-io/k3s
+        // k3s_release_version: &version v1.29.0+k3s1
+        // # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io
+        // version: 1.15.1
+        // # renovate: datasource=docker depName=ghcr.io/siderolabs/kubelet
+        // KUBERNETES_VERSION=v1.31.1
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)",
-        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n.+/(?<currentValue>(v|\\d)[^/]+)"
+        // # renovate: datasource=github-releases depName=rancher/system-upgrade-controller
+        // https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n.+/(?<currentValue>(v|\\d)[^/]+)",
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\n.+?\"(?<currentValue>\\S+)\""
       ],
-      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
-      "branchPrefix": "regex-",
-      "pinDigests": false // Set to false to not pin digest references
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}"
     },
-    {
-      "customType": "regex",
-      "description": ["Process CloudnativePG Postgresql version"],
-      "fileMatch": ["(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$"],
-      "matchStrings": ["imageName: (?<depName>\\S+):(?<currentValue>.*\\-.*)"],
-      "datasourceTemplate": "docker",
-      "versioningTemplate": "redhat",
-      "branchPrefix": "regex-"
-    }
+    //// TODO: verify if we need/use this logic at all
+    // {
+    //   "customType": "regex",
+    //   "description": ["Process CloudnativePG Postgresql version"],
+    //   "fileMatch": ["(^|/)kubernetes/.+\\.ya?ml$"],
+    //   "matchStrings": ["imageName: (?<depName>\\S+):(?<currentValue>.*\\-.*)"],
+    //   "datasourceTemplate": "docker",
+    //   "versioningTemplate": "redhat"
+    // }
   ]
-}
+}
\ No newline at end of file