diff --git a/ansible/roles/mail/templates/dovecot.conf.j2 b/ansible/roles/mail/templates/dovecot.conf.j2
index 64f12f3..8919d14 100644
--- a/ansible/roles/mail/templates/dovecot.conf.j2
+++ b/ansible/roles/mail/templates/dovecot.conf.j2
@@ -39,5 +39,10 @@ service lmtp {
   }
 }
 
+# Strip domain from LMTP recipient so fetchmail's "ml@dovecot" resolves to user "ml"
+protocol lmtp {
+  auth_username_format = %Ln
+}
+
 # SSL disabled — Traefik handles TLS
 ssl = no
diff --git a/ansible/roles/mail/templates/fetchmailrc.j2 b/ansible/roles/mail/templates/fetchmailrc.j2
index b88c326..785fa26 100644
--- a/ansible/roles/mail/templates/fetchmailrc.j2
+++ b/ansible/roles/mail/templates/fetchmailrc.j2
@@ -6,15 +6,14 @@ set logfile /dev/stdout
 set daemon 60
 
 {% for account in fetchmail_accounts | default([]) %}
-poll {{ account.server }} proto {{ account.protocol | default('pop3') }}{% if account.ssl | default(true) %} ssl{% endif %}
+poll {{ account.server }} proto {{ account.protocol | default('pop3') }}
+  interval {{ account.poll_minutes | default(10) }}
+  user "{{ account.username }}" password "{{ account.password }}"{% if account.ssl | default(true) %} ssl{% endif %}
 
-  user "{{ account.username }}" password "{{ account.password }}"
   is {{ account.local_user }} here
-  smtphost dovecot
-  smtpport 24
+  smtphost dovecot/24
   lmtp
   fetchall
   {{ 'keep' if account.keep | default(true) else 'no keep' }}
-  interval {{ account.poll_minutes | default(10) }}
 
 {% endfor %}