diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml
index 2a0c6539..36f8c554 100644
--- a/charts/docker-mailserver/Chart.yaml
+++ b/charts/docker-mailserver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "13.3.1"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 3.0.1
+version: 3.0.2
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:
diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
index 2e01d1bb..b738134c 100644
--- a/charts/docker-mailserver/templates/deployment.yaml
+++ b/charts/docker-mailserver/templates/deployment.yaml
@@ -181,7 +181,7 @@ spec:
           {{- end }}   
         {{- end }}   
 
-        {{- if and (.Values.deployment.env.ENABLE_POP) (not .Values.deployment.env.SMTP_ONLY) }}
+        {{- if and (.Values.deployment.env.ENABLE_POP3) (not .Values.deployment.env.SMTP_ONLY) }}
             - name: pop3
               containerPort: 110
             - name: pop3s
diff --git a/charts/docker-mailserver/templates/ingress-rspamd.yaml b/charts/docker-mailserver/templates/ingress-rspamd.yaml
index 9aadb4b4..af5a38d7 100644
--- a/charts/docker-mailserver/templates/ingress-rspamd.yaml
+++ b/charts/docker-mailserver/templates/ingress-rspamd.yaml
@@ -28,7 +28,7 @@ spec:
 
 {{ if .Values.rspamd.ingress.tls.enabled }}
   tls:
-  - secretName: {{ .Values.ingress.tls.secret }}
+  - secretName: {{ .Values.rspamd.ingress.tls.secret }}
     hosts:
     -  {{ .Values.rspamd.ingress.host }}
 {{- end }}
diff --git a/charts/docker-mailserver/templates/service.yaml b/charts/docker-mailserver/templates/service.yaml
index f90f2bdf..2298d429 100644
--- a/charts/docker-mailserver/templates/service.yaml
+++ b/charts/docker-mailserver/templates/service.yaml
@@ -83,7 +83,7 @@ spec:
     {{- end }}   
   {{- end }}   
 
-  {{- if and (.Values.deployment.env.ENABLE_POP) (not .Values.deployment.env.SMTP_ONLY) }}
+  {{- if and (.Values.deployment.env.ENABLE_POP3) (not .Values.deployment.env.SMTP_ONLY) }}
     - name: pop3
       targetPort: pop3
       port: 110
diff --git a/charts/docker-mailserver/values.yaml b/charts/docker-mailserver/values.yaml
index 6b4735ea..9f3f94de 100644
--- a/charts/docker-mailserver/values.yaml
+++ b/charts/docker-mailserver/values.yaml
@@ -458,7 +458,7 @@ configMaps:
         }    
         {{- end -}}
 
-        {{- if and (.Values.deployment.env.ENABLE_POP) (not .Values.deployment.env.SMTP_ONLY) }}
+        {{- if and (.Values.deployment.env.ENABLE_POP3) (not .Values.deployment.env.SMTP_ONLY) }}
         service pop3-login {
             inet_listener pop3 {
                 port = 110