diff --git a/service_files/phosphor-set-host-transition-to-off@.service b/service_files/phosphor-set-host-transition-to-off@.service
index 0e0a594..a1bb01f 100644
--- a/service_files/phosphor-set-host-transition-to-off@.service
+++ b/service_files/phosphor-set-host-transition-to-off@.service
@@ -4,10 +4,12 @@
 After=mapper-wait@-xyz-openbmc_project-state-host%i.service
 Wants=obmc-host-stop-pre@%i.target
 Before=obmc-host-stop-pre@%i.target
+Conflicts=obmc-host-startmin@%i.target
 
 [Service]
 Restart=no
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.TransitioningToOff"
 
 [Install]
diff --git a/service_files/phosphor-set-host-transition-to-running@.service b/service_files/phosphor-set-host-transition-to-running@.service
index 69565a3..1c9fa21 100644
--- a/service_files/phosphor-set-host-transition-to-running@.service
+++ b/service_files/phosphor-set-host-transition-to-running@.service
@@ -4,11 +4,13 @@
 After=mapper-wait@-xyz-openbmc_project-state-host%i.service
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
 Restart=no
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.TransitioningToRunning"
 
 [Install]