diff --git a/roles/mail_server/tasks/main.yml b/roles/mail_server/tasks/main.yml
index 1ee9645cbfdfedd1e16a141ae5a3a3a652a913b2..c94c58edf38a500121c08b41a66c13e49632bb2d 100644
--- a/roles/mail_server/tasks/main.yml
+++ b/roles/mail_server/tasks/main.yml
@@ -27,26 +27,42 @@
   user: name=dovecot append=yes groups=ssl-cert
 
 - name: Deploy SMTP TLS private key
-  copy: dest="/etc/ssl/private/{{ ansible_fqdn }}_smtp.key" content="{{ smtp_tls_key }}"
-        mode=0640 owner=root group=root
+  copy:
+    dest: "/etc/ssl/private/{{ ansible_fqdn }}_smtp.key"
+    content: "{{ smtp_tls_key }}"
+    mode: 0640
+    owner: root
+    group: root
   notify:
     - Restart Postfix
 
 - name: Deploy SMTP TLS certificate
-  copy: dest="/etc/ssl/certs/{{ ansible_fqdn }}_smtp.pem" content="{{ smtp_tls_certificate }}"
-        mode=0644 owner=root group=root
+  copy:
+    dest: "/etc/ssl/certs/{{ ansible_fqdn }}_smtp.pem"
+    content: "{{ smtp_tls_certificate }}"
+    mode: 0644
+    owner: root
+    group: root
   notify:
     - Restart Postfix
 
 - name: Deploy IMAP TLS private key
-  copy: dest="/etc/ssl/private/{{ ansible_fqdn }}_imap.key" content="{{ imap_tls_key }}"
-        mode=0640 owner=root group=root
+  copy:
+    dest: "/etc/ssl/private/{{ ansible_fqdn }}_imap.key"
+    content: "{{ imap_tls_key }}"
+    mode: 0640
+    owner: root
+    group: root
   notify:
     - Restart Dovecot
 
 - name: Deploy IMAP TLS certificate
-  copy: dest="/etc/ssl/certs/{{ ansible_fqdn }}_imap.pem" content="{{ imap_tls_certificate }}"
-        mode=0644 owner=root group=root
+  copy:
+    dest: "/etc/ssl/certs/{{ ansible_fqdn }}_imap.pem"
+    content: "{{ imap_tls_certificate }}"
+    mode: 0644
+    owner: root
+    group: root
   notify:
     - Restart Dovecot
 
@@ -106,7 +122,12 @@
     - Restart Postfix
 
 - name: Deploy Postfix main configuration
-  template: src="main.cf.j2" dest="/etc/postfix/main.cf"
+  template:
+    src: "main.cf.j2"
+    dest: "/etc/postfix/main.cf"
+    owner: root
+    group: root
+    mode: 0644
   notify:
     - Restart Postfix