diff --git a/configs/dovecot/APKBUILD b/configs/dovecot/APKBUILD
index 5f2324e..63f33dc 100644
--- a/configs/dovecot/APKBUILD
+++ b/configs/dovecot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-dovecot
 pkgver=2021.01.07
-pkgrel=0
+pkgrel=1
 pkgdesc="Dovecot configuration"
 url="https://git.redxen.eu/RedXen"
 arch="noarch"
@@ -23,6 +23,6 @@ package() {
 	install -d "$pkgdir"/var/mail
 }
 
-sha512sums="00dcd8cae91bdddaa6e55cca6060d326ea38716426c028a5e481d55893df818236ec2556d8d496502cc356b5b53d71c76cdcf4cdee713242ceee10061f2a0714  dovecot.conf
+sha512sums="5c854e3769ebf25a971ff1e3ecc2a1a5f59a2ee1c173dd36fc219bae30e167f0cb2d67445dc4d779a0b6e675f1de79b3b5f620955b660b54fecc51edc3070595  dovecot.conf
 d4646d31915b6fc0df7cc9c06d66c369f6a622f2f0c783fd9463a05a53d1b3b3ba2ebcbe32b2391f0e44fe2a67c6eeeef3b00d3067325152054e184ac67ff745  pgsql.conf
 e305a5ee8196f09d805278acf27a2b66eae9c9e3c6e3458bca391597b1c720c063f8c92034d1af070c750fd0858da7eaa16e75a3b060064eac6b5bcb7b2452e7  rspamd.sieve"
diff --git a/configs/dovecot/dovecot.conf b/configs/dovecot/dovecot.conf
index 325094c..4a916eb 100644
--- a/configs/dovecot/dovecot.conf
+++ b/configs/dovecot/dovecot.conf
@@ -56,6 +56,17 @@ service lmtp {
 		group = mail
 	}
 }
+
+service auth {
+	unix_listener auth {
+		mode = 0660
+		user = dovecot
+		group = mail
+	}
+	user = root
+}
+
+
 #protocol lmtp {
 #	mail_plugins = $mail_plugins sieve
 #}
diff --git a/configs/postfix/APKBUILD b/configs/postfix/APKBUILD
index 5a8c281..319ce05 100644
--- a/configs/postfix/APKBUILD
+++ b/configs/postfix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-postfix
 pkgver=2021.01.07
-pkgrel=3
+pkgrel=7
 pkgdesc="Postfix configuration files"
 url="https://git.redxen.eu/RedXen"
 arch="noarch"
@@ -24,7 +24,7 @@ package() {
 	install -Dm644 pgsql-users.cf "$pkgdir"/etc/postfix/redxen/pgsql-users.cf
 }
 
-sha512sums="0010244dc6fab37310c9ae14428309331842d6c25e46ec38c29487bddce768bf6fd01f411fe809a200872084502778b5f5d4a98ddc4909aefd60831859ff8ff1  master.cf
-5d770466b4c31270295729e874aaaecfcf0e82c76c00b0573f0436a1a9c57034895786bf9bb7169f009e719401db47787f915bba8348aa2453f8681bba8d397c  main.cf
+sha512sums="b931958b959bab300a5e0baca2b64775e0cf348a2c4a3b25003e744ab781f82a39114b70c9fe74558443a06d294ef90002bf5eb4c9639eab3101e9a46a645cbb  master.cf
+255a7e27c066573615028974edee02f929863d3e7801e293dce9bae12b5c9806101f22741fef32f2e828d8d017bcb492da70bd2ac93b16ab6cc200e4a343702e  main.cf
 a1778901dbc12de543d9d5897b9d50ee5ebe47b7ef6ed87a0087249657f146ff8493de455d32016660cca3c8d669592e0ea9fbe9b6696d92cac6f014277f29e5  pgsql-aliases.cf
 72c50fe20b4d1a7ea2e60fb2cac0164814ab41011eb7f0d67a8a5715a0cc43d3ad573f198a7933eb130f68ec5c25c558fad791300e5bb25e020ca76a4303db4c  pgsql-users.cf"
diff --git a/configs/postfix/main.cf b/configs/postfix/main.cf
index ae19255..3fdce3f 100644
--- a/configs/postfix/main.cf
+++ b/configs/postfix/main.cf
@@ -13,6 +13,7 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 relayhost =
 relay_domains = $mydestination
 
+local_transport = local
 alias_maps = proxy:pgsql:/etc/postfix/redxen/pgsql-aliases.cf
 local_recipient_maps = proxy:pgsql:/etc/postfix/redxen/pgsql-users.cf $alias_maps
 
@@ -52,6 +53,12 @@ smtpd_recipient_restrictions = permit_sasl_authenticated,
 smtpd_helo_restrictions      = reject_unknown_helo_hostname,
                                reject_rhsbl_helo dbl.spamhaus.org
 
+# Dovecot auth
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = /run/dovecot/auth
+smtpd_sasl_security_options = noanonymous
+smtpd_sasl_local_domain = $myorigin
+
 # Dovecot LMTP
 mailbox_transport = lmtp:unix:/run/dovecot/lmtp
 
diff --git a/configs/postfix/master.cf b/configs/postfix/master.cf
index 85d6822..6c11963 100644
--- a/configs/postfix/master.cf
+++ b/configs/postfix/master.cf
@@ -6,9 +6,10 @@ submission inet n       -       y       -       -       smtpd
 	-o smtpd_sasl_auth_enable=yes
 	-o smtpd_client_restrictions=permit_sasl_authenticated,reject
 	-o smtpd_sasl_security_options=noanonymous
-smtp      inet  n       -       y       -       -       smtpd
+smtp      unix  -       -       n       -       -       smtp
+smtp      inet  n       -       n       -       -       smtpd
 	-o smtpd_sasl_auth_enable=yes
-smtps     inet  n       -       y       -       -       smtpd
+smtps     inet  n       -       n       -       -       smtpd
 	-o smtpd_sasl_auth_enable=yes
 	-o smtpd_tls_wrappermode=yes
 pickup    unix  n       -       y       60      1       pickup