diff --git a/bundles/dovecot/files/dovecot.conf b/bundles/dovecot/files/dovecot.conf
index e105b23..885b36a 100644
--- a/bundles/dovecot/files/dovecot.conf
+++ b/bundles/dovecot/files/dovecot.conf
@@ -29,8 +29,8 @@ mail_location = maildir:/var/mail/vmail/%d/%n
 protocols = imap lmtp sieve
 
 ssl = yes
-ssl_cert = </var/lib/dehydrated/certs/${node.metadata['postfix']['myhostname']}/fullchain.pem
-ssl_key =  </var/lib/dehydrated/certs/${node.metadata['postfix']['myhostname']}/privkey.pem
+ssl_cert = </var/lib/dehydrated/certs/${node.metadata.get('postfix/myhostname', node.metadata['hostname'])}/fullchain.pem
+ssl_key =  </var/lib/dehydrated/certs/${node.metadata.get('postfix/myhostname', node.metadata['hostname'])}/privkey.pem
 ssl_dh = </etc/dovecot/ssl/dhparam.pem
 ssl_min_protocol = TLSv1.2
 ssl_cipher_list = EECDH+AESGCM:EDH+AESGCM
@@ -40,7 +40,7 @@ login_greeting = IMAPd ready
 auth_mechanisms = plain login
 first_valid_uid = 65534
 disable_plaintext_auth = yes
-mail_plugins = $mail_plugins zlib
+mail_plugins = $mail_plugins zlib old_stats
 
 plugin {
     zlib_save_level = 6
@@ -137,11 +137,26 @@ protocol sieve {
     }
 }
 
-% if node.has_bundle('telegraf'):
 service old-stats {
+% if node.has_bundle('telegraf'):
     inet_listener {
         address = 127.0.0.1
         port = 24242
     }
-}
 % endif
+    unix_listener old-stats {
+        mode = 0660
+        user = nobody
+        group = nogroup
+    }
+    fifo_listener old-stats-mail {
+        mode = 0660
+        user = nobody
+        group = nogroup
+    }
+    fifo_listener old-stats-user {
+        mode = 0660
+        user = nobody
+        group = nogroup
+    }
+}
diff --git a/bundles/dovecot/items.py b/bundles/dovecot/items.py
index a10ebc2..627a203 100644
--- a/bundles/dovecot/items.py
+++ b/bundles/dovecot/items.py
@@ -2,6 +2,10 @@
 # by this bundle
 repo.libs.tools.require_bundle(node, 'postfix')
 
+directories = {
+    '/etc/dovecot/ssl': {},
+}
+
 files = {
     '/etc/dovecot/dovecot.conf': {
         'content_type': 'mako',
@@ -25,6 +29,24 @@ files = {
             'svc_systemd:dovecot:restart',
         },
     },
+    '/etc/dovecot/conf.d/auth-system.conf.ext': {
+        'delete': True,
+        'needs': {
+            'pkg_apt:'
+        },
+        'triggers': {
+            'svc_systemd:dovecot:restart',
+        },
+    },
+    '/etc/dovecot/conf.d/10-auth.conf': {
+        'delete': True,
+        'needs': {
+            'pkg_apt:'
+        },
+        'triggers': {
+            'svc_systemd:dovecot:restart',
+        },
+    },
 }
 
 actions = {
@@ -33,6 +55,7 @@ actions = {
         'unless': 'test -f /etc/dovecot/ssl/dhparam.pem',
         'cascade_skip': False,
         'needs': {
+            'directory:/etc/dovecot/ssl',
             'pkg_apt:'
         },
         'triggers': {