diff --git a/mmc/obmc-flash-mmc-mount.service.in b/mmc/obmc-flash-mmc-mount.service.in
index aaeb897..437641f 100644
--- a/mmc/obmc-flash-mmc-mount.service.in
+++ b/mmc/obmc-flash-mmc-mount.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Mount BMC rofs volumes after a reboot
 Before=xyz.openbmc_project.Software.BMC.Updater.service
+Before=xyz.openbmc_project.Software.Manager.service
 
 [Service]
 Type=oneshot
@@ -12,3 +13,4 @@
 
 [Install]
 WantedBy=xyz.openbmc_project.Software.BMC.Updater.service
+WantedBy=xyz.openbmc_project.Software.Manager.service
diff --git a/mmc/obmc-flash-mmc-umount.service.in b/mmc/obmc-flash-mmc-umount.service.in
index b0d4831..f13e4f9 100644
--- a/mmc/obmc-flash-mmc-umount.service.in
+++ b/mmc/obmc-flash-mmc-umount.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Unmount BMC rofs volumes
 After=xyz.openbmc_project.Software.BMC.Updater.service
+After=xyz.openbmc_project.Software.Manager.service
 
 [Service]
 Type=oneshot
@@ -12,3 +13,4 @@
 
 [Install]
 WantedBy=xyz.openbmc_project.Software.BMC.Updater.service
+WantedBy=xyz.openbmc_project.Software.Manager.service
diff --git a/side-switch/phosphor-bmc-side-switch.service b/side-switch/phosphor-bmc-side-switch.service
index ed60d7e..7e1c8dd 100644
--- a/side-switch/phosphor-bmc-side-switch.service
+++ b/side-switch/phosphor-bmc-side-switch.service
@@ -2,8 +2,8 @@
 Description=Check if flash side switch is needed
 Wants=obmc-host-start-pre@0.target
 Before=obmc-host-start-pre@0.target
-Wants=xyz.openbmc_project.Software.BMC.Updater.service
 After=xyz.openbmc_project.Software.BMC.Updater.service
+After=xyz.openbmc_project.Software.Manager.service
 Wants=xyz.openbmc_project.State.BMC.service
 After=xyz.openbmc_project.State.BMC.service
 Wants=xyz.openbmc_project.State.Chassis@0.service
diff --git a/static/obmc-flash-bmc-static-mount-alt.service.in b/static/obmc-flash-bmc-static-mount-alt.service.in
index cfb1c9d..0d2d650 100644
--- a/static/obmc-flash-bmc-static-mount-alt.service.in
+++ b/static/obmc-flash-bmc-static-mount-alt.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mount the alt partitions for static layout systems
-Wants=xyz.openbmc_project.Software.BMC.Updater.service
 Before=xyz.openbmc_project.Software.BMC.Updater.service
+Before=xyz.openbmc_project.Software.Manager.service
 
 [Service]
 Type=oneshot
diff --git a/ubi/obmc-flash-bmc-ubiremount.service.in b/ubi/obmc-flash-bmc-ubiremount.service.in
index 52ac12b..d136365 100644
--- a/ubi/obmc-flash-bmc-ubiremount.service.in
+++ b/ubi/obmc-flash-bmc-ubiremount.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=Remount the ubi volume after a reboot
-Wants=xyz.openbmc_project.Software.BMC.Updater.service
 Before=xyz.openbmc_project.Software.BMC.Updater.service
+Before=xyz.openbmc_project.Software.Manager.service
 Wants=obmc-flash-bmc-setenv@rwreset.service
 After=obmc-flash-bmc-setenv@rwreset.service