diff --git a/configure_mail_service.sh b/configure_mail_service.sh
index 7ca4663..572f16d 100755
--- a/configure_mail_service.sh
+++ b/configure_mail_service.sh
@@ -15,7 +15,8 @@ gen_mails_service_configuration()
     sed -i "s/__DOMAIN__/$DOMAIN/g" my_configuration/opensmtpd/smtpd.conf
     cp -v default_configuration/opensmtpd/spamd.conf.example my_configuration/opensmtpd/spamd.conf
     cp -v default_configuration/dovecot/dovecot.conf.example my_configuration/dovecot/dovecot.conf
-    cp -v default_configuration/dovecot/local.conf.example my_configuration/dovecot/dovecot.conf
+    cp -v default_configuration/dovecot/local.conf.example my_configuration/dovecot/local.conf
+    sed -i "s/__DOMAIN__/$DOMAIN/g" my_configuration/dovecot/local.conf
 }
 
 gen_dkim_keys()
diff --git a/default_configuration/dovecot/local.conf.example b/default_configuration/dovecot/local.conf.example
index ce62514..560bee5 100644
--- a/default_configuration/dovecot/local.conf.example
+++ b/default_configuration/dovecot/local.conf.example
@@ -76,8 +76,8 @@ ssl_cipher_list = EECDH+AESGCM
 ssl_prefer_server_ciphers = yes
 #ssl_cipher_list = ALL:!DH:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH
 
-ssl_cert = </etc/ssl/kitoy.me.crt
-ssl_key = </etc/ssl/private/kitoy.me.key
+ssl_cert = </etc/ssl/__DOMAIN__.crt
+ssl_key = </etc/ssl/private/__DOMAIN__.key
 
 userdb {
     driver = static