diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
index 4d9c14628..76aba1273 100644
--- a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
@@ -10,4 +10,4 @@ Type=simple
 ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-nl80211-%I.conf -Dnl80211 -i%I
 
 [Install]
-Alias=network.target.wants/wpa_supplicant-nl80211@wlan0.service
+Alias=multi-user.target.wants/wpa_supplicant-nl80211@wlan0.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
index f2e7f1121..ff384ae90 100644
--- a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
@@ -10,4 +10,4 @@ Type=simple
 ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-wired-%I.conf -Dwired -i%I
 
 [Install]
-Alias=network.target.wants/wpa_supplicant-wired@wlan0.service
+Alias=multi-user.target.wants/wpa_supplicant-wired@wlan0.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
index 5b947ac02..4351ad8f5 100644
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -7,5 +7,5 @@ BusName=fi.epitest.hostap.WPASupplicant
 ExecStart=@BINDIR@/wpa_supplicant -u
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
 Alias=dbus-fi.epitest.hostap.WPASupplicant.service
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service.in b/wpa_supplicant/systemd/wpa_supplicant@.service.in
index 0340b4de0..c21556759 100644
--- a/wpa_supplicant/systemd/wpa_supplicant@.service.in
+++ b/wpa_supplicant/systemd/wpa_supplicant@.service.in
@@ -10,4 +10,4 @@ Type=simple
 ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
 
 [Install]
-Alias=network.target.wants/wpa_supplicant@wlan0.service
+Alias=multi-user.target.wants/wpa_supplicant@wlan0.service