diff --git a/scripts/remove b/scripts/remove
index 7b6c29c..366f7bc 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -33,12 +33,12 @@ then
 	ynh_script_progression --message="Removing $app service integration..."
 	yunohost service remove $app
 fi
-if ynh_exec_warn_less yunohost service status $app >/dev/null
+if ynh_exec_warn_less yunohost service status $app-ui >/dev/null
 then
 	ynh_script_progression --message="Removing $app-ui service integration..."
 	yunohost service remove $app-ui
 fi
-if ynh_exec_warn_less yunohost service status $app >/dev/null
+if ynh_exec_warn_less yunohost service status $app-pict-rs >/dev/null
 then
 	ynh_script_progression --message="Removing $app-pict-rs service integration..."
 	yunohost service remove $app-pict-rs
diff --git a/scripts/upgrade b/scripts/upgrade
index 06f26f4..9ba0bfe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -78,7 +78,7 @@ fi
 
 
 # Removing previously installed iframely
-if ynh_exec_warn_less yunohost service status $app >/dev/null
+if ynh_exec_warn_less yunohost service status $app-iframely >/dev/null
 then
 	ynh_script_progression --message="Removing $app-iframely service integration..."
 	yunohost service remove $app-iframely