diff --git a/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/recipes-connectivity/modemmanager/modemmanager_%.bbappend
index d78db2e..3c1bb88 100644
--- a/recipes-connectivity/modemmanager/modemmanager_%.bbappend
+++ b/recipes-connectivity/modemmanager/modemmanager_%.bbappend
@@ -11,3 +11,5 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/77-mm-netmodule-whitelist.rules ${D}${libdir}/udev/rules.d/
     sed -i -e 's/bin\/ModemManager/bin\/ModemManager --filter-policy=WHITELIST-ONLY/g' ${D}${systemd_unitdir}/system/ModemManager.service
 }
+
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/recipes-connectivity/wwan-config/wwan-config.bb b/recipes-connectivity/wwan-config/wwan-config.bb
index 71c5a7c..99d6ec2 100644
--- a/recipes-connectivity/wwan-config/wwan-config.bb
+++ b/recipes-connectivity/wwan-config/wwan-config.bb
@@ -40,13 +40,13 @@ do_install_append() {
 
     install -d ${D}/${sysconfdir}/wwan
     if [ ! -z "${WWAN_NBR}" ] ; then
-        install -d ${D}${sysconfdir}/systemd/system/ModemManager.service.requires/
+        install -d ${D}${sysconfdir}/systemd/system/multi-user.target.wants/
         for i in `seq 0 ${WWAN_NBR}`; do 
             if [ $i = ${WWAN_NBR} ]; then continue; fi
 
             if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ] ; then
                 ln -sf ${systemd_unitdir}/system/wwan-config@.service \
-                    ${D}${sysconfdir}/systemd/system/ModemManager.service.requires/wwan-config@wwan$i.service
+                    ${D}${sysconfdir}/systemd/system/multi-user.target.wants/wwan-config@wwan$i.service
             fi
 
             install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/wwan/wwan$i.conf
diff --git a/recipes-connectivity/wwan-config/wwan-config/wwan-config@.service b/recipes-connectivity/wwan-config/wwan-config/wwan-config@.service
index d899b8b..887eb61 100644
--- a/recipes-connectivity/wwan-config/wwan-config/wwan-config@.service
+++ b/recipes-connectivity/wwan-config/wwan-config/wwan-config@.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=WWAN configurator for device %I
-Before=ModemManager.service
 
 [Service]
 Type=forking
@@ -9,5 +8,5 @@ PIDFile=/run/%I.pid
 Restart=on-failure
 
 [Install]
-RequiredBy=ModemManager.service
+RequiredBy=multi-user.target