diff --git a/config/postfix/APKBUILD b/config/postfix/APKBUILD
index 5b455fb..13d02ba 100644
--- a/config/postfix/APKBUILD
+++ b/config/postfix/APKBUILD
@@ -3,7 +3,7 @@
 
 . ../APKBUILD-config.template
 
-pkgver=2023.03.14.02
+pkgver=2023.05.02.01
 pkgrel=0
 depends="postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
 
diff --git a/config/postfix/pgsql-aliases.cf b/config/postfix/pgsql-aliases.cf
index 1b05a30..03f06f6 100644
--- a/config/postfix/pgsql-aliases.cf
+++ b/config/postfix/pgsql-aliases.cf
@@ -2,4 +2,5 @@ hosts = postgresql.routinginfo.internal:7550
 dbname = mail
 user = postfix
 password = POSTGRESQL_PASSWORD
-query = SELECT target FROM aliases WHERE alias = '%u' AND '%d' = 'redxen.eu' AND active = '1'
+query = SELECT target FROM aliases WHERE alias = '%u' AND active = '1'
+domain = redxen.eu
diff --git a/config/postfix/pgsql-users.cf b/config/postfix/pgsql-users.cf
index 640520b..941807d 100644
--- a/config/postfix/pgsql-users.cf
+++ b/config/postfix/pgsql-users.cf
@@ -2,4 +2,5 @@ hosts = postgresql.routinginfo.internal:7550
 dbname = mail
 user = postfix
 password = POSTGRESQL_PASSWORD
-query = SELECT userid FROM users WHERE userid = '%u' AND '%d' = 'redxen.eu' AND active = '1'
+query = SELECT userid FROM users WHERE userid = '%u' AND active = '1'
+domain = redxen.eu