diff --git a/packages/sysutils/systemd/system.d/hwdb.service b/packages/sysutils/systemd/system.d/hwdb.service
index ceb7d56f46..68e6badb89 100644
--- a/packages/sysutils/systemd/system.d/hwdb.service
+++ b/packages/sysutils/systemd/system.d/hwdb.service
@@ -1,13 +1,14 @@
 [Unit]
 Description=Update hwdb.bin
 DefaultDependencies=no
+Conflicts=shutdown.target
 After=systemd-tmpfiles-setup.service
-Before=systemd-udevd.service
+Before=sysinit.target shutdown.target systemd-udevd.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=-/usr/bin/udevadm hwdb --update
+ExecStart=systemd-hwdb update
 
 [Install]
-WantedBy=basic.target
+WantedBy=sysinit.target