diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 3ab24106ff36fb104c8d789cf13dc3532fc7b8b3..05a8cc832c83446fee2ebc573384fa332e908b94 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -1351,6 +1351,12 @@ cat > "${DIR}/cleanup_script.sh" <<-__EOF__
 	}
 
 	cleanup
+
+	if [ -f /usr/bin/connmanctl ] ; then
+		rm -rf /etc/resolv.conf || true
+		ln -s /run/connman/resolv.conf /etc/resolv.conf
+	fi
+
 	rm -f /cleanup_script.sh || true
 __EOF__