diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 6d300c23546805f48eece45b7fbacad3ffc86c6c..69e50c2d0c4a9534cb7d102ea41f439a89ebcbcf 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -965,6 +965,10 @@ cat > "${DIR}/chroot_script.sh" <<-__EOF__
 			sed -i -e 's:#SystemMaxUse=:SystemMaxUse=8M:g' /etc/systemd/systemd-journald.conf
 		fi
 
+		if [ -f /etc/systemd/journald.conf ] ; then
+			sed -i -e 's:#SystemMaxUse=:SystemMaxUse=8M:g' /etc/systemd/journald.conf
+		fi
+
 		#systemd v215: systemd-timesyncd.service replaces ntpdate
 		#enabled by default in v216 (not in jessie)
 		if [ -f /lib/systemd/system/systemd-timesyncd.service ] ; then
@@ -1005,6 +1009,11 @@ cat > "${DIR}/chroot_script.sh" <<-__EOF__
 		if [ -f /lib/systemd/system/apt-daily.service ] ; then
 			systemctl disable apt-daily.service || true
 		fi
+
+		#We use connman...
+		if [ -f /lib/systemd/system/systemd-networkd.service ] ; then
+			systemctl disable systemd-networkd.service || true
+		fi
 	}
 
 	grub_tweaks () {