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