diff --git a/scripts/install b/scripts/install
index aba29af..6538d89 100755
--- a/scripts/install
+++ b/scripts/install
@@ -130,7 +130,7 @@ ynh_secure_remove --file="$final_path/$app/bin/"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
-chown -R root:$app "$final_path"
+chown -R $app:$app "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -177,14 +177,6 @@ pushd $final_path/$app
 	sudo -u "$app" env PATH=$PATH plm search init -p $final_path/$app
 popd
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -195,6 +187,14 @@ ynh_add_config --template="../conf/.env" --destination="$final_path/$app/.env"
 chmod 400 "$final_path/$app/.env"
 chown $app:$app "$final_path/$app/.env"
 
+#=================================================
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Configuring a systemd service..."
+
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 08a9642..b15d9a8 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -71,7 +71,7 @@ ynh_restore_file --origin_path="$final_path"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
-chown -R root:$app "$final_path"
+chown -R $app:$app "$final_path"
 
 #=================================================
 # CREATE LOG FOLDER
diff --git a/scripts/upgrade b/scripts/upgrade
index bdf4d66..5e83045 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -118,7 +118,7 @@ fi
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
-chown -R root:$app "$final_path"
+chown -R $app:$app "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -150,23 +150,12 @@ chown -R "$app":"$app" "/var/log/$app"
 #=================================================
 ynh_script_progression --message="Making setup..."
 
-# Set right permissions 
-chown -R "$app":"$app" $final_path
-
 export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" 
 
 pushd $final_path/$app
 	sudo -u "$app" env PATH=$PATH plm migration run
 popd 
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -177,6 +166,14 @@ ynh_add_config --template="../conf/.env" --destination="$final_path/$app/.env"
 chmod 400 "$final_path/$app/.env"
 chown $app:$app "$final_path/$app/.env"
 
+#=================================================
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Upgrading systemd configuration..."
+
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================