diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
index a01b942..8e749e6 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
@@ -2,8 +2,6 @@
 Description=Reboot Host%i
 Wants=multi-user.target
 After=multi-user.target
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-startmin@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 790ef6a..ff1486b 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -2,8 +2,6 @@
 Description=Start Host%i
 Wants=multi-user.target
 After=multi-user.target
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-host-quiesce@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
index fc93cdc..88ccb25 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
@@ -2,8 +2,6 @@
 Description=Start Host%i Minimum
 Wants=multi-user.target
 After=multi-user.target
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-host-quiesce@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
index d8f3cc9..496fd5b 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
@@ -2,8 +2,6 @@
 Description=Stop Host%i
 Wants=multi-user.target
 After=multi-user.target
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
 After=obmc-chassis-poweroff@%i.target
 Conflicts=obmc-host-startmin@%i.target
 RefuseManualStop=yes