diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index 498385f..3a0bd54 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -1,4 +1,5 @@
 auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@"}}
 auth_username_format ="%Ln"
 auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login oauthbearer xoauth2"}}
+disable_plaintext_auth = yes
 !include auth-oauth2.conf.ext
diff --git a/rootfs/etc/confd/templates/10-master.conf.tmpl b/rootfs/etc/confd/templates/10-master.conf.tmpl
index 928ebf7..391b1b4 100644
--- a/rootfs/etc/confd/templates/10-master.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-master.conf.tmpl
@@ -2,6 +2,11 @@ service imap-login {
   inet_listener imap {
     port = 143
   }
+
+  inet_listener imaps {
+    port = 993
+    ssl = yes
+  }
 }
 
 service lmtp {