diff --git a/tasks/main.yml b/tasks/main.yml
index 88938ee..538d1d6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -216,7 +216,6 @@
   - pgsql/relay_domains.cf
   - pgsql/virtual_alias_maps.cf
   - pgsql/virtual_alias_domain_maps.cf
-  - pgsql/virtual_alias_domain_catchall_maps.cf
   - pgsql/virtual_domains_maps.cf
   - pgsql/virtual_mailbox_maps.cf
   - pgsql/virtual_sender_maps.cf
diff --git a/templates/postfix/main.cf.j2 b/templates/postfix/main.cf.j2
index ddb53b6..3eafed2 100644
--- a/templates/postfix/main.cf.j2
+++ b/templates/postfix/main.cf.j2
@@ -73,7 +73,7 @@ smtp_tls_security_level = may
 
 # Postfixadmin and dovecot integration
 relay_domains = $mydestination pgsql:/etc/postfix/pgsql/relay_domains.cf {{ mailserver.postfix.relay_domains }}
-virtual_alias_maps = pgsql:/etc/postfix/pgsql/virtual_alias_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_catchall_maps.cf {{ mailserver.postfix.virtual_alias_maps }}
+virtual_alias_maps = pgsql:/etc/postfix/pgsql/virtual_alias_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_maps.cf {{ mailserver.postfix.virtual_alias_maps }}
 virtual_mailbox_domains = pgsql:/etc/postfix/pgsql/virtual_domains_maps.cf
 virtual_mailbox_maps = pgsql:/etc/postfix/pgsql/virtual_mailbox_maps.cf
 virtual_transport = dovecot
diff --git a/templates/postfix/pgsql/virtual_alias_domain_catchall_maps.cf.j2 b/templates/postfix/pgsql/virtual_alias_domain_catchall_maps.cf.j2
deleted file mode 100644
index 3f369fb..0000000
--- a/templates/postfix/pgsql/virtual_alias_domain_catchall_maps.cf.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-dbname = postfixadmin
-user = postfix
-hosts = unix:/var/run/postgresql
-query  = SELECT goto FROM alias, alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = '@' || alias_domain.target_domain AND alias.active = true AND alias_domain.active = true
diff --git a/templates/postfix/pgsql/virtual_alias_domain_maps.cf.j2 b/templates/postfix/pgsql/virtual_alias_domain_maps.cf.j2
index 0871b3d..275227c 100644
--- a/templates/postfix/pgsql/virtual_alias_domain_maps.cf.j2
+++ b/templates/postfix/pgsql/virtual_alias_domain_maps.cf.j2
@@ -1,4 +1,4 @@
 dbname = postfixadmin
 user = postfix
 hosts = unix:/var/run/postgresql
-query = SELECT goto FROM alias, alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = '%u' || '@' || alias_domain.target_domain AND alias.active = true AND alias_domain.active = true
+query = SELECT goto FROM alias, alias_domain WHERE alias_domain.alias_domain = '%d' AND alias_domain.target_domain = alias.domain AND left(alias.address, -length(alias.domain)) || alias_domain.alias_domain = '%s' AND left(alias.address, -length(alias.domain)) || alias.domain = alias.address AND alias.active = true AND alias_domain.active = true