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