diff --git a/dracut/52fdo/manufacturing-client.service b/dracut/52fdo/manufacturing-client.service
index 9ce9eacba..53268891b 100644
--- a/dracut/52fdo/manufacturing-client.service
+++ b/dracut/52fdo/manufacturing-client.service
@@ -3,6 +3,8 @@ Description=Manufacturing client DIUN
 DefaultDependencies=false
 
 After=coreos-installer.service
+Before=coreos-installer-poweroff.service
+Before=coreos-installer-noreboot.service
 Before=coreos-installer-reboot.service
 ConditionPathExists=/etc/manufacturing-client-config
 Requires=dev-disk-by\x2dlabel-boot.device
@@ -15,4 +17,4 @@ Type=oneshot
 Environment=LOG_LEVEL=info
 EnvironmentFile=/etc/manufacturing-client-config
 ExecStart=/usr/libexec/manufacturing-client-service
-RemainAfterExit=yes
\ No newline at end of file
+RemainAfterExit=yes