diff --git a/README.md b/README.md
index 9641203..4492c86 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,19 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Bug tracking system.
+MantisBT is an open source issue tracker that provides a delicate balance between simplicity and power. Users are able to get started in minutes and start managing their projects while collaborating with their teammates and clients effectively. 
 
-**Shipped version:** 2.25.2~ynh1
+**Shipped version:** 2.25.2~ynh2
 
 **Demo:** https://mantisbt.org/bugs/my_view_page.php
 
+## Screenshots
+
+![](./doc/screenshots/modern_my_view.png)
+
 ## Documentation and resources
 
 * Official app website: https://mantisbt.org/
-* Official user documentation: https://yunohost.org/en/app_mantis
 * Official admin documentation: https://mantisbt.org/documentation.php
 * Upstream app code repository: https://github.com/mantisbt/mantisbt/
 * YunoHost documentation for this app: https://yunohost.org/app_mantis
diff --git a/README_fr.md b/README_fr.md
index d094c98..6e84c90 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,16 +11,19 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Système de suivi des bugs.
+MantisBT is an open source issue tracker that provides a delicate balance between simplicity and power. Users are able to get started in minutes and start managing their projects while collaborating with their teammates and clients effectively. 
 
-**Version incluse :** 2.25.2~ynh1
+**Version incluse :** 2.25.2~ynh2
 
 **Démo :** https://mantisbt.org/bugs/my_view_page.php
 
+## Captures d'écran
+
+![](./doc/screenshots/modern_my_view.png)
+
 ## Documentations et ressources
 
 * Site officiel de l'app : https://mantisbt.org/
-* Documentation officielle utilisateur : https://yunohost.org/en/app_mantis
 * Documentation officielle de l'admin : https://mantisbt.org/documentation.php
 * Dépôt de code officiel de l'app : https://github.com/mantisbt/mantisbt/
 * Documentation YunoHost pour cette app : https://yunohost.org/app_mantis
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f09671a..27ea414 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..5283b13
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+MantisBT is an open source issue tracker that provides a delicate balance between simplicity and power. Users are able to get started in minutes and start managing their projects while collaborating with their teammates and clients effectively. 
\ No newline at end of file
diff --git a/doc/screenshot/modern_my_view.png b/doc/screenshots/modern_my_view.png
similarity index 100%
rename from doc/screenshot/modern_my_view.png
rename to doc/screenshots/modern_my_view.png
diff --git a/manifest.json b/manifest.json
index f57b1ae..51a780d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,17 +3,16 @@
     "id": "mantis",
     "packaging_format": 1,
     "description": {
-        "en": "Bug tracking system.",
-        "fr": "Système de suivi des bugs."
+        "en": "Bug tracking system",
+        "fr": "Système de suivi des bugs"
     },
-    "version": "2.25.2~ynh1",
+    "version": "2.25.2~ynh2",
     "url": "https://www.mantisbt.org/",
     "upstream": {
         "license": "GPL-3.0-only",
         "website": "https://mantisbt.org/",
         "demo": "https://mantisbt.org/bugs/my_view_page.php",
         "admindoc": "https://mantisbt.org/documentation.php",
-        "userdoc": "https://yunohost.org/en/app_mantis",
         "code": "https://github.com/mantisbt/mantisbt/"
     },
     "license": "GPL-3.0-only",
@@ -22,7 +21,7 @@
         "email": "liberodark@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -34,8 +33,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -45,8 +43,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "is_public",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 862e440..76661c2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="7.3"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-bcmath"
+pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-bcmath"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index a6cd744..e5612b6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -24,6 +24,7 @@ path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 default_access_level=$YNH_APP_ARG_DEFAULT_ACCESS_LEVEL
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -47,8 +48,16 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
+ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 ynh_app_setting_set --app=$app --key=default_access_level --value=$default_access_level
 
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -105,8 +114,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+ynh_add_fpm_config --usage=low --footprint=low
 
 #=================================================
 # SPECIFIC SETUP
@@ -165,8 +173,6 @@ ynh_script_progression --message="Configuring permissions..." --weight=1
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
diff --git a/scripts/restore b/scripts/restore
index 50cff37..065838e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 
@@ -75,8 +73,13 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..."
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-# Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 9a1d911..276e860 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -133,13 +133,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC UPGRADE