diff --git a/scripts/change_url b/scripts/change_url
index ef9790d..3773192 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -118,7 +118,7 @@ ynh_script_progression --message="Reconfiguring Searx..." --weight=2
 #=================================================
 ynh_script_progression --message="Starting Searx..." --weight=2
 
-ynh_systemd_action --service_name=uwsgi-app@.service --action=restart --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
+ynh_systemd_action --service_name=uwsgi-app@$app.service --action=restart --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 3c5e1ee..c88a4a1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -115,7 +115,7 @@ chown -R $app: $final_path
 #=================================================
 ynh_script_progression --message="Configuring uWSGI for Searx..." --weight=2
 
-ynh_add_uwsgi_service
+ynh_add_uwsgi_service 2>/dev/null
 
 #=================================================
 # CHECK SEARX STARTING
@@ -123,7 +123,7 @@ ynh_add_uwsgi_service
 ynh_script_progression --message="Starting Searx..." --weight=4
 
 # Wait for Searx to be fully started
-ynh_systemd_action --service_name=uwsgi-app@.service --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
+ynh_systemd_action --service_name=uwsgi-app@$app.service --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/remove b/scripts/remove
index 4c257b8..364e882 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -27,7 +27,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 ynh_script_progression --message="Stopping and removing the systemd service..." --weight=2
 
 # Remove the uwsgi configuration
-ynh_systemd_action --service_name "uwsgi-app@.service" --action stop
+ynh_systemd_action --service_name "uwsgi-app@$app.service" --action stop
 ynh_remove_uwsgi_service
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index f2538b9..7082849 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -86,7 +86,7 @@ ynh_restore_file --origin_path="/etc/uwsgi/apps-available/$app.ini"
 ynh_restore_file --origin_path "/var/log/uwsgi/$app"
 chown $app:root /var/log/uwsgi/$app
 ynh_check_global_uwsgi_config
-systemctl enable "uwsgi-app@.service" --quiet
+systemctl enable "uwsgi-app@$app.service" --quiet
 
 #=================================================
 # GENERIC FINALISATION
@@ -103,7 +103,7 @@ ynh_systemd_action --service_name=nginx --action=reload
 ynh_script_progression --message="Starting Searx..." --weight=4
 
 # Wait for searx to be fully started
-ynh_systemd_action --service_name=uwsgi-app@.service --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
+ynh_systemd_action --service_name=uwsgi-app@$app.service --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index c021d86..6644832 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -152,7 +152,7 @@ ynh_add_uwsgi_service
 ynh_script_progression --message="Restarting Searx..." --weight=3
 
 # Wait for searx to be fully started
-ynh_systemd_action --service_name=uwsgi-app@.service --action=restart --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
+ynh_systemd_action --service_name=uwsgi-app@$app.service --action=restart --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX