diff --git a/classes/obmc-phosphor-systemd.bbclass b/classes/obmc-phosphor-systemd.bbclass
index e892302..9b4419b 100644
--- a/classes/obmc-phosphor-systemd.bbclass
+++ b/classes/obmc-phosphor-systemd.bbclass
@@ -49,7 +49,7 @@
 inherit useradd
 
 _INSTALL_SD_UNITS=""
-SYSTEMD_DEFAULT_TARGET ?= "obmc-standby.target"
+SYSTEMD_DEFAULT_TARGET ?= "multi-user.target"
 envfiledir ?= "${sysconfdir}/default"
 
 # Big ugly hack to prevent useradd.bbclass post-parse sanity checker failure.
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
index 48fc441..a033f60 100644
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Chassis%i (Hard Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
index 84c1dda..c043f37 100644
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Chassis%i (Powered Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
index 080d724..69209e6 100644
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Chassis%i (Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
index 55f6d91..cd7c2fc 100644
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Chassis%i (Power On)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
index 8d7c47e..03036f3 100644
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
@@ -4,4 +4,4 @@
 RefuseManualStop=yes
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
index 4f10419..900995b 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Quiesce Target
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 RefuseManualStop=yes
 Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
index dc280ea..a01b942 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Reboot Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-org-openbmc-control-chassis%i.service
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-startmin@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index ca95d84..84d8701 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
@@ -4,4 +4,4 @@
 RefuseManualStop=yes
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
index 4768a56..012d364 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Power%i Host Off
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 RefuseManualStop=yes
 OnFailure=obmc-chassis-poweroff@%i.target
 OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
index 2bc270c..fe55146 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Start Host%i (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 144b633..790ef6a 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Start Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-org-openbmc-control-chassis%i.service
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-stop@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index eb0a938..fcd51be 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Started)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 After=obmc-host-starting@%i.target
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
index 408139d..52e7bea 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Starting)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 After=obmc-host-start-pre@%i.target
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
index 6e924ad..fc93cdc 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Start Host%i Minimum
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-org-openbmc-control-chassis%i.service
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-stop@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
index e88d3ea..9fc3296 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Stop Host%i (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Before=obmc-host-stopping@%i.target
 Conflicts=obmc-host-startmin@%i.target
 RefuseManualStart=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
index 8e99bcc..d8f3cc9 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Stop Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=mapper-wait@-org-openbmc-control-chassis%i.service
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 After=obmc-chassis-poweroff@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
index 74039fc..c968979 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Stopped)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 Wants=obmc-host-stopping@%i.target
 After=obmc-host-stopping@%i.target
 Before=obmc-power-stop-pre@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
index f087dea..41c4b7f 100644
--- a/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Stopping)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 Wants=obmc-host-stop-pre@%i.target
 After=obmc-host-stop-pre@%i.target
 Before=obmc-host-stopped@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/recipes-core/systemd/obmc-targets/obmc-power-off@.target
index c47b21e..7fda29b 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-off@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Power%i (Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 After=obmc-power-stop@%i.target
 Conflicts=obmc-chassis-poweron@%i.target
 RefuseManualStart=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/recipes-core/systemd/obmc-targets/obmc-power-on@.target
index 52135ff..b55d909 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-on@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Power%i (On)
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 After=obmc-power-start@%i.target
 Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
index 1a1ea63..2b5fdbb 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Power%i On (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/recipes-core/systemd/obmc-targets/obmc-power-start@.target
index a977d5a..720548e 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-start@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Power%i On
 After=obmc-power-start-pre@%i.target
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
index 50d5050..5460914 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
@@ -1,7 +1,7 @@
 [Unit]
 Description=Power%i Off (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
 Wants=obmc-host-stopped@%i.target
 After=obmc-host-stopped@%i.target
 Conflicts=obmc-chassis-poweron@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index f0429d7..fc22eb1 100644
--- a/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
@@ -2,7 +2,7 @@
 Description=Power%i Off
 Wants=obmc-power-stop-pre@%i.target
 After=obmc-power-stop-pre@%i.target
-Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
 Conflicts=obmc-chassis-poweron@%i.target
 Conflicts=fsi-disable.service
 RefuseManualStart=yes
diff --git a/recipes-devtools/iotools/iotools/iotools-setup.service b/recipes-devtools/iotools/iotools/iotools-setup.service
index 2d26930..a5f8f68 100644
--- a/recipes-devtools/iotools/iotools/iotools-setup.service
+++ b/recipes-devtools/iotools/iotools/iotools-setup.service
@@ -8,4 +8,4 @@
 SyslogIdentifier=iotools
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service b/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service
index d661b75..a821566 100644
--- a/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service
+++ b/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service
@@ -8,4 +8,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
index e981dc0..2ca9fe3 100644
--- a/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
+++ b/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
@@ -7,4 +7,4 @@
 SyslogIdentifier=obmc-phosphor-chassisd
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
index 76acd19..cfda54a 100644
--- a/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
+++ b/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
@@ -11,4 +11,4 @@
 TimeoutStartSec=180s
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service b/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
index 88769c7..26345ee 100644
--- a/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
+++ b/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
index 784df40..416fddc 100644
--- a/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
+++ b/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
index 9903e6e..21494ca 100644
--- a/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
+++ b/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/recipes-phosphor/chassis/obmc-op-control-power_git.bb
index ab2a18e..8bae112 100644
--- a/recipes-phosphor/chassis/obmc-op-control-power_git.bb
+++ b/recipes-phosphor/chassis/obmc-op-control-power_git.bb
@@ -90,7 +90,7 @@
 
 # Force the standby target to run the chassis reset check target
 RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target"
-SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+SYSD_TGT = "multi-user.target"
 RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target"
 RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/recipes-phosphor/console/obmc-console/obmc-console@.service b/recipes-phosphor/console/obmc-console/obmc-console@.service
index 26e452c..246544a 100644
--- a/recipes-phosphor/console/obmc-console/obmc-console@.service
+++ b/recipes-phosphor/console/obmc-console/obmc-console@.service
@@ -9,4 +9,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service b/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
index e819e35..362e06a 100644
--- a/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
+++ b/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service
@@ -15,4 +15,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
index 9440f0c..b9d9360 100644
--- a/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
+++ b/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
@@ -8,4 +8,4 @@
 SyslogIdentifier=phosphor-dbus-monitor
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index 5e34814..5f7bd95 100644
--- a/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -17,4 +17,4 @@
 EnvironmentFile={envfiledir}/obmc/mapper
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
index 0e8ef3b..aa3837d 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
+++ b/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
@@ -7,4 +7,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
index 131c8cd..515f8fc 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
+++ b/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/recipes-phosphor/fans/files/obmc-phosphor-fand.service
index 9584749..a7d0b4b 100644
--- a/recipes-phosphor/fans/files/obmc-phosphor-fand.service
+++ b/recipes-phosphor/fans/files/obmc-phosphor-fand.service
@@ -7,4 +7,4 @@
 SyslogIdentifier=obmc-phosphor-fand
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index ec6391d..adcee26 100644
--- a/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
@@ -14,4 +14,4 @@
 Environment="PYTHONUNBUFFERED=1"
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
index 3a7f3d5..2695919 100644
--- a/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
+++ b/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
@@ -7,4 +7,4 @@
 SyslogIdentifier=obmc-phosphor-flashd
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index de196d0..dcb561e 100644
--- a/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ b/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
@@ -9,4 +9,4 @@
 SyslogIdentifier=obmc-flash-init
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
index 842add3..53502fc 100644
--- a/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ b/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
@@ -11,4 +11,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
index bb97d8a..95396e3 100644
--- a/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
+++ b/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
@@ -12,4 +12,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
index f3ff75d..55ee6d4 100644
--- a/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
+++ b/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
index ef1a1c4..bd46bcd 100644
--- a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
+++ b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
@@ -13,4 +13,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
index a4934f8..ea7cc15 100644
--- a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
+++ b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
index 1ff33a2..7141841 100644
--- a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
+++ b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service
@@ -7,4 +7,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
index 0141245..a8f6159 100644
--- a/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
+++ b/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
index df75824..acb6af7 100644
--- a/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
+++ b/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
@@ -10,4 +10,4 @@
 SyslogIdentifier=phosphor-gpio-presence
 
 [Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
+RequiredBy=multi-user.target
diff --git a/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
index e922711..6619c18 100644
--- a/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
+++ b/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/host/phosphor-host-postd_git.bb b/recipes-phosphor/host/phosphor-host-postd_git.bb
index 5692eb9..e1114e8 100644
--- a/recipes-phosphor/host/phosphor-host-postd_git.bb
+++ b/recipes-phosphor/host/phosphor-host-postd_git.bb
@@ -25,10 +25,9 @@
 SERVICE_FILE = "lpcsnoop.service"
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}"
-SYSTEMD_DEFAULT_TARGET ?= "obmc-standby.target"
 
 EXTRA_OECONF = " \
   SNOOP_DEVICE="${SNOOP_DEVICE}" \
   POST_CODE_BYTES="${POST_CODE_BYTES}" \
-  SYSTEMD_TARGET="${SYSTEMD_DEFAULT_TARGET}" \
+  SYSTEMD_TARGET="multi-user.target" \
 "
diff --git a/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service b/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
index 5d58709..4cbeb84 100644
--- a/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
+++ b/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
@@ -9,4 +9,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service b/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
index c3ae5ad..cf2bc9a 100644
--- a/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
+++ b/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
index f5abfb5..bf69c7d 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
index 4bae65d..ae8c038 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
@@ -11,4 +11,4 @@
 SyslogIdentifier=phosphor-read-eeprom
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index 29d4967..8beb732 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -25,4 +25,4 @@
 BusName=xyz.openbmc_project.Control.Host
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service b/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
index fbe9380..328491f 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
@@ -8,4 +8,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf b/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
index a300f6a..d382d37 100644
--- a/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
+++ b/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf
@@ -1,3 +1,3 @@
 [Unit]
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
+Wants=multi-user.target
+After=multi-user.target
diff --git a/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
index 4810a7e..6b5c7b9 100644
--- a/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
+++ b/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
@@ -9,4 +9,4 @@
 SyslogIdentifier=phosphor-fru-fault-monitor
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
index 2f9a25e..8e852a4 100644
--- a/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
+++ b/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
@@ -10,4 +10,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/leds/phosphor-led-manager_git.bb b/recipes-phosphor/leds/phosphor-led-manager_git.bb
index 3b3ac82..8689e06 100644
--- a/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -38,7 +38,7 @@
 SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service"
 SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service"
 
-SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@bmc_booted.service"
+SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service"
 
 STATES = "start stop"
 TMPLFMT = "obmc-led-group-{0}@.service"
diff --git a/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/recipes-phosphor/logging/phosphor-hostlogger_git.bb
index 97a3f94..5a6a4d2 100644
--- a/recipes-phosphor/logging/phosphor-hostlogger_git.bb
+++ b/recipes-phosphor/logging/phosphor-hostlogger_git.bb
@@ -26,14 +26,13 @@
 # systemd service setup
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "hostlogger.service"
-SYSTEMD_DEFAULT_TARGET ?= "multi-user.target"
 
 # Host TTY setup
 OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0"
 
 # Extra parameters for 'configure' script
 EXTRA_OECONF = "HOST_TTY=${OBMC_CONSOLE_HOST_TTY} \
-                SYSTEMD_TARGET=${SYSTEMD_DEFAULT_TARGET}"
+                SYSTEMD_TARGET=multi-user.target"
 
 # Source code repository
 S = "${WORKDIR}/git"
diff --git a/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
index 946c3bf..77936c7 100644
--- a/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
+++ b/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service b/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service
index 240839f..e1b1d66 100644
--- a/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service
+++ b/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/mboxd/mboxd/mboxd.service b/recipes-phosphor/mboxd/mboxd/mboxd.service
index 28e4ff4..b13f72c 100644
--- a/recipes-phosphor/mboxd/mboxd/mboxd.service
+++ b/recipes-phosphor/mboxd/mboxd/mboxd.service
@@ -13,4 +13,4 @@
 SyslogIdentifier=mboxd
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/network/inarp/inarp.service b/recipes-phosphor/network/inarp/inarp.service
index 5d26559..6e85131 100644
--- a/recipes-phosphor/network/inarp/inarp.service
+++ b/recipes-phosphor/network/inarp/inarp.service
@@ -7,4 +7,4 @@
 Restart=always
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/network/network_git.bb b/recipes-phosphor/network/network_git.bb
index 82c276f..aa6addb 100644
--- a/recipes-phosphor/network/network_git.bb
+++ b/recipes-phosphor/network/network_git.bb
@@ -25,8 +25,7 @@
 SERVICE_FILE = "xyz.openbmc_project.Network.service"
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}"
-SYSTEMD_DEFAULT_TARGET ?= "obmc-standby.target"
 
 EXTRA_OECONF = " \
-  SYSTEMD_TARGET="${SYSTEMD_DEFAULT_TARGET}" \
+  SYSTEMD_TARGET="multi-user.target" \
 "
diff --git a/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
index f5a1d72..6b7ffcd 100644
--- a/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
+++ b/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service
@@ -10,4 +10,4 @@
 BusName=xyz.openbmc_project.Network.SNMP
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
index 50e2166..168d2c7 100644
--- a/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
+++ b/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
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
diff --git a/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/recipes-phosphor/system/files/obmc-phosphor-sysd.service
index d4dacf5..246d985 100644
--- a/recipes-phosphor/system/files/obmc-phosphor-sysd.service
+++ b/recipes-phosphor/system/files/obmc-phosphor-sysd.service
@@ -7,4 +7,4 @@
 SyslogIdentifier=obmc-phosphor-sysd
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
index 9685efe..937c3bb 100644
--- a/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
+++ b/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.LDAP.PrivilegeMapper.service b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.LDAP.PrivilegeMapper.service
index 38c6360..abd0e69 100644
--- a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.LDAP.PrivilegeMapper.service
+++ b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.LDAP.PrivilegeMapper.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service
index dc6d0da..20e518d 100644
--- a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service
+++ b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.Ldap.Config.service
@@ -12,4 +12,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
index f8926e7..67d8b8b 100644
--- a/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
+++ b/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service
@@ -9,4 +9,4 @@
 BusName={BUSNAME}
 
 [Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
+WantedBy=multi-user.target
diff --git a/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
index 3fd688f..bc1e99e 100644
--- a/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
+++ b/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
@@ -11,4 +11,4 @@
 	  fbterm.service
 
 [Install]
-WantedBy=obmc-standby.target
+WantedBy=multi-user.target