diff --git a/roles/mail/templates/roundcube/config.inc.php b/roles/mail/templates/roundcube/config.inc.php
index dc9cf47cc9f845423ae221b547078db1aaaaf0ac..7493833894f96a38587748b41e0480d8ecdff7b3 100644
--- a/roles/mail/templates/roundcube/config.inc.php
+++ b/roles/mail/templates/roundcube/config.inc.php
@@ -36,6 +36,8 @@ $config['db_dsnw'] = 'mysql://roundcube:{{ roundcube_db_password }}@127.0.0.1:33
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %s - domain name after the '@' from e-mail address provided at login screen
 // For example %n = mail.domain.tld, %t = domain.tld
+$config['imap_host'] = 'localhost:10143';
+// TODO: remove
 $config['default_host'] = 'localhost';
 $config['default_port'] = 10143;
 
@@ -49,10 +51,9 @@ $config['default_port'] = 10143;
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
+$config['smtp_host'] = '127.0.0.1:10025';
+// TODO: remove
 $config['smtp_server'] = '127.0.0.1';
-
-// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
-// deprecated SSL over SMTP (aka SMTPS))
 $config['smtp_port'] = 10025;
 
 // SMTP username (if required) if you use %u as the username Roundcube