diff --git a/target_files/obmc-chassis-poweron@.target b/target_files/obmc-chassis-poweron@.target
index 2fae676..91172b0 100644
--- a/target_files/obmc-chassis-poweron@.target
+++ b/target_files/obmc-chassis-poweron@.target
@@ -3,10 +3,6 @@
 After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-logging\x3Axyz.openbmc_project.Logging.ErrorBlocksTransition.service
-After=mapper-subtree-remove@-xyz-openbmc\x5fproject-logging\x3Axyz.openbmc_project.Logging.ErrorBlocksTransition.service
 Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-chassis-poweroff@%i.target
diff --git a/target_files/obmc-power-start-pre@.target b/target_files/obmc-power-start-pre@.target
index 9fef7c0..eb1c164 100644
--- a/target_files/obmc-power-start-pre@.target
+++ b/target_files/obmc-power-start-pre@.target
@@ -2,5 +2,9 @@
 Description=Power%i On (Pre)
 After=multi-user.target
 Conflicts=obmc-chassis-poweroff@%i.target
+Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
+After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
+Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-logging\x3Axyz.openbmc_project.Logging.ErrorBlocksTransition.service
+After=mapper-subtree-remove@-xyz-openbmc\x5fproject-logging\x3Axyz.openbmc_project.Logging.ErrorBlocksTransition.service
 RefuseManualStart=yes
 RefuseManualStop=yes