diff --git a/system/hotplug.conf b/system/hotplug.conf
index 46e2117f..d1e66137 100644
--- a/system/hotplug.conf
+++ b/system/hotplug.conf
@@ -7,10 +7,11 @@ service nowarn [S12345789] cgroup.system name:udevd pid:udevd log /lib/systemd/s
 service nowarn [S12345789] cgroup.system name:udevd pid:udevd log udevd -- Device event managing daemon
 
 # Wait for udevd to start, then wait a couple of seconds for it to become ready
-run if:udevd cgroup.init    [S] <pid/udevd> sleep 2 --
+run if:udevd cgroup.init    [S] <pid/udevd> udevadm settle -t 0 --
+run if:udevd cgroup.init    [S] <pid/udevd> log udevadm control --reload
 run if:udevd cgroup.init :1 [S] <pid/udevd> log udevadm trigger -c add -t devices    -- Requesting device events
 run if:udevd cgroup.init :2 [S] <pid/udevd> log udevadm trigger -c add -t subsystems -- Requesting subsystem events
-task if:udevd               [S] <pid/udevd> /lib/udev/udev-finish -- Finalizing udev
+run if:udevd cgroup.init    [S] <pid/udevd> log udevadm settle -t 5 -- Waiting for udev to finish
 
 # If udevd is not available, try mdev
 run conflict:udevd [S] mdev -s -- Populating device tree