diff --git a/conf/funkwhale-beat.service b/conf/funkwhale-beat.service
index 5913bbc..ea37afe 100644
--- a/conf/funkwhale-beat.service
+++ b/conf/funkwhale-beat.service
@@ -5,7 +5,7 @@ PartOf=__APP__.target
 
 [Service]
 User=__APP__
-Group=__APP__
+Group=www-data
 WorkingDirectory=__INSTALL_DIR__/api
 EnvironmentFile=__INSTALL_DIR__/config/.env
 
diff --git a/conf/funkwhale-server.service b/conf/funkwhale-server.service
index 3afcc53..90e135a 100644
--- a/conf/funkwhale-server.service
+++ b/conf/funkwhale-server.service
@@ -5,7 +5,7 @@ PartOf=__APP__.target
 
 [Service]
 User=__APP__
-Group=__APP__
+Group=www-data
 WorkingDirectory=__INSTALL_DIR__/api
 EnvironmentFile=__INSTALL_DIR__/config/.env
 
diff --git a/conf/funkwhale-worker.service b/conf/funkwhale-worker.service
index 4cf8fde..712e289 100644
--- a/conf/funkwhale-worker.service
+++ b/conf/funkwhale-worker.service
@@ -5,7 +5,7 @@ PartOf=__APP__.target
 
 [Service]
 User=__APP__
-Group=__APP__
+Group=www-data
 WorkingDirectory=__INSTALL_DIR__/api
 Environment="CELERYD_CONCURRENCY=0"
 EnvironmentFile=__INSTALL_DIR__/config/.env
diff --git a/scripts/upgrade b/scripts/upgrade
index a7a7ccb..47571a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,6 +63,8 @@ ynh_script_progression --message="Assure correct permissions to $data_dir..." --
 chmod 750 "$data_dir"
 chmod -R o-rwx "$data_dir/"
 chown -R $app:www-data "$data_dir/"
+#following line is to be sure that the directory has appropriate owner rights (as above commands doesn’t seem to have an effect)
+chown -R $app:www-data "$data_dir/data/media/tracks"
 
 #=================================================
 # SPECIFIC UPGRADE