diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 9f5c7101cd..e17fef7b36 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -13,7 +13,8 @@ Documentation=man:systemd-firstboot(1)
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-remount-fs.service
-Before=systemd-sysusers.service sysinit.target shutdown.target
+Before=systemd-sysusers.service sysinit.target first-boot-complete.target shutdown.target
+Wants=first-boot-complete.target
 ConditionPathIsReadWrite=/etc
 ConditionFirstBoot=yes