diff --git a/roles/roundcube/defaults/main.yaml b/roles/roundcube/defaults/main.yaml
index 02587ca..4b5b8dd 100644
--- a/roles/roundcube/defaults/main.yaml
+++ b/roles/roundcube/defaults/main.yaml
@@ -15,10 +15,14 @@ roundcube_default_values:
       value: "{{ roundcube_db_password }}"
     - name: ROUNDCUBEMAIL_DB_NAME
       value: roundcube
+    - name: ROUNDCUREMAIL_IMAP_HOST
+      value: "ssl://{{ mail_short_name | default('mail') }}.{{ domain }}:993"
     - name: ROUNDCUBEMAIL_DEFAULT_HOST
       value: "ssl://{{ mail_short_name | default('mail') }}.{{ domain }}"
     - name: ROUNDCUBEMAIL_DEFAULT_PORT
       value: "993"
+    - name: ROUNDCUBEMAIL_SMTP_HOST
+      value: "ssl://{{ mail_short_name | default('mail') }}.{{ domain }}:465"
     - name: ROUNDCUBEMAIL_SMTP_SERVER
       value: "ssl://{{ mail_short_name | default('mail') }}.{{ domain }}"
     - name: ROUNDCUBEMAIL_SMTP_PORT