diff --git a/acme-issuer/templates/issuer.yaml b/acme-issuer/templates/issuer.yaml
index 7eec5ed82d7391cb7de66ff35aeec9116a6d4331..cfb4d411ce5554a1b5ef9bffa5c371377f551697 100644
--- a/acme-issuer/templates/issuer.yaml
+++ b/acme-issuer/templates/issuer.yaml
@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1
 kind: {{ .Values.type }}
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "acme-issuer.fullname" . }}
   {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/acme-issuer/values.yaml b/acme-issuer/values.yaml
index 94b49dfd7eaa75105f2843ccfb9ea82eabd5a97c..a07bb3eaebb3225d82be039b1f121b47f46b4bc2 100644
--- a/acme-issuer/values.yaml
+++ b/acme-issuer/values.yaml
@@ -1,5 +1,8 @@
 type: Issuer # Either Issuer or ClusterIssuer
 
+nameOverride: ''
+fullnameOverride: ''
+
 server: https://acme-v02.api.letsencrypt.org/directory
 
 email: your-email@example.com