diff --git a/README.md b/README.md
index f70c189..9f76d11 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Platform to create documentation/wiki content
 
-**Shipped version:** 21.04.6~ynh1
+**Shipped version:** 21.05.0~ynh1
 
 **Demo:** https://demo.bookstackapp.com
 
diff --git a/README_fr.md b/README_fr.md
index ca86649..47be435 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Plateforme pour créer du contenu de documentation/wiki 
 
-**Version incluse :** 21.04.6~ynh1
+**Version incluse :** 21.05.0~ynh1
 
 **Démo :** https://demo.bookstackapp.com
 
diff --git a/check_process b/check_process
index 2099873..4458650 100644
--- a/check_process
+++ b/check_process
@@ -1,6 +1,3 @@
-# See here for more informations
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
 ;; Test complet
 	; Manifest
 		domain="domain.tld"
@@ -15,7 +12,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=ad39f14ce54d80d30c2e847d0b47a7b5af6b6920
+		upgrade=1	from_commit=b7abcc46a0c3c90c9b36d4c00e40d26a1aab429b
 		backup_restore=1
 		multi_instance=0
 		change_url=0
@@ -23,6 +20,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=ad39f14ce54d80d30c2e847d0b47a7b5af6b6920
-		name=Testing
+	; commit=b7abcc46a0c3c90c9b36d4c00e40d26a1aab429b
+		name=Testing (#30)
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
diff --git a/conf/app.src b/conf/app.src
index 59ec605..309f75c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.6.tar.gz
-SOURCE_SUM=2aa677448e5eb255e3045c1a4956873aea2216a50b4c8328ea6c107a5573486c
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.05.tar.gz
+SOURCE_SUM=44f4fe9fab55e4d9c2711175da5d8c782e8431d766b53af9248ea7833173721c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index f575f57..75f8d8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Platform to create documentation/wiki content",
         "fr": "Plateforme pour créer du contenu de documentation/wiki "
     },
-    "version": "21.04.6~ynh1",
+    "version": "21.05.0~ynh1",
     "url": "https://www.bookstackapp.com/",
     "upstream": {
         "license": "MIT",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7247d75..ef8d8ef 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,7 @@ YNH_PHP_VERSION="7.3"
 
 extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd"
 
-YNH_COMPOSER_VERSION=1.10.17
+YNH_COMPOSER_VERSION=2.0.14
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index cb8e47c..4ffd131 100644
--- a/scripts/install
+++ b/scripts/install
@@ -74,6 +74,11 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+# Set permissions to app files
+chmod 755 $final_path
+chown -R $app:www-data $final_path
+chmod -R o-rwx $final_path
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -105,6 +110,7 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar
 
 mail_pwd=$(ynh_string_random --length=12)
 ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
+chmod 600 $final_path/.env
 
 #=================================================
 # FINAL BOOKSTACK INSTALL
@@ -116,18 +122,6 @@ pushd $final_path
 	php$phpversion artisan migrate --no-interaction --force
 popd
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod 755 $final_path
-chown -R $app:www-data $final_path
-chmod -R o-rwx $final_path
-chmod 600 $final_path/.env
-
 #=================================================
 # SETUP SSOWAT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 3c96378..6039fae 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -62,10 +62,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$final_path"
 
-#=================================================
-# RESTORE USER RIGHTS
-#=================================================
-
 # Restore permissions on app files
 chmod 755 $final_path
 chown -R $app:www-data $final_path
diff --git a/scripts/upgrade b/scripts/upgrade
index 21ac861..d2709ca 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,6 +65,12 @@ then
 	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env"
 fi
 
+# Set permissions on app files
+chmod 755 $final_path
+chown -R $app:www-data $final_path
+chmod -R o-rwx $final_path
+chmod 600 $final_path/.env
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -100,18 +106,6 @@ pushd $final_path
  	&& php artisan view:clear --no-interaction
 popd
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chmod 755 $final_path
-chown -R $app:www-data $final_path
-chmod -R o-rwx $final_path
-chmod 600 $final_path/.env
-
 #=================================================
 # RELOAD NGINX
 #=================================================