diff --git a/roles/mail_server/handlers/main.yml b/roles/mail_server/handlers/main.yml
index 7208ecefa542076afb1bd46ff23628cf62b32d90..a45739bba39494e6c8f91518e76012f51753a6af 100644
--- a/roles/mail_server/handlers/main.yml
+++ b/roles/mail_server/handlers/main.yml
@@ -1,13 +1,19 @@
 ---
 
 - name: Restart Postfix
-  service: name="postfix" state=restarted
+  service:
+    name: postfix
+    state: restarted
 
 - name: Restart Dovecot
-  service: name="dovecot" state=restarted
+  service:
+    name: dovecot
+    state: restarted
 
 - name: Restart ClamAV Milter
-  service: name="clamav-milter" state=restarted
+  service:
+    name: clamav-milter
+    state: restarted
 
 - name: Rebuild mail aliases
   command: /usr/bin/newaliases