diff --git a/charts/rpuppy/templates/install.yaml b/charts/rpuppy/templates/install.yaml
index e9ea225..c7c3800 100644
--- a/charts/rpuppy/templates/install.yaml
+++ b/charts/rpuppy/templates/install.yaml
@@ -33,16 +33,19 @@
 metadata:
   name: ingress
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.certificateIssuer }}
   annotations:
     acme.cert-manager.io/http01-edit-in-place: "true"
-    # acme.cert-manager.io/http01-ingress-class: {{ .Values.ingressClassName }}
-    cert-manager.io/cluster-issuer: {{ .Values.certificateIssuer}}
+    cert-manager.io/cluster-issuer: {{ .Values.certificateIssuer }}
+  {{- end }}
 spec:
   ingressClassName: {{ .Values.ingressClassName }}
+  {{- if .Values.certificateIssuer }}
   tls:
   - hosts:
     - {{ .Values.domain }}
     secretName: cert-rpuppy
+  {{- end }}
   rules:
   - host: {{ .Values.domain }}
     http: