diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index c31d389..850da21 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -2,8 +2,6 @@
 Description=Enable the AVS bus on VRMs
 Wants=vrm-control@%i.service
 After=vrm-control@%i.service
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
 Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index c98e758..ea18e16 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Perform AVS bus workaround on VRMs
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
+Wants=op-power-start@.service
+After=op-power-start@.service
 Before=avsbus-disable@%i.service
 Conflicts=obmc-power-chassis-off@%i.target
 
diff --git a/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service b/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
index bc7e5a5..a2b5397 100644
--- a/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
+++ b/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Run VCS workaround on host%i
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
 Wants=avsbus-enable@%i.service
 After=avsbus-enable@%i.service
 Conflicts=obmc-power-chassis-off@%i.target