diff --git a/scripts/remove b/scripts/remove
index f2e62c4..c46cbe5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -6,16 +6,18 @@ set -u
 # Source app helpers
 . /usr/share/yunohost/helpers
 
-db_user=freshrss
-db_name=freshrss
-domain=$(ynh_app_setting_get freshrss domain)
+app=$YNH_APP_INSTANCE_NAME
+db_user=$app
+db_name=$app
+
+domain=$(ynh_app_setting_get $app domain)
 
 ynh_mysql_drop_db $db_name
 ynh_mysql_drop_user $db_user
 
-sudo rm -rf /var/www/freshrss
-sudo rm -rf /etc/cron.d/freshrss
-sudo rm -f /etc/nginx/conf.d/$domain.d/freshrss.conf
+sudo rm -rf /var/www/$app
+sudo rm -rf /etc/cron.d/$app
+sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
 
 sudo service nginx reload
 sudo yunohost app ssowatconf