diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
index 7452b91..e72d33a 100644
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
@@ -10,4 +10,4 @@
 SyslogIdentifier=phosphor-cooling-type
 
 [Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
+RequiredBy=multi-user.target
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 86ed1d4..e388748 100644
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -9,7 +9,7 @@
 
 TMPL_COOLING = "phosphor-cooling-type@.service"
 INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
-COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+COOLING_TGT = "multi-user.target"
 FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
 
 FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type"
diff --git a/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-romulus/recipes-phosphor/gpio/id-button.bb
index 90513b4..cd2bab9 100644
--- a/meta-romulus/recipes-phosphor/gpio/id-button.bb
+++ b/meta-romulus/recipes-phosphor/gpio/id-button.bb
@@ -23,7 +23,7 @@
 
 TMPL = "phosphor-gpio-monitor@.service"
 INSTFMT = "phosphor-gpio-monitor@{0}.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
+TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
 SYSTEMD_SERVICE_${PN} += "id-button-pressed.service"
diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
index c1d50e6..0165929 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
@@ -9,7 +9,7 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}"
 
 TMPL = "obmc-sync-inventory-item@.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
+TGT = "multi-user.target"
 
 ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service"
 UUID_SVC = "system-chassis-motherboard-uuid.service"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
index 9086efb..c1f5ae2 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
@@ -12,4 +12,4 @@
 SyslogIdentifier=phosphor-cooling-type
 
 [Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
+RequiredBy=multi-user.target
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
index c70cbc8..7467d36 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -9,7 +9,7 @@
 
 TMPL_COOLING = "phosphor-cooling-type@.service"
 INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
-COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+COOLING_TGT = "multi-user.target"
 FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
 
 FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type"
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index b60a64b..0fa1105 100644
--- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -2,7 +2,7 @@
 
 TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
 INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
-POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+POWERSUPPLY_TGT = "multi-user.target"
 FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
 
 SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
index f49114d..44b3419 100644
--- a/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
+++ b/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
@@ -10,4 +10,4 @@
 Type=oneshot
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
index ba4e368..56e2d21 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
@@ -12,4 +12,4 @@
 SyslogIdentifier=witherspoon-psu-monitor
 
 [Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
+RequiredBy=multi-user.target
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
index 7f55ecf..c507657 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
@@ -32,7 +32,7 @@
 
 PSU_MONITOR_TMPL = "witherspoon-power-supply-monitor@.service"
 PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service"
-PSU_MONITOR_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+PSU_MONITOR_TGT = "multi-user.target"
 PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}"
 
 FILES_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor"
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index c10e4aa..e9ddccd 100644
--- a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -34,7 +34,7 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}"
 
 SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf"
-SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@wspoon.service"
+SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@wspoon.service"
 
 SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service"