diff --git a/roles/ldap-replica/tasks/main.yml b/roles/ldap-replica/tasks/main.yml
index bb31e09..ce19bdb 100644
--- a/roles/ldap-replica/tasks/main.yml
+++ b/roles/ldap-replica/tasks/main.yml
@@ -28,14 +28,18 @@
 
 # Cry a bit
 - name: Remove old data
-  file: path={{ item }} state=absent
+  file:
+    path: "{{ item }}"
+    state: absent
   with_items:
     - /etc/ldap/slapd.d
     - /var/lib/ldap
 
 # Cry a lot
 - name: Recreate structure
-  file: path={{ item }} state=directory
+  file:
+    path: "{{ item }}"
+    state: directory
   with_items:
     - /etc/ldap/slapd.d
     - /var/lib/ldap
@@ -58,4 +62,6 @@
 
 # Save the day
 - name: Start LDAP server
-  service: name=slapd state=started
+  service:
+    name: slapd
+    state: started