diff --git a/charts/feature-cluster-metrics/.updatecli-kepler.yaml b/charts/feature-cluster-metrics/.updatecli-kepler.yaml
index a4f1ea340..c31d24873 100644
--- a/charts/feature-cluster-metrics/.updatecli-kepler.yaml
+++ b/charts/feature-cluster-metrics/.updatecli-kepler.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "kepler" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+name: Update dependency "kepler" for Helm chart "feature-cluster-metrics"
 sources:
   kepler:
     name: Get latest "kepler" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "kepler" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring-feature-cluster-metrics/Chart.yaml
+      file: charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[3].name
       value: kepler
     disablesourceinput: true
 targets:
   kepler:
-    name: Bump Helm chart dependency "kepler" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+    name: Bump Helm chart dependency "kepler" for Helm chart "feature-cluster-metrics"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[3].version
-      name: charts/k8s-monitoring-feature-cluster-metrics
+      name: charts/feature-cluster-metrics
       versionincrement: none
     sourceid: kepler
diff --git a/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml b/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml
index 5cf4f4275..a84f491e1 100644
--- a/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml
+++ b/charts/feature-cluster-metrics/.updatecli-kube-state-metrics.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "kube-state-metrics" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+name: Update dependency "kube-state-metrics" for Helm chart "feature-cluster-metrics"
 sources:
   kube-state-metrics:
     name: Get latest "kube-state-metrics" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "kube-state-metrics" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring-feature-cluster-metrics/Chart.yaml
+      file: charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[0].name
       value: kube-state-metrics
     disablesourceinput: true
 targets:
   kube-state-metrics:
-    name: Bump Helm chart dependency "kube-state-metrics" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+    name: Bump Helm chart dependency "kube-state-metrics" for Helm chart "feature-cluster-metrics"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/k8s-monitoring-feature-cluster-metrics
+      name: charts/feature-cluster-metrics
       versionincrement: none
     sourceid: kube-state-metrics
diff --git a/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml b/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml
index 484dab563..bf70f2ff7 100644
--- a/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml
+++ b/charts/feature-cluster-metrics/.updatecli-prometheus-node-exporter.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-node-exporter" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+name: Update dependency "prometheus-node-exporter" for Helm chart "feature-cluster-metrics"
 sources:
   prometheus-node-exporter:
     name: Get latest "prometheus-node-exporter" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-node-exporter" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring-feature-cluster-metrics/Chart.yaml
+      file: charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[1].name
       value: prometheus-node-exporter
     disablesourceinput: true
 targets:
   node-exporter:
-    name: Bump Helm chart dependency "node-exporter" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+    name: Bump Helm chart dependency "node-exporter" for Helm chart "feature-cluster-metrics"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[1].version
-      name: charts/k8s-monitoring-feature-cluster-metrics
+      name: charts/feature-cluster-metrics
       versionincrement: none
     sourceid: prometheus-node-exporter
diff --git a/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml b/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml
index 6563438a8..5dd3a4966 100644
--- a/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml
+++ b/charts/feature-cluster-metrics/.updatecli-prometheus-windows-exporter.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-windows-exporter" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+name: Update dependency "prometheus-windows-exporter" for Helm chart "feature-cluster-metrics"
 sources:
   prometheus-windows-exporter:
     name: Get latest "prometheus-windows-exporter" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-windows-exporter" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring-feature-cluster-metrics/Chart.yaml
+      file: charts/feature-cluster-metrics/Chart.yaml
       key: $.dependencies[2].name
       value: prometheus-windows-exporter
     disablesourceinput: true
 targets:
   windows-exporter:
-    name: Bump Helm chart dependency "windows-exporter" for Helm chart "k8s-monitoring-feature-cluster-metrics"
+    name: Bump Helm chart dependency "windows-exporter" for Helm chart "feature-cluster-metrics"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[2].version
-      name: charts/k8s-monitoring-feature-cluster-metrics
+      name: charts/feature-cluster-metrics
       versionincrement: none
     sourceid: prometheus-windows-exporter
