diff --git a/common/templates/_acme_issuer.tpl b/common/templates/cert-manager/_acme_issuer.tpl
similarity index 93%
rename from common/templates/_acme_issuer.tpl
rename to common/templates/cert-manager/_acme_issuer.tpl
index 73c0f8af39a975f0c6cedad222055a1aee8eff47..e1752f95f5238545bd226a01aff313194fe9f735 100644
--- a/common/templates/_acme_issuer.tpl
+++ b/common/templates/cert-manager/_acme_issuer.tpl
@@ -1,4 +1,4 @@
-{{- define "common.acme-issuer" -}}
+{{- define "common.cert-manager.acme-issuer" -}}
 apiVersion: {{ .Values.apiVersion | default "cert-manager.io/v1" }}
 kind: {{ .Values.type | default "Issuer" }}
 metadata:
diff --git a/common/templates/cert-manager/_certificate.tpl b/common/templates/cert-manager/_certificate.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..50fc803c7e917346f17c34a9c3d7cc9e71da1df1
--- /dev/null
+++ b/common/templates/cert-manager/_certificate.tpl
@@ -0,0 +1,22 @@
+{{- define "common.cert-manager.certificate" -}}
+apiVersion: {{ .Values.apiVersion | default "cert-manager.io/v1" }}
+kind: Certificate
+metadata:
+  name: {{ .Values.name | default "certificate" }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "common.variables.labels" . | nindent 4 }}
+spec:
+  secretName: {{ .Values.secretName }}
+  {{- with .Values.dnsNames}}
+  dnsNames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  issuerRef:
+    name: {{ .Values.issuerRef.name }}
+    kind: {{ .Values.issuerRef.kind | default "Issuer" }}
+---
+{{- end }}
diff --git a/example/templates/acme_issuer.yaml b/example/templates/acme_issuer.yaml
index 61a52e86cb9a86e147f450233714ee32973796c5..82679018a60249b1008973f9a46c5b577950568c 100644
--- a/example/templates/acme_issuer.yaml
+++ b/example/templates/acme_issuer.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.acme }}
-{{ include "common.acme-issuer" (dict "Values" .Values.acme "Chart" .Chart "Release" .Release) }}
+{{ include "common.cert-manager.acme-issuer" (dict "Values" .Values.acme "Chart" .Chart "Release" .Release) }}
 {{- end }}