diff --git a/templates/Fedora/35/etc/dovecot/local.conf b/templates/Fedora/35/etc/dovecot/local.conf
index f8d2918..c7098c2 100644
--- a/templates/Fedora/35/etc/dovecot/local.conf
+++ b/templates/Fedora/35/etc/dovecot/local.conf
@@ -10,15 +10,14 @@ mail_privileged_group = mail
 first_valid_uid = 0
 mail_uid = mail
 mail_gid = mail
+mail_home = /var/spool/mail/%d/%u
 
 passdb {
   driver = passwd-file
-  args = username_format=%n /etc/dovecot/accounts/%d/etc/passwd
+  args = username_format=%n scheme=SHA512-CRYPT /etc/dovecot/accounts/%d/etc/passwd
 }
 userdb {
-  driver = passwd-file
-  args = username_format=%n scheme=SHA512-CRYPT /etc/dovecot/accounts/%d/etc/passwd
-  default_fields = uid=mail gid=mail home=/var/spool/mail/%d/%u
+  driver = static
 }
 
 mail_plugins = $mail_plugins quota