diff --git a/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml b/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml
index ef8ec55e1..fabf89c4e 100644
--- a/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml
+++ b/charts/feature-prometheus-operator-objects/.updatecli-prometheus-operator-crds.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-operator-crds" for Helm chart "k8s-monitoring-feature-prometheus-operator-objects"
+name: Update dependency "prometheus-operator-crds" for Helm chart "feature-prometheus-operator-objects"
 sources:
   prometheus-operator-crds:
     name: Get latest "prometheus-operator-crds" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-operator-crds" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring-feature-prometheus-operator-objects/Chart.yaml
+      file: charts/feature-prometheus-operator-objects/Chart.yaml
       key: $.dependencies[0].name
       value: prometheus-operator-crds
     disablesourceinput: true
 targets:
   crds:
-    name: Bump Helm chart dependency "crds" for Helm chart "k8s-monitoring-feature-prometheus-operator-objects"
+    name: Bump Helm chart dependency "crds" for Helm chart "feature-prometheus-operator-objects"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/k8s-monitoring-feature-prometheus-operator-objects
+      name: charts/feature-prometheus-operator-objects
       versionincrement: none
     sourceid: prometheus-operator-crds
diff --git a/charts/k8s-monitoring-v1/.updatecli-alloy.yaml b/charts/k8s-monitoring-v1/.updatecli-alloy.yaml
index 1ebd43de1..07a0036ea 100644
--- a/charts/k8s-monitoring-v1/.updatecli-alloy.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-alloy.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "alloy" for Helm chart "k8s-monitoring"
+name: Update dependency "alloy" for Helm chart "k8s-monitoring-v1"
 sources:
   alloy:
     name: Get latest "alloy" Helm chart version
@@ -15,44 +15,44 @@ conditions:
     name: Ensure Helm chart dependency "alloy" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[0].name
       value: alloy
     disablesourceinput: true
 targets:
   alloy:
-    name: Bump Helm chart dependency "alloy" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "alloy" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[0].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: alloy
   alloy-events:
-    name: Bump Helm chart dependency "alloy-events" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "alloy-events" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[1].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: alloy
   alloy-logs:
-    name: Bump Helm chart dependency "alloy-logs" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "alloy-logs" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[2].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: alloy
   alloy-profiles:
-    name: Bump Helm chart dependency "alloy-profiles" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "alloy-profiles" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[3].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: alloy
diff --git a/charts/k8s-monitoring-v1/.updatecli-beyla.yaml b/charts/k8s-monitoring-v1/.updatecli-beyla.yaml
index cf3a6475f..c86dab0fa 100644
--- a/charts/k8s-monitoring-v1/.updatecli-beyla.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-beyla.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "beyla" for Helm chart "k8s-monitoring"
+name: Update dependency "beyla" for Helm chart "k8s-monitoring-v1"
 sources:
   beyla:
     name: Get latest "beyla" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "beyla" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[10].name
       value: beyla
     disablesourceinput: true
 targets:
   beyla:
-    name: Bump Helm chart dependency "beyla" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "beyla" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[10].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: beyla
diff --git a/charts/k8s-monitoring-v1/.updatecli-kepler.yaml b/charts/k8s-monitoring-v1/.updatecli-kepler.yaml
index 6dc0fda7b..17f7df12b 100644
--- a/charts/k8s-monitoring-v1/.updatecli-kepler.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-kepler.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "kepler" for Helm chart "k8s-monitoring"
+name: Update dependency "kepler" for Helm chart "k8s-monitoring-v1"
 sources:
   kepler:
     name: Get latest "kepler" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "kepler" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[9].name
       value: kepler
     disablesourceinput: true
 targets:
   kepler:
