diff --git a/conf/systemd.service b/conf/systemd.service
index 8399c8b..be2c2fb 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Write Freely Service
+Description=Write Freely __APP__ Service
 After=network.target
 
 [Service]
diff --git a/scripts/backup b/scripts/backup
index 4340e07..f8f57ec 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -38,7 +38,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
 
 #=================================================
 # BACKUP THE APP MAIN DIR
@@ -75,7 +75,7 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/change_url b/scripts/change_url
index 75ebae9..264bcbb 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -58,7 +58,7 @@ fi
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -112,7 +112,7 @@ ynh_store_file_checksum --file="$final_path/config.ini"
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 367bbd5..048978d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -175,18 +175,19 @@ chown -R "$app":"$app" "$final_path"
 #=================================================
 
 # if using yunohost version 3.2 or more in the 'manifest.json', a description can be added
-yunohost service add $app --description "$app daemon for WriteFreely" --log_type systemd
+yunohost service add $app --description "$app daemon for WriteFreely" --log "/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_systemd_action --service_name=$app --action=start
+# Start a systemd service
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
 
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_print_info --message="Configuring SSOwat ..."
+ynh_print_info --message="Configuring SSOwat..."
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
diff --git a/scripts/remove b/scripts/remove
index 72e5063..a4c8a5f 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -67,6 +67,14 @@ ynh_print_info --message="Removing nginx web server configuration..."
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
 
+#=================================================
+# REMOVE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1
+
+# Remove the app-specific logrotate config
+ynh_remove_logrotate
+
 #=================================================
 # CLOSE A PORT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 023dde1..c6a9c8d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -102,7 +102,7 @@ yunohost service add $app --description "$app daemon for WriteFreely" --log_type
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f8dc3f4..ede9882 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -87,9 +87,9 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while)
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_clean_check_starting
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
-	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
@@ -101,7 +101,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action=stop
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -184,9 +184,9 @@ fi
 #=================================================
 # START SERVICE
 #=================================================
-ynh_print_info --message="Starting a systemd service.."
+ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action=start
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
 
 #=================================================
 # RELOAD NGINX