diff --git a/scripts/remove b/scripts/remove
index 804edb6..232b407 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -28,16 +28,13 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
 
-ynh_systemd_action --service_name="${app}-beat" --action="stop" --log_path="systemd" --line_match="Stopped $app"
 ynh_systemd_action --service_name="${app}-server" --action="stop" --log_path="systemd" --line_match="Stopped $app"
-ynh_systemd_action --service_name="${app}-worker" --action="stop" --log_path="systemd" --line_match="Stopped $app"
+ynh_systemd_action --service_name="${app}_workers" --action="stop" --log_path="systemd" --line_match="Stopped $app"
 
 # Remove the dedicated systemd config
-ynh_remove_systemd_config --service="${app}-beat"
 ynh_remove_systemd_config --service="${app}-server"
-ynh_remove_systemd_config --service="${app}-worker"
+ynh_remove_systemd_config --service="${app}_workers"
 
-ynh_secure_remove --file="/etc/systemd/system/$app.target"
 
 #=================================================
 # REMOVE APP MAIN DIR