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')}"