diff --git a/charts/plugin-barman-cloud/templates/_helpers.tpl b/charts/plugin-barman-cloud/templates/_helpers.tpl
index 150573ae92..07ec56e53b 100644
--- a/charts/plugin-barman-cloud/templates/_helpers.tpl
+++ b/charts/plugin-barman-cloud/templates/_helpers.tpl
@@ -71,3 +71,10 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the certificate issuer to use
+*/}}
+{{- define "plugin-barman-cloud.certificateIssuerName" -}}
+{{- default (printf "%s-selfsigned-issuer" (include "plugin-barman-cloud.fullname" .)) .Values.certificate.issuerName }}
+{{- end }}
diff --git a/charts/plugin-barman-cloud/templates/certificate-issuer.yaml b/charts/plugin-barman-cloud/templates/certificate-issuer.yaml
index 64f078e8e6..25d0b69298 100644
--- a/charts/plugin-barman-cloud/templates/certificate-issuer.yaml
+++ b/charts/plugin-barman-cloud/templates/certificate-issuer.yaml
@@ -20,7 +20,7 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+  name: {{ include "plugin-barman-cloud.certificateIssuerName" . }}
   namespace: {{ include "plugin-barman-cloud.namespace" . }}
 spec:
   selfSigned: {}
diff --git a/charts/plugin-barman-cloud/templates/client-certificate.yaml b/charts/plugin-barman-cloud/templates/client-certificate.yaml
index 5f4aeafe76..fcce3ac0e5 100644
--- a/charts/plugin-barman-cloud/templates/client-certificate.yaml
+++ b/charts/plugin-barman-cloud/templates/client-certificate.yaml
@@ -30,7 +30,7 @@ spec:
   issuerRef:
     group: cert-manager.io
     kind: Issuer
-    name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+    name: {{ include "plugin-barman-cloud.certificateIssuerName" . }}
   renewBefore: {{ .Values.certificate.renewBefore | default "360h" }}
   secretName: barman-cloud-client-tls
   usages:
diff --git a/charts/plugin-barman-cloud/templates/server-certificate.yaml b/charts/plugin-barman-cloud/templates/server-certificate.yaml
index e82eaa34ba..662251c1e1 100644
--- a/charts/plugin-barman-cloud/templates/server-certificate.yaml
+++ b/charts/plugin-barman-cloud/templates/server-certificate.yaml
@@ -32,7 +32,7 @@ spec:
   issuerRef:
     group: cert-manager.io
     kind: Issuer
-    name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+    name: {{ include "plugin-barman-cloud.certificateIssuerName" . }}
   renewBefore: {{ .Values.certificate.renewBefore | default "360h" }}
   secretName: barman-cloud-server-tls
   usages:
diff --git a/charts/plugin-barman-cloud/values.yaml b/charts/plugin-barman-cloud/values.yaml
index ea37056316..7315593e0d 100644
--- a/charts/plugin-barman-cloud/values.yaml
+++ b/charts/plugin-barman-cloud/values.yaml
@@ -190,7 +190,7 @@ certificate:
   # -- Specifies whether the server certificate should be created.
   createServerCertificate: true
   # -- The name of the issuer to use for the certificates.
-  issuerName: selfsigned-issuer
+  issuerName: ''
   # -- The duration of the certificates.
   duration: 2160h
   # -- The renew before time for the certificates.