diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml
index c5ed659a1..293280d6c 100644
--- a/roles/2-common/tasks/udev.yml
+++ b/roles/2-common/tasks/udev.yml
@@ -22,8 +22,9 @@
   when: udev_unit.stat.exists is defined and udev_unit.stat.exists
 
 # ubuntu 16.04 comes with ansible 2.0.0.2 -- no systemd module
-- name: Ask systemd to recognize the changes
-  shell: systemctl daemon-reload
+- name: Ask systemd to reread unit files (daemon-reload)
+  systemd:
+    daemon_reload: yes
   when: udev_unit.stat.exists is defined and udev_unit.stat.exists
 
 - name: Restart so systemd recognizes the changes
diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml
index 1cbbdfa5a..6f8908d86 100644
--- a/roles/kalite/tasks/main.yml
+++ b/roles/kalite/tasks/main.yml
@@ -23,8 +23,9 @@
 - include_tasks: install.yml
   when: kalite_installed is defined and not kalite_installed.stat.exists and not is_F18
 
-- name: Ask systemd to reread the unit files
-  shell: systemctl daemon-reload
+- name: Ask systemd to reread unit files (daemon-reload)
+  systemd:
+    daemon_reload: yes
   when: not kalite_installed.stat.exists
 
 - include_tasks: setup-f18.yml
diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 7e2580ceb..9372008fd 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -26,7 +26,7 @@
     extra_args: --no-cache-dir
   when: internet_available
 
-- name: Create kolibri systemd service file
+- name: Create kolibri systemd service unit file
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -36,6 +36,10 @@
   with_items:
     - { src: 'kolibri.service.j2', dest: '/etc/systemd/system/kolibri.service', mode: '0644' }
 
+- name: Ask systemd to reread unit files (daemon-reload)
+  systemd:
+    daemon_reload: yes
+
 - name: Set kolibri default language
   shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
   ignore_errors: yes