diff --git a/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/common/recipes-phosphor/host/op-host-control/cfam_override@.service
index 221bceb..e6bc938 100644
--- a/common/recipes-phosphor/host/op-host-control/cfam_override@.service
+++ b/common/recipes-phosphor/host/op-host-control/cfam_override@.service
@@ -4,8 +4,8 @@
 Before=obmc-host-start-pre@%i.target
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
-Wants=fsi-hub-scan@%i.service
-After=fsi-hub-scan@%i.service
+Wants=fsi-scan@%i.service
+After=fsi-scan@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 ConditionPathExists=/var/lib/obmc/cfam_overrides
diff --git a/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
index d7d9f12..bd9db80 100644
--- a/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
+++ b/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
@@ -4,8 +4,8 @@
 Before=obmc-host-start-pre@%i.target
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
-Wants=fsi-hub-scan@%i.service
-After=fsi-hub-scan@%i.service
+Wants=fsi-scan@%i.service
+After=fsi-scan@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on