diff --git a/scripts/change_url b/scripts/change_url
index 5fdd474..7b9d264 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..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" --line_match="Proxy listening"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
diff --git a/scripts/upgrade b/scripts/upgrade
index 94df094..09be255 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,6 +15,15 @@ source /usr/share/yunohost/helpers
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# STANDARD UPGRADE STEPS
+#=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping a systemd service..."
+
+ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -27,7 +36,7 @@ ynh_add_nginx_config
 ynh_add_systemd_config
 
 mkdir -p /var/log/$app
-chown -R $app:$app "/var/log/$app" 
+chown -R $app:$app "/var/log/$app"
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append