diff --git a/scripts/install b/scripts/install
index b0ea608..0a2fcf1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -106,9 +106,9 @@ chmod 400 "$data_dir/groups/YunoHost_Users.json"
 chown $app:$app "$data_dir/groups/YunoHost_Users.json"
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 public_ip4="$(curl -s ip.yunohost.org)" || true
 
diff --git a/scripts/upgrade b/scripts/upgrade
index a4d96f6..5bf9c01 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,14 +60,6 @@ ynh_replace_string --match_string="<div class=\"galene-header\">Galène</div>" -
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -133,23 +125,19 @@ chmod 400 "$data_dir/groups/YunoHost_Users.json"
 chown $app:$app "$data_dir/groups/YunoHost_Users.json"
 
 #=================================================
-# SETUP SYSTEMD
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 public_ip4="$(curl -s ip.yunohost.org)" || true
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 # Create a dedicated systemd config
 ynh_add_systemd_config
 ynh_add_systemd_config --service=${app}_ldap --template="ldap.service"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn"
 yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server"