diff --git a/roles/mailserver/templates/config.toml b/roles/mailserver/templates/config.toml
index 862a969..62ee13b 100644
--- a/roles/mailserver/templates/config.toml
+++ b/roles/mailserver/templates/config.toml
@@ -2,6 +2,7 @@ authentication.fallback-admin.secret = "{{ mailserver_secrets['admin_secret'] }}
 authentication.fallback-admin.user = "{{ mailserver_secrets['admin_user'] }}"
 cluster.node-id = 1
 lookup.default.hostname = "mail.{{ domain }}"
+lookup.default.domain = "{{ domain }}"
 
 
 # Server settings
@@ -60,14 +61,11 @@ directory.ldap.bind.auth.enable = true
 directory.ldap.bind.dn = "{{ mailserver_secrets['ldap_user'] }}"
 directory.ldap.bind.secret = "{{ mailserver_secrets['ldap_password'] }}"
 directory.ldap.cache.entries = 500
-directory.ldap.cache.ttl.negative = "10m"
-directory.ldap.cache.ttl.positive = "1h"
 directory.ldap.filter.domains = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(|(mail=*@?)(mailAlias=*@?)))"
 directory.ldap.filter.email = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(|(mail=?)(mailAlias=?)(mailList=?))(mail=*@{{ domain }}))"
 directory.ldap.filter.expand = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(mailList=?))"
 directory.ldap.filter.name = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(uid=?))"
 directory.ldap.filter.verify = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(|(mail=*?*)(mailAlias=*?*)))"
-directory.ldap.timeout = "15s"
 directory.ldap.tls.allow-invalid-certs = false
 directory.ldap.tls.enable = false
 directory.ldap.type = "ldap"
@@ -79,17 +77,8 @@ store.postgresql.compression = "lz4"
 store.postgresql.database = "stalwart"
 store.postgresql.host = "postgres.{{ domain }}"
 store.postgresql.password = "{{ mailserver_secrets['postgres_password'] }}"
-store.postgresql.pool.max-connections = 10
 store.postgresql.port = "5432"
 store.postgresql.purge.frequency = "0 3 *"
-store.postgresql.query.domains = "SELECT 1 FROM emails WHERE address LIKE '%@' || $1 LIMIT 1"
-store.postgresql.query.emails = "SELECT address FROM emails WHERE name = $1 AND type != 'list' ORDER BY type DESC, address ASC"
-store.postgresql.query.expand = "SELECT p.address FROM emails AS p JOIN emails AS l ON p.name = l.name WHERE p.type = 'primary' AND l.address = $1 AND l.type = 'list' ORDER BY p.address LIMIT 50"
-store.postgresql.query.members = "SELECT member_of FROM group_members WHERE name = $1"
-store.postgresql.query.name = "SELECT name, type, secret, description, quota FROM accounts WHERE name = $1 AND active = true"
-store.postgresql.query.recipients = "SELECT name FROM emails WHERE address = $1 ORDER BY name ASC"
-store.postgresql.query.verify = "SELECT address FROM emails WHERE address LIKE '%' || $1 || '%' AND type = 'primary' ORDER BY address LIMIT 5"
-store.postgresql.timeout = "15s"
 store.postgresql.tls.allow-invalid-certs = true
 store.postgresql.tls.enable = true
 store.postgresql.type = "postgresql"
@@ -99,5 +88,5 @@ store.postgresql.user = "{{ mailserver_secrets['postgres_user'] }}"
 # Logs settings
 tracer.stdout.ansi = true
 tracer.stdout.enable = true
-tracer.stdout.level = "debug"
+tracer.stdout.level = "info"
 tracer.stdout.type = "stdout"