diff --git a/scripts/upgrade b/scripts/upgrade
index 8797bfe..c019f92 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,6 +24,7 @@ final_path=$(ynh_app_setting_get "$app" final_path)
 db_name=$(ynh_app_setting_get "$app" db_name)
 db_user=$(ynh_app_setting_get "$app" db_user)
 db_pwd=$(ynh_app_setting_get "$app" mysqlpwd)
+nonfree=$(ynh_app_setting_get "$app" nonfree)
 
 
 #=================================================
@@ -125,16 +126,28 @@ then
 	    cp -p /usr/share/zabbix/conf/zabbix.conf.php /tmp/
 	    
 	    DEBIAN_FRONTEND=noninteractive apt-mark unhold zabbix-server-mysql zabbix-frontend-php
-	    DEBIAN_FRONTEND=noninteractive apt-get -y download zabbix-frontend-php
-	    ar x ./*.deb
-	    tar xzf control.tar.gz
-	    ynh_replace_string "apache2 | httpd, " "" control
-	    tar --ignore-failed-read -cvzf control.tar.gz {post,pre}{inst,rm} md5sums control
-	    ar rcs zabbix-frontend-php+stretch_all-noapache2.deb debian-binary control.tar.gz data.tar.xz
-	    dpkg -i zabbix-frontend-php+stretch_all-noapache2.deb
-	    rm -fr zabbix-*.deb
-	    apt-get -y --only-upgrade install zabbix-server-mysql zabbix-agent
-	    DEBIAN_FRONTEND=noninteractive apt-mark hold zabbix-server-mysql zabbix-frontend-php
+	    
+        ynh_print_info "Install non-free repository with pinning"
+        if [ $nonfree ];then 
+            echo "deb http://deb.debian.org/debian stretch non-free" >/etc/apt/sources.list.d/non-free.list
+            nonfreefilerepo=$(find /var/cache/yunohost/ -name "non-free_policy")
+            packagenonfreefilerepo=$(find /var/cache/yunohost/ -name "snmp-mibs-downloader_nonfree")
+            cp $nonfreefilerepo /etc/apt/preferences.d/
+            cp $packagenonfreefilerepo /etc/apt/preferences.d/
+        fi
+        
+        ynh_print_info "Update and install dependencies"
+        ynh_package_update
+        if [ $nonfree ];then 
+            ynh_install_app_dependencies libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.2-0 php7.0 php-bcmath php7.0-bcmath ttf-dejavu-core php7.0-bcmath patch smistrip unzip wget fping libcap2-bin libiksemel3 libopenipmi0 libpam-cap libsnmp-base libsnmp30 snmptrapd snmpd snmp-mibs-downloader libjs-prototype jq
+        else
+            ynh_install_app_dependencies libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.2-0 php7.0 php-bcmath php7.0-bcmath ttf-dejavu-core php7.0-bcmath patch smistrip unzip wget fping libcap2-bin libiksemel3 libopenipmi0 libpam-cap libsnmp-base libsnmp30 snmptrapd snmpd libjs-prototype jq
+        
+        fi
+        
+        ynh_package_install zabbix-server-mysql zabbix-agent zabbix-frontend-php
+        DEBIAN_FRONTEND=noninteractive apt-mark hold zabbix-server-mysql zabbix-frontend-php
+
 	    
 	    rm /usr/share/zabbix/conf/zabbix.conf.php
 	    cp -rpf /tmp/zabbix /etc/