diff --git a/scripts/remove b/scripts/remove
index 3c43ab7..3867c62 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,10 +17,22 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 # 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
+if ynh_exec_warn_less yunohost service status "${app}-server" >/dev/null
 then
-	ynh_script_progression --message="Removing $app service integration..." --weight=1
-	yunohost service remove $app
+	ynh_script_progression --message="Removing ${app}-server service integration..."
+	yunohost service remove "${app}-server"
+fi
+
+if ynh_exec_warn_less yunohost service status "${app}-worker" >/dev/null
+then
+	ynh_script_progression --message="Removing ${app}-worker service integration..."
+	yunohost service remove "${app}-worker"
+fi
+
+if ynh_exec_warn_less yunohost service status "${app}-beat" >/dev/null
+then
+	ynh_script_progression --message="Removing ${app}-beat service integration..."
+	yunohost service remove "${app}-beat"
 fi
 
 #=================================================