diff --git a/roles/mail_server/playbook.yml b/roles/mail_server/playbook.yml
index 4cfb91819de537602d7b34c947f734cca4269768..52b78cd54881b58153cf7a8c212fb52192b94114 100644
--- a/roles/mail_server/playbook.yml
+++ b/roles/mail_server/playbook.yml
@@ -21,12 +21,12 @@
         parameters-mandatory: 10.31.127.30
         parameters-optional: 10.31.127.31
 
-- hosts: client
+- hosts: client1,client2
   tasks:
 
     - name: Install SWAKS for testing SMTP capability
       apt:
-        name: swak
+        name: swaks
         state: installed
 
 - hosts: ldap-server
@@ -93,7 +93,7 @@
         - name: postfix
           password: postfixpassword
         - name: dovecot
-          password: dovecotpoassword
+          password: dovecotpassword
           state: present
 
       ldap_server_domain: "local"
@@ -153,8 +153,7 @@
       imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/parameters-optional_imap.cert.pem') }}"
       imap_tls_key: "{{ lookup('file', 'tests/data/x509/parameters-optional_imap.key.pem') }}"
       local_mail_aliases:
-        root:
-          - john.doe@parameters-optional.local
+        root: "john.doe@domain1"
       smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/parameters-optional_smtp.cert.pem') }}"
       smtp_tls_key: "{{ lookup('file', 'tests/data/x509/parameters-optional_smtp.key.pem') }}"
       imap_folder_separator: "."