diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml
index 39ff410d4..2e16038d2 100644
--- a/roles/2-common/tasks/udev.yml
+++ b/roles/2-common/tasks/udev.yml
@@ -21,6 +21,12 @@
     state: present
   when: udev_unit.stat.exists is defined and udev_unit.stat.exists
 
+- name: Add udev-reload.service after all filesystems are available as read-write during boot
+  template:
+    src: udev-reload.service
+    dest: /etc/systemd/system/
+  when: udev_unit.stat.exists is defined and udev_unit.stat.exists
+
 - name: Ask systemd to reread unit files (daemon-reload) and restart so systemd recognizes the changes
   systemd:
     daemon_reload: yes
@@ -28,12 +34,8 @@
     state: restarted
   when: udev_unit.stat.exists is defined and udev_unit.stat.exists
 
-- 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 udev-reload service during boot.
   systemd:
     name: udev-reload
     enabled: yes
+  when: udev_unit.stat.exists is defined and udev_unit.stat.exists