diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index d2921a38a..3188acaad 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -17,7 +17,7 @@
     mode: 0755
     state: directory
   with_items:
-  - "{{ kolibri_home }}"
+    - "{{ kolibri_home }}"
 
 - name: Install kolibri using pip on all OS's
   pip:
@@ -59,20 +59,16 @@
 
 - name: Enable kolibri service
   service:
-    name: "{{ item.name }}"
+    name: kolibri
     enabled: yes
     state: restarted
-  with_items:
-    - { name: kolibri }
   when: kolibri_enabled
 
 - name: Disable kolibri service
   service:
-    name: "{{ item.name }}"
+    name: kolibri
     enabled: no
     state: stopped
-  with_items:
-    - { name: kolibri }
   when: not kolibri_enabled
 
 - name: Add 'kolibri' to list of services at /etc/iiab/iiab.ini