diff --git a/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index f398038..4a5e6a7 100644
--- a/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -16,4 +16,4 @@
 SyslogIdentifier=phosphor-discover-system-state
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index 057af64..de1da5a 100644
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -13,4 +13,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 259dd16..1cab07f 100644
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
@@ -13,4 +13,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 26f523e..780f260 100644
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -15,4 +15,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/phosphor-state-manager_git.bb b/recipes-phosphor/state/phosphor-state-manager_git.bb
index 5408b47..59c743a 100644
--- a/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -87,14 +87,14 @@
 
 # Force the standby target to run the host reset check target
 RESET_TMPL_CTRL = "obmc-host-reset@.target"
-SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+SYSD_TGT = "multi-user.target"
 RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target"
 RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
 
 TMPL = "phosphor-discover-system-state@.service"
 INSTFMT = "phosphor-discover-system-state@{0}.service"
-FMT = "../${TMPL}:${SYSTEMD_DEFAULT_TARGET}.wants/${INSTFMT}"
+FMT = "../${TMPL}:multi-user.target.wants/${INSTFMT}"
 SYSTEMD_LINK_${PN}-discover += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}"
 
 # Force the shutdown target to run the chassis-poweroff target