diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 049ca7f..6bb82e5 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -114,6 +114,9 @@ if [ "$1" = "lxde" ]; then
 	sed -i 's/pcmanfm -d/pcmanfm -d --desktop/g' /etc/xdg/lxsession/LXDE/autostart
 	setup_cpufrequtils
 elif [ "$1" = "e17" ]; then
+	# We prefer using connman on E17 now
+	rc-update del NetworkManager default
+	rc-update add connman default
 	# Fix ~/.dmrc to have it load E17
         echo "[Desktop]" > /etc/skel/.dmrc
         echo "Session=enlightenment" >> /etc/skel/.dmrc