diff --git a/scripts/restore b/scripts/restore
index 4592357..92232d3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -100,7 +100,7 @@ ynh_system_user_create $app
 #=================================================
 
 # Restore permissions on app files
-chown -R www-data: $final_path
+chown -R $app: $final_path
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f184588..a65191c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,10 +74,6 @@ ynh_print_info "Upgrading source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 cp -a ../sources/* ${final_path}/
 
-chown -R www-data: ${final_path}/
-chmod -R 0644 ${final_path}/*
-find ${final_path}/ -type d -exec chmod +x {} \;
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -141,12 +137,9 @@ yunohost service start $service_name
 #=================================================
 
 # Set permissions on app files
-chown -R www-data: $final_path
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_print_info "Upgrading SSOwat configuration..."
+chown -R $app: ${final_path}/
+chmod -R 0644 ${final_path}/*
+find ${final_path}/ -type d -exec chmod +x {} \;
 
 #=================================================
 # RELOAD NGINX