-    name: Bump Helm chart dependency "kepler" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "kepler" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[9].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: kepler
diff --git a/charts/k8s-monitoring-v1/.updatecli-kube-state-metrics.yaml b/charts/k8s-monitoring-v1/.updatecli-kube-state-metrics.yaml
index 87399282e..a1b221f40 100644
--- a/charts/k8s-monitoring-v1/.updatecli-kube-state-metrics.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-kube-state-metrics.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "kube-state-metrics" for Helm chart "k8s-monitoring"
+name: Update dependency "kube-state-metrics" for Helm chart "k8s-monitoring-v1"
 sources:
   kube-state-metrics:
     name: Get latest "kube-state-metrics" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "kube-state-metrics" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[4].name
       value: kube-state-metrics
     disablesourceinput: true
 targets:
   kube-state-metrics:
-    name: Bump Helm chart dependency "kube-state-metrics" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "kube-state-metrics" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[4].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: kube-state-metrics
diff --git a/charts/k8s-monitoring-v1/.updatecli-opencost.yaml b/charts/k8s-monitoring-v1/.updatecli-opencost.yaml
index 1d1e84a70..37a1fc96c 100644
--- a/charts/k8s-monitoring-v1/.updatecli-opencost.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-opencost.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "opencost" for Helm chart "k8s-monitoring"
+name: Update dependency "opencost" for Helm chart "k8s-monitoring-v1"
 sources:
   opencost:
     name: Get latest "opencost" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "opencost" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[8].name
       value: opencost
     disablesourceinput: true
 targets:
   opencost:
-    name: Bump Helm chart dependency "opencost" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "opencost" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[8].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: opencost
diff --git a/charts/k8s-monitoring-v1/.updatecli-prometheus-node-exporter.yaml b/charts/k8s-monitoring-v1/.updatecli-prometheus-node-exporter.yaml
index 3aa43ce25..3ceea36a4 100644
--- a/charts/k8s-monitoring-v1/.updatecli-prometheus-node-exporter.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-prometheus-node-exporter.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-node-exporter" for Helm chart "k8s-monitoring"
+name: Update dependency "prometheus-node-exporter" for Helm chart "k8s-monitoring-v1"
 sources:
   prometheus-node-exporter:
     name: Get latest "prometheus-node-exporter" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-node-exporter" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[5].name
       value: prometheus-node-exporter
     disablesourceinput: true
 targets:
   prometheus-node-exporter:
-    name: Bump Helm chart dependency "prometheus-node-exporter" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "prometheus-node-exporter" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[5].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: prometheus-node-exporter
diff --git a/charts/k8s-monitoring-v1/.updatecli-prometheus-operator-crds.yaml b/charts/k8s-monitoring-v1/.updatecli-prometheus-operator-crds.yaml
index 5f6f89ae8..d2f57d6c7 100644
--- a/charts/k8s-monitoring-v1/.updatecli-prometheus-operator-crds.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-prometheus-operator-crds.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-operator-crds" for Helm chart "k8s-monitoring"
+name: Update dependency "prometheus-operator-crds" for Helm chart "k8s-monitoring-v1"
 sources:
   prometheus-operator-crds:
     name: Get latest "prometheus-operator-crds" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-operator-crds" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[6].name
       value: prometheus-operator-crds
     disablesourceinput: true
 targets:
   prometheus-operator-crds:
-    name: Bump Helm chart dependency "prometheus-operator-crds" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "prometheus-operator-crds" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[6].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: prometheus-operator-crds
diff --git a/charts/k8s-monitoring-v1/.updatecli-prometheus-windows-exporter.yaml b/charts/k8s-monitoring-v1/.updatecli-prometheus-windows-exporter.yaml
index 8b69b1367..85c72d4d9 100644
--- a/charts/k8s-monitoring-v1/.updatecli-prometheus-windows-exporter.yaml
+++ b/charts/k8s-monitoring-v1/.updatecli-prometheus-windows-exporter.yaml
@@ -1,5 +1,5 @@
 ---
