diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init
index e254977..ff17e07 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init
@@ -2,6 +2,10 @@
 # shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions
 source /usr/libexec/yosemite4-common-functions
 
+# wait for entity manager
+mapper wait /xyz/openbmc_project/inventory/system/board/Yosemite_4_Management_Board
+mapper wait /xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board
+
 # probe devices behind mux for management board cpld
 mgm_stage=$(get_product_version Management_Board)
 
diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service
index 68b3934..aa0250b 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Yosemite4 Schematic Init
-After=xyz.openbmc_project.FruDevice.service
-Requires=xyz.openbmc_project.FruDevice.service
+After=xyz.openbmc_project.EntityManager.service
+Requires=xyz.openbmc_project.EntityManager.service
 
 [Service]
 Type=oneshot