diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml
index 293280d6c..39ff410d4 100644
--- a/roles/2-common/tasks/udev.yml
+++ b/roles/2-common/tasks/udev.yml
@@ -21,20 +21,19 @@
     state: present
   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 reread unit files (daemon-reload)
+- name: Ask systemd to reread unit files (daemon-reload) and restart so systemd recognizes the changes
   systemd:
     daemon_reload: yes
+    name: systemd-udevd
+    state: restarted
   when: udev_unit.stat.exists is defined and udev_unit.stat.exists
 
-- name: Restart so systemd recognizes the changes
-  shell: systemctl restart systemd-udevd.service
-  when: udev_unit.stat.exists is defined and udev_unit.stat.exists
-
-- name: Reload systemd-udevd so it has rootfs open read-write
+- name: Add udev-reload.service after all filesystems are available as read-write during boot
   template:
     src: udev-reload.service
     dest: /etc/systemd/system/
 
-- name: Enable the reload service
-  shell: systemctl enable udev-reload.service
+- name: Enable the udev-reload service during boot.
+  systemd:
+    name: udev-reload
+    enabled: yes