diff --git a/charts/appmanager/templates/install.yaml b/charts/appmanager/templates/install.yaml
index 55f9d86..3989f05 100644
--- a/charts/appmanager/templates/install.yaml
+++ b/charts/appmanager/templates/install.yaml
@@ -51,14 +51,14 @@
 metadata:
   name: ingress
   namespace: {{ .Release.Namespace }}
-  {{- if .Values.certificateIssuer }}
+  {{- if .Values.ingress.certificateIssuer }}
   annotations:
     acme.cert-manager.io/http01-edit-in-place: "true"
     cert-manager.io/cluster-issuer: {{ .Values.ingress.certificateIssuer}}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
-  {{- if .Values.certificateIssuer }}
+  {{- if .Values.ingress.certificateIssuer }}
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}
diff --git a/charts/welcome/templates/install.yaml b/charts/welcome/templates/install.yaml
index edbf9a1..5b285f3 100644
--- a/charts/welcome/templates/install.yaml
+++ b/charts/welcome/templates/install.yaml
@@ -51,14 +51,14 @@
 metadata:
   name: ingress
   namespace: {{ .Release.Namespace }}
-  {{- if .Values.certificateIssuer }}
+  {{- if .Values.ingress.certificateIssuer }}
   annotations:
     acme.cert-manager.io/http01-edit-in-place: "true"
     cert-manager.io/cluster-issuer: {{ .Values.ingress.certificateIssuer}}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
-  {{- if .Values.certificateIssuer }}
+  {{- if .Values.ingress.certificateIssuer }}
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}