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"