diff --git a/scripts/install b/scripts/install
index 3202b11..1c2d639 100755
--- a/scripts/install
+++ b/scripts/install
@@ -71,11 +71,9 @@ ynh_app_setting_set $app log_path $log_path
 #=================================================
 ynh_print_info "Installing dependencies..."
 
-echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" | tee /etc/apt/sources.list.d/z-push.list
-wget -qO - http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key | sudo apt-key add -
-yunohost tools update
-ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover
-ynh_install_app_dependencies php-memcached php-cli php-soap 
+ynh_install_extra_repo --repo="deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /"
+ynh_package_update
+ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover php-memcached php-cli php-soap 
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/remove b/scripts/remove
index 9891b40..fabed57 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -32,7 +32,7 @@ ynh_print_info "Removing dependencies"
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
-ynh_secure_remove "/etc/apt/sources.list.d/z-push.list"
+ynh_remove_extra_repo --name=z-push
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/restore b/scripts/restore
index 0af425d..b26565c 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -83,12 +83,9 @@ ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf"
 # REINSTALL DEPENDENCIES
 #=================================================
 
-
-echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" | tee /etc/apt/sources.list.d/z-push.list
-wget -qO - http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key | sudo apt-key add -
-yunohost tools update
-ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover
-ynh_install_app_dependencies php-memcached php-cli php-soap 
+ynh_install_extra_repo --repo="deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /"
+ynh_package_update
+ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover php-memcached php-cli php-soap 
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index bf76fea..6c4290b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -97,12 +97,9 @@ ynh_add_nginx_config
 #=================================================
 ynh_print_info "Upgrading dependencies..."
 
-echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" | tee /etc/apt/sources.list.d/z-push.list
-wget -qO - http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key | sudo apt-key add -
-yunohost tools update
-ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover
-ynh_install_app_dependencies php-memcached php-cli php-soap 
-
+ynh_install_extra_repo --repo="deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /"
+ynh_package_update
+ynh_install_app_dependencies z-push-common z-push-backend-caldav z-push-backend-carddav z-push-backend-combined z-push-backend-imap z-push-backend-ldap z-push-backend-galsearch-ldap z-push-autodiscover php-memcached php-cli php-soap 
 
 #=================================================
 # PHP-FPM CONFIGURATION