diff --git a/manifest.toml b/manifest.toml
index d29c646..e105641 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -10,7 +10,6 @@ version = "13.5.0~ynh2"
 maintainers = ["Krakinou"]
 
 [upstream]
-version = "13.5.0"
 license = "GPL-2.0-or-later"
 website = "www.universalmediaserver.com"
 admindoc = "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki"
@@ -22,16 +21,15 @@ architectures = "all"
 multi_instance = false
 ldap = false
 sso = false
-disk = "50M"
-ram.build = "50M"
-ram.runtime = "50M"
+disk = "270M"
+ram.build = "350M"
+ram.runtime = "350M"
 
 [install]
     [install.domain]
     help.en = "UMS require its own subdomain"
     help.fr = "UMS a besoin de son propre sous-domaine"
     type = "domain"
-    full_domain = true
 
     [install.init_main_permission]
     help.en = "Everybody will be able to access your media on the internet without connecting to Yunohost"
@@ -76,7 +74,7 @@ ram.runtime = "50M"
 
     [resources.ports]
     main.default = 9001
-    end.default = 5001
+    rend.default = 5001
     rend.exposed = "TCP"
 
     [resources.system_user]
@@ -84,7 +82,8 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
-    subdirs = ".config/UMS"
+    dir = "/home/yunohost.app/__APP__"
+    subdirs = [ '.config', '.config/UMS' ]
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/install b/scripts/install
index 74fd018..c77b680 100755
--- a/scripts/install
+++ b/scripts/install
@@ -31,9 +31,10 @@ ynh_script_progression --message="Setting up source files..." --weight=12
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir" 
 
+chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
-chown -R root:$app "$install_dir"
-chown root:$app "$install_dir/UMS.sh"
+chown -R $app:$app "$install_dir"
+chown $app:$app "$install_dir/UMS.sh"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -56,6 +57,7 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Setting up configuration file.." --weight=5
 
+mkdir -p "$data_dir/.config/UMS"
 ynh_add_config --template="UMS.conf.default" --destination="$data_dir/.config/UMS/UMS.conf"
 ynh_add_config --template="WEB.conf.default" --destination="$data_dir/.config/UMS/WEB.conf"
 ynh_add_config --template="VirtualFolders.conf.default" --destination="$data_dir/.config/UMS/VirtualFolders.conf"
diff --git a/scripts/remove b/scripts/remove
index 78bd1db..0532694 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -55,6 +55,9 @@ ynh_remove_logrotate
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
+# remove the home folder
+ynh_secure_remove --file="$data_dir"
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 17d041f..7675f4b 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,9 +17,10 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
+chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
-chown -R root:$app "$install_dir"
-chown root:$app "$install_dir/UMS.sh"
+chown -R $app:$app "$install_dir"
+chown $app:$app "$install_dir/UMS.sh"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
@@ -29,7 +30,7 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
 # (Same as for install dir)
-chown -R $app:www-data "$data_dir"
+chown -R $app:$app "$data_dir"
 chown -R $app:$app "$data_dir/.config"
 chmod -R  700 "$data_dir/.config"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index d065485..992fcf7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -68,9 +68,10 @@ then
 	ynh_setup_source --dest_dir="$install_dir" 
 fi
 
+chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
-chown -R root:$app "$install_dir"
-chown root:$app "$install_dir/UMS.sh"
+chown -R $app:$app "$install_dir"
+chown $app:$app "$install_dir/UMS.sh"
 
 #=================================================
 # NGINX CONFIGURATION