diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index 7ae84d4..ee97f0d 100644
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 2.1.0
+version: 2.2.0
 description: Chart for cloudnative-pg cluster
 keywords:
   - database
diff --git a/charts/postgres-cluster/templates/_helpers.tpl b/charts/postgres-cluster/templates/_helpers.tpl
index 0d92486..cfd8f29 100644
--- a/charts/postgres-cluster/templates/_helpers.tpl
+++ b/charts/postgres-cluster/templates/_helpers.tpl
@@ -5,8 +5,7 @@ Expand the name of the chart.
   {{- if .Values.nameOverride }}
     {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
   {{- else }}
-    {{ $version := split "." .Values.cluster.image.tag }}
-    {{- printf "postgresql-%s-%s" $version._0 .Release.Name | trunc 63 | trimSuffix "-" -}}
+    {{- printf "postgresql-%s-%s" .Values.cluster.image.majorVersion .Release.Name | trunc 63 | trimSuffix "-" -}}
   {{- end }}
 {{- end }}
 
diff --git a/charts/postgres-cluster/values.yaml b/charts/postgres-cluster/values.yaml
index 97783b2..c727e80 100644
--- a/charts/postgres-cluster/values.yaml
+++ b/charts/postgres-cluster/values.yaml
@@ -24,6 +24,7 @@ cluster:
   image:
     repository: ghcr.io/cloudnative-pg/postgresql
     tag: "16.2"
+    majorVersion: "16"
     pullPolicy: IfNotPresent
 
   # The UID and GID of the postgres user inside the image