diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index dd837ef..c37863e 100644
--- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -4,7 +4,10 @@
 After=obmc-power-on@%i.target
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
+After=op-cfam-reset.service
 Conflicts=obmc-chassis-poweroff@%i.target
+Conflicts=obmc-host-stop@%i.target
+ConditionPathExists=!/run/openbmc/mpreboot@%i
 
 [Service]
 ExecStart=/usr/bin/env openpower-proc-control scanFSI
@@ -15,3 +18,4 @@
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
+WantedBy=obmc-host-startmin@%i.target