diff --git a/scripts/change_url b/scripts/change_url
index 4ba48b3..dbcbc60 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -52,7 +52,7 @@ fi
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..."
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Temporary fix for the API permission
 ynh_permission_url --permission="api" --url="re:$new_domain\/.well-known\/.*" --auth_header="false" --clear_urls
diff --git a/scripts/install b/scripts/install
index e662aa2..39ca4a2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,7 @@ exec_occ maintenance:install \
     --database-user $db_user --database-pass "$db_pwd" \
     --admin-user "admin" --admin-pass "$admin_password" \
     --data-dir "$data_dir/data" \
-    || ynh_die --message="Unable to install Nextcloud"
+    || ynh_die --message="Unable to install $app"
 
 #=================================================
 # CONFIGURE NEXTCLOUD
diff --git a/scripts/remove b/scripts/remove
index c39ac68..a0f4ba6 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEMD SERVICE 
 #=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=5
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=10
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
diff --git a/scripts/restore b/scripts/restore
index ae15393..13d2fe6 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -121,7 +121,7 @@ ynh_systemd_action --action=restart --service_name=fail2ban
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=3
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 90047ff..c401281 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -105,7 +105,7 @@ local mount_id=$(exec_occ files_external:create --output=json \
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Upgrading Nextcloud..." --weight=3
+    ynh_script_progression --message="Upgrading $app..." --weight=3
 
     # Load the last available version
     source upgrade.d/upgrade.last.sh
@@ -146,7 +146,6 @@ then
         # If the current version has the same major version than the next one,
         # then it's the last upgrade to do
         # We also cover the case where the last version is the first of the current major version series
-        # (e.g. 20.0.0 is the latest version)
         if [[ ("$last_major_version" -eq "$current_major_version") || ( ("$last_major_version" -eq "$((current_major_version+1))") && ("$next_version" == "$last_version") ) ]]; then
             current_major_version=last
             # Enable YunoHost patches on Nextcloud sources
@@ -156,7 +155,7 @@ then
         # Load the value for this version
         source upgrade.d/upgrade.$current_major_version.sh
 
-        ynh_print_info --message="Upgrade to Nextcloud $next_version"
+        ynh_print_info --message="Upgrade to $app $next_version"
 
         # Create an app.src for this version of Nextcloud
         cat > ../conf/app.src << EOF
@@ -204,7 +203,7 @@ EOF
         # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
         exec_occ maintenance:mode --off
         exec_occ upgrade \
-        || [ $? -eq 3 ] || ynh_die --message="Unable to upgrade Nextcloud"
+        || [ $? -eq 3 ] || ynh_die --message="Unable to upgrade $app"
 
         # Get the new current version number
         current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
diff --git a/tests.toml b/tests.toml
index 10c825b..bc75dbb 100644
--- a/tests.toml
+++ b/tests.toml
@@ -9,3 +9,4 @@ test_format = 1.0
     test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2"
     test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2"
     test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4"
+    test_upgrade_from.3e60bacf.name = "Upgrade from 28.0.1"