diff --git a/README.md b/README.md
index b9dd14b..f2a3ae6 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->
 
-# Snappymail for YunoHost
+# SnappyMail for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/snappymail.svg)](https://dash.yunohost.org/appci/app/snappymail) ![](https://ci-apps.yunohost.org/ci/badges/snappymail.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/snappymail.maintain.svg)  
-[![Install Snappymail with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail)
+[![Install SnappyMail with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Snappymail quickly and simply on a YunoHost server.
+> *This package allows you to install SnappyMail quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
@@ -18,13 +18,17 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Shipped version:** 2.15.3~ynh1
+**Shipped version:** 2.16.1~ynh1
 
 **Demo:** https://snappymail.eu/demo/
 
 ## Disclaimers / important information
 
-Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/webmail/data/_data_/_default_/admin_password.txt`.
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
+Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
 
 ## Documentation and resources
 
diff --git a/README_fr.md b/README_fr.md
index 221e74f..492d8bb 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,12 +1,12 @@
-# Snappymail pour YunoHost
+# SnappyMail pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/snappymail.svg)](https://dash.yunohost.org/appci/app/snappymail) ![](https://ci-apps.yunohost.org/ci/badges/snappymail.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/snappymail.maintain.svg)  
-[![Installer Snappymail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail)
+[![Installer SnappyMail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Snappymail rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d'installer SnappyMail rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
@@ -14,13 +14,17 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Version incluse :** 2.15.3~ynh1
+**Version incluse :** 2.16.1~ynh1
 
 **Démo :** https://snappymail.eu/demo/
 
 ## Avertissements / informations importantes
 
-Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/webmail/data/_data_/_default_/admin_password.txt`.
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
+Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
 
 ## Documentations et ressources
 
diff --git a/check_process b/check_process
index 9f8650a..52b9ba5 100644
--- a/check_process
+++ b/check_process
@@ -14,7 +14,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#upgrade=1	from_commit=CommitHash
+		#upgrade=1	from_commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -22,6 +22,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
+	; commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
+		name=Merge pull request #13 from YunoHost-Apps/testing
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
diff --git a/conf/app.src b/conf/app.src
index 8e20434..5ec64bd 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.15.3/snappymail-2.15.3.tar.gz
-SOURCE_SUM=c5c0f3185b1ae9adb17ea61db3904b1f149d9f7fda128f173a777f8e45955d00
+SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.1/snappymail-2.16.1.tar.gz
+SOURCE_SUM=bf62279e2b1051b566a5a5d080a71555ae7c5e134d36d395a442f5a46e12729f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index cf0b76a..00c24da 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1 +1,5 @@
-Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/webmail/data/_data_/_default_/admin_password.txt`.
+:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
+
+:heavy_exclamation_mark: Be sure to immediately change the default password!
+
+Open the admin UI `https://example.com/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`.
diff --git a/manifest.json b/manifest.json
index 97e5ab0..b318872 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,12 +1,12 @@
 {
-    "name": "Snappymail",
+    "name": "SnappyMail",
     "id": "snappymail",
     "packaging_format": 1,
     "description": {
         "en": "Simple, modern, lightweight & fast web-based email client",
         "fr": "Client de messagerie Web simple, moderne, léger et rapide"
     },
-    "version": "2.15.3~ynh1",
+    "version": "2.16.1~ynh1",
     "url": "https://snappymail.eu/",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.4-fpm"
+        "php8.0-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index caaacd9..8e040bd 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php-uuid php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
+pkg_dependencies="php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index c84ec01..a7cfb5d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,6 +27,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 614d56f..a1b86b0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -57,9 +57,13 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/_data_"
+	ynh_setup_source --dest_dir="$final_path"
+	# Remove the app directory securely
+	ynh_secure_remove --file="$final_path/snappymail/v/2.15.3"
 fi
 
+
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"