diff --git a/install.sh b/install.sh
index 7eaa076..82bf71c 100644
--- a/install.sh
+++ b/install.sh
@@ -162,7 +162,8 @@ dovecot_storage_version = 2.4.0
 protocols = imap
 listen = *
 
-mail_location = maildir:/var/mail/vhosts/%{domain}/%{username}/Maildir
+mail_driver = maildir
+mail_path = ~/Maildir
 mail_privileged_group = vmail
 
 auth_mechanisms = plain login
@@ -177,7 +178,7 @@ userdb static {
   fields {
     uid = vmail
     gid = vmail
-    home = /var/mail/vhosts/%{domain}/%{username}
+    home = /var/mail/vhosts/%{user|domain}/%{user|username}
   }
 }
 
diff --git a/scripts/apply_config.sh b/scripts/apply_config.sh
index d013926..2101e87 100644
--- a/scripts/apply_config.sh
+++ b/scripts/apply_config.sh
@@ -83,7 +83,8 @@ dovecot_storage_version = 2.4.0
 protocols = imap
 listen = *
 
-mail_location = maildir:/var/mail/vhosts/%{domain}/%{username}/Maildir
+mail_driver = maildir
+mail_path = ~/Maildir
 mail_privileged_group = vmail
 
 auth_mechanisms = plain login
@@ -98,7 +99,7 @@ userdb static {
   fields {
     uid = vmail
     gid = vmail
-    home = /var/mail/vhosts/%{domain}/%{username}
+    home = /var/mail/vhosts/%{user|domain}/%{user|username}
   }
 }