diff --git a/charts/cloudnative-pg-cluster/Chart.yaml b/charts/cloudnative-pg-cluster/Chart.yaml
index ad8df0a..0dd423f 100644
--- a/charts/cloudnative-pg-cluster/Chart.yaml
+++ b/charts/cloudnative-pg-cluster/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cnpg-cluster
 description: Create postgres tenant clusters managed by the CNPG Operator
 type: application
-version: 1.1.0
+version: 1.1.1
 
 dependencies:
   - name: cluster
diff --git a/charts/cloudnative-pg-cluster/README.md b/charts/cloudnative-pg-cluster/README.md
index 68ec340..9f4193a 100644
--- a/charts/cloudnative-pg-cluster/README.md
+++ b/charts/cloudnative-pg-cluster/README.md
@@ -1,6 +1,6 @@
 # cnpg-cluster
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Create postgres tenant clusters managed by the CNPG Operator
 
@@ -41,6 +41,7 @@ Create postgres tenant clusters managed by the CNPG Operator
 | cnpgCluster.cluster.instances | int | `3` | Number of instances |
 | cnpgCluster.cluster.postgresql.pg_hba | list | `["hostnossl all all 0.0.0.0/0 reject","hostssl all all 0.0.0.0/0 cert clientcert=verify-full"]` | records for the pg_hba.conf file. ref: https://www.postgresql.org/docs/current/auth-pg-hba-conf.html |
 | cnpgCluster.enabled | bool | `false` | enable this to deploy the official CNPG cluster helm chart dep All other values here are passed directly to the their chart. See: https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/values.yaml |
+| cnpgCluster.fullnameOverride | string | `""` |  |
 | cnpgCluster.mode | string | `"standalone"` |  |
 | cnpgCluster.primaryUpdateStrategy | string | `"unsupervised"` |  |
 | cnpgCluster.type | string | `"postgresql"` |  |
diff --git a/charts/cloudnative-pg-cluster/templates/cluster_certificates.yaml b/charts/cloudnative-pg-cluster/templates/cluster_certificates.yaml
index a777b1b..cd603bb 100644
--- a/charts/cloudnative-pg-cluster/templates/cluster_certificates.yaml
+++ b/charts/cloudnative-pg-cluster/templates/cluster_certificates.yaml
@@ -47,15 +47,27 @@ spec:
   usages:
     - server auth
   dnsNames:
-    - "{{ .Values.name }}-rw"
-    - "{{ .Values.name }}-rw.{{ .Release.Namespace }}"
-    - "{{ .Values.name }}-rw.{{ .Release.Namespace }}.svc"
-    - "{{ .Values.name }}-r"
-    - "{{ .Values.name }}-r.{{ .Release.Namespace }}"
-    - "{{ .Values.name }}-r.{{ .Release.Namespace }}.svc"
-    - "{{ .Values.name }}-ro"
-    - "{{ .Values.name }}-ro.{{ .Release.Namespace }}"
-    - "{{ .Values.name }}-ro.{{ .Release.Namespace }}.svc"
+    {{- if .Values.cnpgCluster.fullnameOverride }}
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-rw"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-rw.{{ .Release.Namespace }}"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-rw.{{ .Release.Namespace }}.svc"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-r"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-r.{{ .Release.Namespace }}"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-r.{{ .Release.Namespace }}.svc"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-ro"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-ro.{{ .Release.Namespace }}"
+    - "{{ .Values.cnpgCluster.fullnameOverride }}-ro.{{ .Release.Namespace }}.svc"
+    {{- else }}
+    - "cnpg-cluster-rw"
+    - "cnpg-cluster-rw.{{ .Release.Namespace }}"
+    - "cnpg-cluster-rw.{{ .Release.Namespace }}.svc"
+    - "cnpg-cluster-r"
+    - "cnpg-cluster-r.{{ .Release.Namespace }}"
+    - "cnpg-cluster-r.{{ .Release.Namespace }}.svc"
+    - "cnpg-cluster-ro"
+    - "cnpg-cluster-ro.{{ .Release.Namespace }}"
+    - "cnpg-cluster-ro.{{ .Release.Namespace }}.svc"
+    {{- end }}
   issuerRef:
     name: "{{ .Values.name }}-server-ca-issuer"
     kind: Issuer
diff --git a/charts/cloudnative-pg-cluster/values.yaml b/charts/cloudnative-pg-cluster/values.yaml
index 850e78d..134dff2 100644
--- a/charts/cloudnative-pg-cluster/values.yaml
+++ b/charts/cloudnative-pg-cluster/values.yaml
@@ -53,11 +53,14 @@ cnpgCluster:
   # https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/values.yaml
   enabled: false
   type: postgresql
+
   version:
     postgresql: "16"
 
   mode: standalone
 
+  fullnameOverride: ""
+
   # -- see: https://cloudnative-pg.io/docs/1.28/certificates#client-certificate
   certificates: {}
   ## examples if using our certificates features of this chart.