diff --git a/helm/int-email/templates/configmap-ingress-tcp.yaml b/helm/int-email/templates/configmap-ingress-tcp.yaml
index dd9e2c1..be1ed3e 100644
--- a/helm/int-email/templates/configmap-ingress-tcp.yaml
+++ b/helm/int-email/templates/configmap-ingress-tcp.yaml
@@ -4,4 +4,4 @@ metadata:
   name: "tcp-services"
   namespace: "{{ .Release.Namespace }}"
 data:
-  "{{ .Values.service.port }}": "default/smtp-service:{{ .Values.service.port }}"
+  "{{ .Values.service.port }}": "{{ .Release.Namespace }}/{{ include "int-email.fullname" . }}:{{ .Values.service.port }}"
diff --git a/helm/int-email/templates/ingress.yaml b/helm/int-email/templates/ingress.yaml
index 0627226..91abf77 100644
--- a/helm/int-email/templates/ingress.yaml
+++ b/helm/int-email/templates/ingress.yaml
@@ -19,7 +19,7 @@ metadata:
   labels:
     {{- include "int-email.labels" . | nindent 4 }}
   annotations:
-{{/*    kubernetes.io/ingress.class: nginx*/}}
+    kubernetes.io/ingress.class: nginx
 {{/*    nginx.ingress.kubernetes.io/ssl-redirect: "true"*/}}
 {{/*    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"*/}}
 {{/*    cert-manager.io/issuer: "{{ .Values.cert.issuer.name }}-int-email"*/}}