diff --git a/evoacme/handlers/main.yml b/evoacme/handlers/main.yml
index e5538908..844cf8f7 100644
--- a/evoacme/handlers/main.yml
+++ b/evoacme/handlers/main.yml
@@ -1,11 +1,11 @@
 - name: newaliases
-  shell: newaliases
+  command: newaliases
 
 - name: Test Apache conf
   shell: apache2ctl -t
   notify: "Reload Apache conf"
 
-- name: Reload Apache conf
+- name: reload apache2
   service:
-   name=apache2
-   state=reloaded
+   name: apache2
+   state: reloaded
diff --git a/evoacme/tasks/apache.yml b/evoacme/tasks/apache.yml
index d0c3e478..532545ae 100644
--- a/evoacme/tasks/apache.yml
+++ b/evoacme/tasks/apache.yml
@@ -5,7 +5,8 @@
     owner: root
     group: root
     mode: 0644
-  notify: "Test Apache conf"
+  validate: apache2ctl -t
+  notify: reload apache2
 
 - name: Enable acme challenge conf
   file:
@@ -14,4 +15,5 @@
     state: link
     owner: root
     group: root
-  notify: "Test Apache conf"
+  validate: apache2ctl -t
+  notify: reload apache2