diff --git a/charts/extra-alerts/CHANGELOG.md b/charts/extra-alerts/CHANGELOG.md
index a1121ca..2b542af 100644
--- a/charts/extra-alerts/CHANGELOG.md
+++ b/charts/extra-alerts/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.5.0 (29.04.2024)
+- Update kube-prometheus-stack to 58.0.0
+
 # 0.4.0 (05.12.2023)
 - Update kube-prometheus-stack to 55.0.0
 
diff --git a/charts/extra-alerts/Chart.yaml b/charts/extra-alerts/Chart.yaml
index e303d42..78ce660 100644
--- a/charts/extra-alerts/Chart.yaml
+++ b/charts/extra-alerts/Chart.yaml
@@ -2,8 +2,8 @@
 apiVersion: v2
 name: extra-alerts
 description: A Helm chart with some tuned extra PrometheusRules from kube-prometheus-stack chart
-appVersion: "55.0.0"  # kube-prometheus-stack version
-version: 0.4.0
+appVersion: "58.0.0"  # kube-prometheus-stack version
+version: 0.5.0
 maintainers:
   - name: Ilya Cherepanov
     email: deponian@evilmartians.com
diff --git a/charts/extra-alerts/templates/kubernetesStorage/kubernetes-storage.yaml b/charts/extra-alerts/templates/kubernetesStorage/kubernetes-storage.yaml
index 95550d0..ae6315c 100644
--- a/charts/extra-alerts/templates/kubernetesStorage/kubernetes-storage.yaml
+++ b/charts/extra-alerts/templates/kubernetesStorage/kubernetes-storage.yaml
@@ -32,9 +32,9 @@ spec:
         ) < 0.03
         and
         kubelet_volume_stats_used_bytes{job="kubelet", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} > 0
-        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}namespace, persistentvolumeclaim)
+        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}cluster, namespace, persistentvolumeclaim)
         kube_persistentvolumeclaim_access_mode{ access_mode="ReadOnlyMany"} == 1
-        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}namespace, persistentvolumeclaim)
+        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}cluster, namespace, persistentvolumeclaim)
         kube_persistentvolumeclaim_labels{label_excluded_from_alerts="true"} == 1
       for: 1m
       labels:
@@ -57,9 +57,9 @@ spec:
         kubelet_volume_stats_used_bytes{job="kubelet", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} > 0
         and
         predict_linear(kubelet_volume_stats_available_bytes{job="kubelet", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0
-        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}namespace, persistentvolumeclaim)
+        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}cluster, namespace, persistentvolumeclaim)
         kube_persistentvolumeclaim_access_mode{ access_mode="ReadOnlyMany"} == 1
-        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}namespace, persistentvolumeclaim)
+        unless on ({{ range $.Values.defaultRules.additionalAggregationLabels }}{{ . }},{{ end }}cluster, namespace, persistentvolumeclaim)
         kube_persistentvolumeclaim_labels{label_excluded_from_alerts="true"} == 1
       for: 1h
       labels: