diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index be02c7a..8dcaafd 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Reload mboxd during power on
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
+Wants=obmc-host-start-pre@%i.target
+Before=obmc-host-start-pre@%i.target
 Wants=mapper-wait@-org-openbmc-mboxd.service
 After=mapper-wait@-org-openbmc-mboxd.service
-Conflicts=obmc-chassis-poweroff@%i.target
+Conflicts=obmc-host-stop@%i.target
 
 [Service]
 Type=oneshot
@@ -13,4 +13,4 @@
 SyslogIdentifier=mboxctl
 
 [Install]
-WantedBy=obmc-chassis-poweron@%i.target
+WantedBy=obmc-host-startmin@%i.target
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
index b5ee156..e203583 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
@@ -31,13 +31,13 @@
 }
 
 TMPL = "mboxd-reload@.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
+TGTFMT = "obmc-host-startmin@{0}.target"
 INSTFMT = "mboxd-reload@{0}.service"
 FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
 
 SYSTEMD_SERVICE_${PN} += "mboxd.service"
 SYSTEMD_SERVICE_${PN} += "mboxd-reload@.service"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}"
 
 # Enable virtual-pnor by DISTRO_FEATURE openpower-ubi-fs.
 PACKAGECONFIG_append_df-openpower-ubi-fs = "virtual-pnor"