diff --git a/scripts/restore b/scripts/restore
index d88233b..6cd2493 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -73,7 +73,7 @@ ynh_system_user_create --username=$app
 #=================================================
 
 # Restore permissions on app files
-chown -R root: $final_path
+chown $mautrix_bridge_user:root -R $final_path
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 3b170ce..f10e983 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,23 +16,23 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_ --app=$app --key=domain)
-server_name=$(ynh_app_setting_ --app=$app --key=server_name)
-port=$(ynh_app_setting_ --app=$app --key=port)
-botname=$(ynh_app_setting_ --app=$app --key=botname)
-synapse_instance=$(ynh_app_setting_ --app=$app --key=synapse_instance)
-app_service_registration_path=$(ynh_app_setting_ --app=$app --key=app_service_registration_path)
-encryption=$(ynh_app_setting_ --app=$app --key=encryption)
-mautrix_bridge_db_name=$(ynh_app_setting_ --app=$app --key=mautrix_bridge_db_name)
-botadmin=$(ynh_app_setting_ --app=$app --key=botadmin)
-botusers=$(ynh_app_setting_ --app=$app --key=botusers)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+server_name=$(ynh_app_setting_get --app=$app --key=server_name)
+port=$(ynh_app_setting_get --app=$app --key=port)
+botname=$(ynh_app_setting_get --app=$app --key=botname)
+synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance)
+app_service_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path)
+encryption=$(ynh_app_setting_get --app=$app --key=encryption)
+mautrix_bridge_db_name=$(ynh_app_setting_get --app=$app --key=mautrix_bridge_db_name)
+botadmin=$(ynh_app_setting_get --app=$app --key=botadmin)
+botusers=$(ynh_app_setting_get --app=$app --key=botusers)
 
-apiid=$(ynh_app_setting_ --app=$app --key=apiid)
-apihash=$(ynh_app_setting_ --app=$app --key=apihash)
-bottoken=$(ynh_app_setting_ --app=$app --key=bottoken)
+apiid=$(ynh_app_setting_get --app=$app --key=apiid)
+apihash=$(ynh_app_setting_get --app=$app --key=apihash)
+bottoken=$(ynh_app_setting_get --app=$app --key=bottoken)
 
-upstream_version=$(ynh_app_setting_ --app=$app --key=mautrix_version)
-final_path=$(ynh_app_setting_ --app=$app --key=final_path)
+upstream_version=$(ynh_app_setting_get --app=$app --key=mautrix_version)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)