diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
index 6b0bda0..52bbb05 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
@@ -1,5 +1,4 @@
 DEFAULT_TARGETS = " \
-    multi-user.target.requires/xyz.openbmc_project.State.Host@{}.service \
     multi-user.target.requires/obmc-host-reset@{}.target \
     multi-user.target.requires/phosphor-discover-system-state@{}.service \
     obmc-chassis-poweron@{}.target.wants/phosphor-reset-host-recovery@{}.service \
@@ -62,6 +61,18 @@
     done
 }
 
+pkg_postinst:${PN}-host:append() {
+    for i in ${OBMC_HOST_INSTANCES};
+    do
+        mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
+
+        LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Host@${i}.service"
+        TARGET="../xyz.openbmc_project.State.Host@.service"
+        ln -s $TARGET $LINK
+
+    done
+}
+
 pkg_prerm:${PN}-obmc-targets:append() {
 
     for i in ${OBMC_HOST_INSTANCES};
@@ -95,3 +106,13 @@
 
     done
 }
+
+pkg_prerm:${PN}-host:append() {
+    for i in ${OBMC_HOST_INSTANCES};
+    do
+
+        LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Host@${i}.service"
+        rm $LINK
+
+    done
+}