diff --git a/tasks/apache.yml b/tasks/apache.yml
index 096c15532daa7469f363f9d216ccd0575883274b..84cbc578573d1d8bd096b4229ef239561b47755c 100644
--- a/tasks/apache.yml
+++ b/tasks/apache.yml
@@ -6,25 +6,27 @@
 
 - name: Apache Modules
   apache2_module:
-    state='present'
-    name='{{ item }}'
+    state: present
+    name: '{{ item }}'
   with_items:
     - proxy
     - proxy_http
   notify:
-    - "Apache | Restart Apache"
+    - "Restart Apache"
 
 - name: Apache Configuration File
   template:
-    src='vhost.conf'
-    dest='/etc/apache2/sites-available/zammad_{{ domain.id }}{{ apache_conf_ext }}'
-    owner='root'
-    group='root'
-    mode='664'
+    src: vhost.conf
+    dest: /etc/apache2/sites-available/zammad_{{ domain.id }}{{ apache_conf_ext }}
+    owner: root
+    group: root
+    mode: 0664
   notify:
-    - "Apache | Restart Apache"
+    - "Restart Apache"
 
 - name: Apache enable site
-  command: a2ensite zammad_{{ domain.id }} creates=/etc/apache2/sites-enabled/zammad_{{ domain.id }}{{ apache_conf_ext }}
+  command: a2ensite zammad_{{ domain.id }}
+  args:
+    creates: /etc/apache2/sites-enabled/zammad_{{ domain.id }}{{ apache_conf_ext }}
   notify:
-    - "Apache | Restart Apache"
+    - "Restart Apache"