diff --git a/data/conf/dovecot/conf.d/10-logging.conf b/data/conf/dovecot/conf.d/10-logging.conf
index f3211ecb7..a37af5494 100644
--- a/data/conf/dovecot/conf.d/10-logging.conf
+++ b/data/conf/dovecot/conf.d/10-logging.conf
@@ -2,8 +2,7 @@
 # Logging and debug.
 #mail_debug = yes
 #auth_debug = yes
-log_debug = category=fts-flatcurve
-#log_debug = category=auth
+#log_debug = category=fts-flatcurve
 log_path = syslog
 log_timestamp = "%Y-%m-%d %H:%M:%S "
 login_log_format_elements = "user=<%{user}> method=%{mechanism} rip=%{remote_ip} lip=%{local_ip} mpid=%{mail_pid} %{secured} session=<%{session}>"
diff --git a/data/conf/dovecot/conf.d/25-services.conf b/data/conf/dovecot/conf.d/25-services.conf
index 6d36b873e..c97c2645d 100644
--- a/data/conf/dovecot/conf.d/25-services.conf
+++ b/data/conf/dovecot/conf.d/25-services.conf
@@ -33,6 +33,15 @@ service config {
   }
 }
 
+# anvil socket
+service anvil {
+  unix_listener anvil {
+    user = vmail
+    group = vmail
+    mode = 0660
+  }
+}
+
 # auth sockets and inet
 service auth {
   inet_listener auth-inet {
diff --git a/data/conf/dovecot/conf.d/60-sieve-pipeline.conf b/data/conf/dovecot/conf.d/60-sieve-pipeline.conf
index cdaf88209..ea18921a6 100644
--- a/data/conf/dovecot/conf.d/60-sieve-pipeline.conf
+++ b/data/conf/dovecot/conf.d/60-sieve-pipeline.conf
@@ -1,19 +1,15 @@
 # /etc/dovecot/conf.d/60-sieve-pipeline.conf
 # Complete Sieve pipeline: personal/global scripts, plugins, limits, training.
 
-# Personal scripts
-sieve_script personal {
-  driver = file
-  path = ~/sieve
-  active_path = ~/.dovecot.sieve
-}
-
 # Global before/after (file and dict)
 sieve_script before {
+  type = before
   driver = file
   path = /var/vmail/sieve/global_sieve_before.sieve
 }
+
 sieve_script before2 {
+  type = before
   driver = dict
   name = active
   dict proxy {
@@ -21,11 +17,15 @@ sieve_script before2 {
     sieve_script_bin_path = /var/vmail/sieve_before_bindir
   }
 }
+
 sieve_script after {
+  type = after
   driver = file
   path = /var/vmail/sieve/global_sieve_after.sieve
 }
+
 sieve_script after2 {
+  type = after
   driver = dict
   name = active
   dict proxy {
@@ -34,6 +34,14 @@ sieve_script after2 {
   }
 }
 
+# Personal scripts
+sieve_script personal {
+  type = personal
+  driver = file
+  path = ~/sieve
+  active_path = ~/.dovecot.sieve
+}
+
 # Plugins and behavior
 sieve_plugins = sieve_imapsieve sieve_extprograms
 sieve_vacation_send_from_recipient = yes
@@ -75,4 +83,10 @@ sieve_vacation_min_period = 5s
 sieve_vacation_max_period = 365d
 sieve_vacation_default_period = 60s
 sieve_duplicate_default_period = 1m
-sieve_duplicate_max_period = 7d
\ No newline at end of file
+sieve_duplicate_max_period = 7d
+
+# pipe sockets in /var/run/dovecot/sieve-pipe
+sieve_pipe_socket_dir = sieve-pipe
+
+# execute sockets in /var/run/dovecot/sieve-execute
+sieve_execute_socket_dir = sieve-execute
\ No newline at end of file
diff --git a/data/conf/dovecot/conf.d/90-dict.conf b/data/conf/dovecot/conf.d/90-dict.conf
index 3aa994e17..e690bea78 100644
--- a/data/conf/dovecot/conf.d/90-dict.conf
+++ b/data/conf/dovecot/conf.d/90-dict.conf
@@ -1,12 +1,12 @@
 # /etc/dovecot/conf.d/90-dict.conf
 # Dict declarations and SQL bindings.
 dict_server {
-  dict sieveafter {
+  dict sieve_after {
     driver = sql
     !include /etc/dovecot/sql/dovecot-dict-sql-sieve_after.conf
   }
 
-  dict sievebefore {
+  dict sieve_before {
     driver = sql
     !include /etc/dovecot/sql/dovecot-dict-sql-sieve_before.conf
   }