diff --git a/README.md b/README.md
index 845361a..87bb290 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password).
 
-**Shipped version:** 1.8.2.2
+**Shipped version:** 2.0.8
 
 ## Configuration
 
@@ -29,13 +29,13 @@ How to configure this app: From an admin panel or a plain file with SSH.
 
 #### Multi-user support
 
-Are LDAP and HTTP auth supported? **No**
-Can the app be used by multiple users? **No**
+ * Are LDAP and HTTP auth supported? **No**
+ * Can the app be used by multiple users? **No**
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mosquitto/)
+ * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/)
+ * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mosquitto/)
 
 ## Links
 
diff --git a/README_fr.md b/README_fr.md
index 75d48cb..b3b03f8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -15,7 +15,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 
 [Mosquitto](https://mosquitto.org/) vous permet d'interconnecter vos objets et applications avec un broker MQTT open source. Le client peut publier ou s'abonner après authentification (nom d'utilisateur, mot de passe).
 
-**Version incluse :** 1.8.2.2
+**Version incluse :** 2.0.8
 
 ## Configuration
 
@@ -29,13 +29,13 @@ Comment configurer cette application : via le panneau d'administration ou un fic
 
 #### Support multi-utilisateur
 
-* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
-* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Non**
+ * L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
+ * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Non**
 
 #### Architectures supportées
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mosquitto/)
+ * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/)
+ * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mosquitto.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mosquitto/)
 
 ## Liens
 
diff --git a/check_process b/check_process
index d6cd5fe..3048d3a 100644
--- a/check_process
+++ b/check_process
@@ -1,15 +1,15 @@
 ;; Test complet
 	; Manifest
 		username="mosquitto"
-		password="pass" (PASSWORD)
-		port="1883"	(PORT)
+		password="pass"
+		port="1883"
 	; Checks
 		pkg_linter=1
 		setup_nourl=1
 		upgrade=1
-		upgrade=0	from_commit=CommitHash
+		upgrade=1	from_commit=3423395180264623342ee41946d10f30cd38e471
 		backup_restore=1
-		port_already_use=0
+		port_already_use=1 (1883)
 ;;; Options
-Email=
-Notification=none
+Email=grena+mosquitto@grenabox.fr
+Notification=yes
diff --git a/manifest.json b/manifest.json
index 3c5ec0a..d7886b0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Interconnect your objects and applications with an open source MQTT broker",
         "fr": "Interconnecter vos objets et vos applications grâce à un serveur MQTT open source"
     },
-    "version": "1.5.7~ynh1",
+    "version": "2.0.8~ynh1",
     "url": "https://mosquitto.org/",
     "license": "MIT",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3af06d2..25159c0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,6 +8,10 @@
 password_file="/etc/mosquitto/passwd"
 config_file="/etc/mosquitto/conf.d/default.conf"
 
+# extra repository used by the app
+extra_repo="deb https://repo.mosquitto.org/debian buster main"
+extra_repo_key="http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key"
+
 # dependencies used by the app
 pkg_dependencies="mosquitto"
 
diff --git a/scripts/install b/scripts/install
index 3590db5..eb48700 100644
--- a/scripts/install
+++ b/scripts/install
@@ -53,7 +53,7 @@ ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
 #=================================================
 ynh_script_progression --message="Installing dependencies..." --weight=20
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_extra_app_dependencies --repo="$extra_repo" --package="$pkg_dependencies" --key="$extra_repo_key" --name="$app"
 
 #=================================================
 # SPECIFIC SETUP
diff --git a/scripts/restore b/scripts/restore
index 2e5645f..1596751 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -46,8 +46,7 @@ ynh_script_progression --message="Restoring the Fail2Ban configuration..." --wei
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=20
 
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_extra_app_dependencies --repo="$extra_repo" --package="$pkg_dependencies" --key="$extra_repo_key" --name="$app"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
diff --git a/scripts/upgrade b/scripts/upgrade
index d32660d..7392630 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,7 +52,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=10
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_extra_app_dependencies --repo="$extra_repo" --package="$pkg_dependencies" --key="$extra_repo_key" --name="$app"
 
 #=================================================
 # SPECIFIC UPGRADE