diff --git a/base.sh b/base.sh
index b7296a6..6765d67 100755
--- a/base.sh
+++ b/base.sh
@@ -26,4 +26,5 @@ BASE_IMAGE="yunohost-$DEBIAN_VERSION-$CURRENT_VERSION"
 
 
 YNH_DEPENDENCIES="apt apt-transport-https apt-utils avahi-daemon bind9utils ca-certificates cron curl debhelper dnsmasq dnsutils dovecot-antispam dovecot-core dovecot-ldap dovecot-lmtpd dovecot-managesieved equivs fail2ban fake-hwclock git haveged inetutils-ping iproute2 iptables jq ldap-utils libconvert-asn1-perl libdbd-ldap-perl libestr0 libfastjson4 libgssapi-perl libjq1 liblogging-stdlog0 liblognorm5 libmcrypt4 libnet-ldap-perl libnss-ldapd libnss-mdns libnss-myhostname libonig4 libopts25 libpam-ldapd libyaml-0-2 logrotate lsb-release lsof lua5.1 lua-bitop lua-event lua-expat lua-filesystem lua-json lua-ldap lua-lpeg lua-rex-pcre lua-sec lua-socket lua-zlib mailutils mariadb-server netcat-openbsd nginx nginx-extras ntp opendkim-tools openssh-server openssl php7.0-curl php7.0-gd php7.0-mbstring php7.0-mcrypt php7.0-xml php-curl php-fpm php-gd php-gettext php-intl php-ldap php-mbstring php-mcrypt php-mysql php-mysqlnd php-pear php-php-gettext php-xml postfix postfix-ldap postfix-pcre postfix-policyd-spf-perl postsrsd procmail python-argcomplete python-bottle python-dbus python-dnspython python-gevent python-gevent-websocket python-greenlet python-jinja2 python-ldap python-miniupnpc python-openssl python-packaging python-psutil python-publicsuffix python-requests python-toml python-tz python-yaml redis-server resolvconf rspamd rsyslog slapd sudo-ldap unattended-upgrades unscd unzip wget whois"
-BUILD_DEPENDENCIES="git-buildpackage postfix python-setuptools python-pip"
\ No newline at end of file
+BUILD_DEPENDENCIES="git-buildpackage postfix python-setuptools python-pip"
+PIP_PKG="mock pip pytest pytest-mock pytest-sugar requests-mock tox"
\ No newline at end of file
diff --git a/utils.sh b/utils.sh
index a102f8a..7c27080 100755
--- a/utils.sh
+++ b/utils.sh
@@ -168,8 +168,7 @@ fi"
 
 	# Pre install dependencies
 	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes -o Dpkg::Options::=\"--force-confold\" install --assume-yes $YNH_DEPENDENCIES $BUILD_DEPENDENCIES"
-
-	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "pip install -U pip pytest pytest-sugar pytest-mock requests-mock mock"
+	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "pip install -U $PIP_PKG"
 
 	rotate_image "$base_image_to_rebuild-tmp" "$base_image_to_rebuild"
 
@@ -193,9 +192,9 @@ update_image() {
 	wait_container "$image_to_update-tmp"
 
 	lxc exec "$image_to_update-tmp" -- /bin/bash -c "apt-get update"
-	lxc exec "$image_to_update-tmp" -- /bin/bash -c "apt-get upgrade -y"
-
-	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "pip install -U pip pytest pytest-sugar pytest-mock requests-mock mock"
+	lxc exec "$image_to_update-tmp" -- /bin/bash -c "apt-get upgrade --assume-yes"
+	lxc exec "$image_to_update-tmp" -- /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes -o Dpkg::Options::=\"--force-confold\" install --assume-yes $YNH_DEPENDENCIES $BUILD_DEPENDENCIES"
+	lxc exec "$image_to_update-tmp" -- /bin/bash -c "pip install -U $PIP_PKG"
 
 	rotate_image "$image_to_update-tmp" "$image_to_update"