diff --git a/bitnami/clickhouse/Chart.yaml b/bitnami/clickhouse/Chart.yaml
index 6dab38c460..ef58e3848d 100644
--- a/bitnami/clickhouse/Chart.yaml
+++ b/bitnami/clickhouse/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: clickhouse
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/clickhouse
-version: 9.4.5
+version: 9.4.6
diff --git a/bitnami/clickhouse/templates/vpa.yaml b/bitnami/clickhouse/templates/vpa.yaml
index 235eea30b4..3691b66741 100644
--- a/bitnami/clickhouse/templates/vpa.yaml
+++ b/bitnami/clickhouse/templates/vpa.yaml
@@ -11,7 +11,7 @@ kind: VerticalPodAutoscaler
 metadata:
   name: {{ printf "%s-shard%d" (include "common.names.fullname" $ ) $i }}
   namespace: {{ include "common.names.namespace" $ | quote }}
-  labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
+  labels: {{- include "common.labels.standard" (dict "customLabels" $.Values.commonLabels "context" $) | nindent 4 }}
     app.kubernetes.io/component: clickhouse
     app.kubernetes.io/part-of: clickhouse
   {{- if or $.Values.autoscaling.vpa.annotations $.Values.commonAnnotations }}
diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml
index e13f7121fe..32b767085d 100644
--- a/bitnami/common/Chart.yaml
+++ b/bitnami/common/Chart.yaml
@@ -22,4 +22,4 @@ name: common
 sources:
   - https://github.com/bitnami/charts/tree/main/bitnami/common
 type: library
-version: 2.31.7
+version: 2.31.8
diff --git a/bitnami/common/templates/_capabilities.tpl b/bitnami/common/templates/_capabilities.tpl
index 58f58c1c10..64ca3da1e1 100644
--- a/bitnami/common/templates/_capabilities.tpl
+++ b/bitnami/common/templates/_capabilities.tpl
@@ -115,12 +115,7 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 Return the appropriate apiVersion for Vertical Pod Autoscaler.
 */}}
 {{- define "common.capabilities.vpa.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
-{{- print "autoscaling/v1beta2" -}}
-{{- else -}}
-{{- print "autoscaling/v1" -}}
-{{- end -}}
+{{- print "autoscaling.k8s.io/v1" -}}
 {{- end -}}
 
 {{/*