diff --git a/dovecot/config/doveconf24.conf b/dovecot/config/doveconf24.conf
index 4f32891..32e4b18 100644
--- a/dovecot/config/doveconf24.conf
+++ b/dovecot/config/doveconf24.conf
@@ -6,20 +6,12 @@ dovecot_storage_version = 2.4.0
 protocols = imap pop3
 
 # Logging (Block-Syntax)
-log {
-  path = /var/log/dovecot.log
-}
-log {
-  path = /var/log/dovecot-info.log
-  level = info
-}
-log {
-  path = /var/log/dovecot-debug.log
-  level = debug
-}
+log_path = /var/log/dovecot.log
+info_log_path = /var/log/dovecot-info.log
+debug_log_path = /var/log/dovecot-debug.log
 
 # Mail-Location
-mail_location = maildir:/var/mail/%d/%n
+mail_location = maildir:/var/mail/%{user | domain }/%{user|lower}
 
 # Authentifizierung
 auth_mechanisms = plain login