-name: Update dependency "prometheus-windows-exporter" for Helm chart "k8s-monitoring"
+name: Update dependency "prometheus-windows-exporter" for Helm chart "k8s-monitoring-v1"
 sources:
   prometheus-windows-exporter:
     name: Get latest "prometheus-windows-exporter" Helm chart version
@@ -15,17 +15,17 @@ conditions:
     name: Ensure Helm chart dependency "prometheus-windows-exporter" is specified
     kind: yaml
     spec:
-      file: charts/k8s-monitoring/Chart.yaml
+      file: charts/k8s-monitoring-v1/Chart.yaml
       key: $.dependencies[7].name
       value: prometheus-windows-exporter
     disablesourceinput: true
 targets:
   prometheus-windows-exporter:
-    name: Bump Helm chart dependency "prometheus-windows-exporter" for Helm chart "k8s-monitoring"
+    name: Bump Helm chart dependency "prometheus-windows-exporter" for Helm chart "k8s-monitoring-v1"
     kind: helmchart
     spec:
       file: Chart.yaml
       key: $.dependencies[7].version
-      name: charts/k8s-monitoring
+      name: charts/k8s-monitoring-v1
       versionincrement: none
     sourceid: prometheus-windows-exporter
diff --git a/scripts/charts-to-updatecli.sh b/scripts/charts-to-updatecli.sh
index 9bb3732fd..727cf36f7 100755
--- a/scripts/charts-to-updatecli.sh
+++ b/scripts/charts-to-updatecli.sh
@@ -11,7 +11,7 @@ if [ ! -f "$CHART_YAML" ]; then
 fi
 
 rm -f .updatecli-*.yaml
-chartName=$(yq eval '.name' "$CHART_YAML")
+chartDir=$(basename "$(dirname "$(readlink -f "$CHART_YAML")")")
 dependencyCount=$(yq eval '.dependencies | length' "$CHART_YAML")
 for ((i=0; i<dependencyCount; i++)); do
   dependency=$(yq eval ".dependencies[$i]" "$CHART_YAML")
@@ -22,7 +22,7 @@ for ((i=0; i<dependencyCount; i++)); do
     if [ ! -f ".updatecli-${chart}.yaml" ]; then
       echo "---" > ".updatecli-${chart}.yaml"
       yq eval --null-input "{
-  \"name\": \"Update dependency \\\"$chart\\\" for Helm chart \\\"$chartName\\\"\",
+  \"name\": \"Update dependency \\\"$chart\\\" for Helm chart \\\"$chartDir\\\"\",
   \"sources\": {
     \"$chart\": {
       \"name\": \"Get latest \\\"$chart\\\" Helm chart version\",
@@ -42,7 +42,7 @@ for ((i=0; i<dependencyCount; i++)); do
       \"name\": \"Ensure Helm chart dependency \\\"$chart\\\" is specified\",
       \"kind\": \"yaml\",
       \"spec\": {
-        \"file\": \"charts/$chartName/Chart.yaml\",
+        \"file\": \"charts/$chartDir/Chart.yaml\",
         \"key\": \"$.dependencies[$i].name\",
         \"value\": \"$chart\"
       },
@@ -54,12 +54,12 @@ for ((i=0; i<dependencyCount; i++)); do
     fi
     yq eval ".targets += {
 \"$name\": {
-  \"name\": \"Bump Helm chart dependency \\\"$name\\\" for Helm chart \\\"$chartName\\\"\",
+  \"name\": \"Bump Helm chart dependency \\\"$name\\\" for Helm chart \\\"$chartDir\\\"\",
   \"kind\": \"helmchart\",
   \"spec\": {
     \"file\": \"Chart.yaml\",
     \"key\": \"$.dependencies[$i].version\",
-    \"name\": \"charts/$chartName\",
+    \"name\": \"charts/$chartDir\",
     \"versionincrement\": \"none\"
   },
   \"sourceid\": \"$chart\"