diff --git a/manifest.json b/manifest.json
index f8fe797..3bf6a18 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,19 +1,20 @@
 {
-    "package_format": 1,
+    "packaging_format": 1,
     "name": "RocketChat",
     "id": "rocketchat",
     "description": {
         "en": "the ultimate chat platform"
     },
+    "url": "https://github.com/selamanse/rocketchat_ynh",
+    "license": "free",
     "maintainer": {
         "name": "selamanse",
         "email": "selamanse@scheinfrei.info",
         "url": "https://github.com/selamanse"
     },
-    "multi_instance": "false",
+    "multi_instance": false,
     "services": [
-        "nginx",
-        "mongodb"
+        "nginx"
     ],
     "requirements": {
         "yunohost": ">> 2.5.6"
diff --git a/scripts/remove b/scripts/remove
index 3597f2d..ea47305 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -u
 
 #=================================================
 # GENERIC START
@@ -9,7 +10,8 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-domain=$(sudo yunohost app setting rocketchat domain)
+app=$YNH_APP_INSTANCE_NAME
+domain=$(ynh_app_setting_get $app domain)
 
 sudo rm -rf /var/www/rocketchat