diff --git a/scripts/change_url b/scripts/change_url
index ae914ad..3a9b28d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -32,7 +32,7 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index 549274a..b642a6b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -63,7 +63,7 @@ chown root:$admin "$install_dir/code-server.env"
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index d11552b..52d44d0 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,10 +10,11 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD REMOVE
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEMD SERVICE 
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
diff --git a/scripts/restore b/scripts/restore
index b12de36..2120dee 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,7 +27,7 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-chown -R $admin:$admin "$data_dir"
+chown -R $app:www-data "$data_dir"
 
 #=================================================
 # SPECIFIC RESTORATION
@@ -46,19 +46,12 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
 yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$app.log"
 
-#=================================================
-# SET PERMISSION FOR THE USER
-#=================================================
-ynh_permission_update --permission="main" --add="$admin"
-
-chown -R $admin:$admin "$data_dir"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index df822cd..44d86ab 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -82,14 +82,6 @@ chmod -R o-rwx "$install_dir"
 chown -R root:$admin "$install_dir"
 chmod +x "$install_dir/bin/code-server"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -111,6 +103,9 @@ chown $admin:$admin "$install_dir/config.yaml" "$install_dir/code-server.env"
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
@@ -124,7 +119,7 @@ yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$a
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT