diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json
index d2c9be6..b32da07 100644
--- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json
+++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json
@@ -14,8 +14,8 @@
         "xyz.openbmc_project.Software.Download.service",
         "xyz.openbmc_project.Software.Version.service",
         "xyz.openbmc_project.State.BMC.service",
-        "xyz.openbmc_project.State.Chassis.service",
-        "xyz.openbmc_project.State.Host.service",
+        "xyz.openbmc_project.State.Chassis@0.service",
+        "xyz.openbmc_project.State.Host@0.service",
         "xyz.openbmc_project.Time.Manager.service",
         "xyz.openbmc_project.User.Manager.service",
         "bmcweb.service",
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 86415a4..3a4898b 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
@@ -8,6 +8,14 @@
     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
+
+        LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Chassis@${i}.service"
+        TARGET="../xyz.openbmc_project.State.Chassis@.service"
+        ln -s $TARGET $LINK
+
         LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@${i}.target"
         TARGET="../obmc-host-reset@.target"
         ln -s $TARGET $LINK
@@ -114,6 +122,12 @@
     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
+
+        LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Chassis@${i}.service"
+        rm $LINK
+
         LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@${i}.target"
         rm $LINK
 
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 4a16e5b..89a0e6e 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -62,7 +62,7 @@
 EXTRA_OEMESON:append = " -Dtests=disabled"
 
 FILES:${PN}-host = "${bindir}/phosphor-host-state-manager"
-DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host.service"
+DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host@.service"
 DBUS_SERVICE:${PN}-host += "phosphor-reboot-host@.service"
 SYSTEMD_SERVICE:${PN}-host += "phosphor-reset-host-reboot-attempts@.service"
 SYSTEMD_SERVICE:${PN}-host += "phosphor-clear-one-time@.service"
@@ -70,7 +70,7 @@
 SYSTEMD_SERVICE:${PN}-host += "phosphor-set-host-transition-to-off@.service"
 
 FILES:${PN}-chassis = "${bindir}/phosphor-chassis-state-manager"
-DBUS_SERVICE:${PN}-chassis += "xyz.openbmc_project.State.Chassis.service"
+DBUS_SERVICE:${PN}-chassis += "xyz.openbmc_project.State.Chassis@.service"
 
 FILES:${PN}-chassis += "${bindir}/obmcutil"
 
@@ -100,7 +100,7 @@
 SYSTEMD_SERVICE:${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service"
 
 FILES:${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition"
-DBUS_SERVICE:${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service"
+DBUS_SERVICE:${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition@.service"
 
 FILES:${PN}-chassis-check-power-status = "${bindir}/phosphor-chassis-check-power-status"
 SYSTEMD_SERVICE:${PN}-chassis-check-power-status += "phosphor-chassis-check-power-status@.service"
@@ -193,6 +193,6 @@
 
 
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https"
-SRCREV = "1ab2b6cea615419da0cb3e1900297ab694dc45ae"
+SRCREV = "211d972d7511c7e6aada8053d52d7cb198a75969"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
index 9fcca01..0749f12 100644
--- a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
+++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
@@ -1,8 +1,8 @@
 
 [Unit]
 Description=UART render controller
-Requires=xyz.openbmc_project.State.Host.service
-After=xyz.openbmc_project.State.Host.service
+Requires=xyz.openbmc_project.State.Host@0.service
+After=xyz.openbmc_project.State.Host@0.service
 
 [Service]
 ExecStart=/usr/sbin/obmc-uart-render-controller \