diff --git a/scripts/upgrade b/scripts/upgrade
index e4f12b3..eb91fac 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -88,61 +88,65 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="$final_path/l
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Upgrading source files..."
 
-# Specific actions on ARM architecture
-if [ -n "$(uname -m | grep arm)" ] ; then
-  # Unapply commit cf9b4a789b855b5199e98a13424e409854a8e848 that breaks ARM
-  # compatibility by pointing to a recent libv8 version
-  # This is due to this libv8 issue (https://github.com/cowboyd/libv8/issues/261)
-  # that prevents it from being compiled on ARM hence no binary gem is available yet
-  cp ../sources/patches_arm/* ../sources/patches
-fi
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Upgrading source files..."
 
-# Backup files to keep
-tmpdir=$(mktemp -d)
-cp -Rp $final_path/plugins $final_path/config/discourse.conf $tmpdir
-if [ -d $final_path/public/uploads ] ; then
-	cp -Rp $final_path/public/uploads $tmpdir
-fi
-if [ -d $final_path/public/backups ] ; then
-	cp -Rp $final_path/public/backups $tmpdir
-fi
-if [ -d $final_path/log ] ; then
-	cp -Rp $final_path/log $tmpdir
-fi
-# Remove destination directory
-ynh_secure_remove --file=$final_path
-# Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
-# Restore previous files
-if [ -d $tmpdir/uploads ] ; then
-	cp -Rp $tmpdir/uploads $final_path/public
-fi
-if [ -d $tmpdir/backups ] ; then
-	cp -Rp $tmpdir/backups $final_path/public
-fi
-if [ -d $tmpdir/log ] ; then
+	# Specific actions on ARM architecture
+	if [ -n "$(uname -m | grep arm)" ] ; then
+		# Unapply commit cf9b4a789b855b5199e98a13424e409854a8e848 that breaks ARM
+		# compatibility by pointing to a recent libv8 version
+		# This is due to this libv8 issue (https://github.com/cowboyd/libv8/issues/261)
+		# that prevents it from being compiled on ARM hence no binary gem is available yet
+		cp ../sources/patches_arm/* ../sources/patches
+	fi
+
+	# Backup files to keep
+	tmpdir=$(mktemp -d)
+	cp -Rp $final_path/plugins $final_path/config/discourse.conf $tmpdir
+	if [ -d $final_path/public/uploads ] ; then
+		cp -Rp $final_path/public/uploads $tmpdir
+	fi
+	if [ -d $final_path/public/backups ] ; then
+		cp -Rp $final_path/public/backups $tmpdir
+	fi
+	if [ -d $final_path/log ] ; then
+		cp -Rp $final_path/log $tmpdir
+	fi
+	# Remove destination directory
+	ynh_secure_remove --file=$final_path
+	# Download, check integrity, uncompress and patch the source from app.src
+	ynh_setup_source --dest_dir="$final_path"
+	# Restore previous files
+	if [ -d $tmpdir/uploads ] ; then
+		cp -Rp $tmpdir/uploads $final_path/public
+	fi
+	if [ -d $tmpdir/backups ] ; then
+		cp -Rp $tmpdir/backups $final_path/public
+	fi
+	if [ -d $tmpdir/log ] ; then
+		cp -Rp $tmpdir/log $final_path
+	fi
+	(
+		cd $tmpdir/plugins/
+		for discourse_plugin_dir in */
+		do
+			# Only copy plugins not included in Discourse archive
+			if [ ! -d "$final_path/plugins/$discourse_plugin_dir" ]
+			then
+				cp -a "$discourse_plugin_dir" "$final_path/plugins/$discourse_plugin_dir"
+			fi
+		done
+	)
 	cp -Rp $tmpdir/log $final_path
-fi
-(
-	cd $tmpdir/plugins/
-for discourse_plugin_dir in */
-do
-		# Only copy plugins not included in Discourse archive
-  if [ ! -d "$final_path/plugins/$discourse_plugin_dir" ]
-  then
-    cp -a "$discourse_plugin_dir" "$final_path/plugins/$discourse_plugin_dir"
-  fi
-done
-)
-cp -Rp $tmpdir/log $final_path
-cp -p $tmpdir/discourse.conf $final_path/config
+	cp -p $tmpdir/discourse.conf $final_path/config
 
-# Install LDAP plugin
-ynh_secure_remove --file="$final_path/plugins/discourse-ldap-auth"
-mkdir -p "$final_path/plugins/discourse-ldap-auth"
-ynh_setup_source --dest_dir="$final_path/plugins/discourse-ldap-auth" --source_id=ldap-auth
+	# Install LDAP plugin
+	ynh_secure_remove --file="$final_path/plugins/discourse-ldap-auth"
+	mkdir -p "$final_path/plugins/discourse-ldap-auth"
+	ynh_setup_source --dest_dir="$final_path/plugins/discourse-ldap-auth" --source_id=ldap-auth
+fi
 
 #=================================================
 # NGINX CONFIGURATION
@@ -185,131 +189,164 @@ ynh_system_user_create --username=$app --home_dir=$final_path --use_shell
 #=================================================
 # CONFIGURE DISCOURSE
 #=================================================
-ynh_script_progression --message="Configuring Discourse..."
 
-# Make a backup of the original config file if modified
-ynh_backup_if_checksum_is_different --file="$final_path/config/discourse.conf"
-# Configure database
-discourse_config_file="$final_path/config/discourse.conf"
-cp $final_path/config/discourse_defaults.conf $discourse_config_file
-ynh_replace_string --match_string="db_name = discourse" --replace_string="db_name = $db_name" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="db_username = discourse" --replace_string="db_username = $db_name" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="db_password =" --replace_string="db_password = $db_pwd" --target_file="$discourse_config_file"
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Configuring Discourse..."
 
-# Configure hostname
-ynh_replace_string --match_string="hostname = \"www.example.com\"" --replace_string="hostname = \"$domain\"" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="relative_url_root =" --replace_string="relative_url_root = ${path_url%/}" --target_file="$discourse_config_file"
-# Serve static assets (i.e. images, js, etc.)
-ynh_replace_string --match_string="serve_static_assets = false" --replace_string="serve_static_assets = true" --target_file="$discourse_config_file"
-# Don't show miniprofiler
-ynh_replace_string --match_string="load_mini_profiler = true" --replace_string="load_mini_profiler = false" --target_file="$discourse_config_file"
+	# Configure Discourse
+	discourse_config_file="$final_path/config/discourse.conf"
+	# Make a backup of the original config file if modified
+	ynh_backup_if_checksum_is_different --file="$discourse_config_file"
 
+	cp $final_path/config/discourse_defaults.conf $discourse_config_file
 
-# Configure e-mail server
-admin_mail=$(ynh_user_get_info "$admin" mail)
-ynh_replace_string --match_string="developer_emails =" --replace_string="developer_emails = $admin_mail" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="smtp_address =" --replace_string="smtp_address = localhost" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="smtp_domain =" --replace_string="smtp_domain = $domain" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="smtp_enable_start_tls = true" --replace_string="smtp_enable_start_tls = false" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="db_name = discourse" --replace_string="db_name = $db_name" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="db_username = discourse" --replace_string="db_username = $db_name" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="db_password =" --replace_string="db_password = $db_pwd" --target_file="$discourse_config_file"
+	# Configure hostname
+	ynh_replace_string --match_string="hostname = \"www.example.com\"" --replace_string="hostname = \"$domain\"" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="relative_url_root =" --replace_string="relative_url_root = ${path_url%/}" --target_file="$discourse_config_file"
+	# Serve static assets (i.e. images, js, etc.)
+	ynh_replace_string --match_string="serve_static_assets = false" --replace_string="serve_static_assets = true" --target_file="$discourse_config_file"
+	# Don't show miniprofiler
+	ynh_replace_string --match_string="load_mini_profiler = true" --replace_string="load_mini_profiler = false" --target_file="$discourse_config_file"
+	# Configure e-mail server
+	admin_mail=$(ynh_user_get_info "$admin" mail)
+	ynh_replace_string --match_string="developer_emails =" --replace_string="developer_emails = $admin_mail" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="smtp_address =" --replace_string="smtp_address = localhost" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="smtp_domain =" --replace_string="smtp_domain = $domain" --target_file="$discourse_config_file"
+	ynh_replace_string --match_string="smtp_enable_start_tls = true" --replace_string="smtp_enable_start_tls = false" --target_file="$discourse_config_file"
+	# Configure redis
+	ynh_replace_string --match_string="redis_db = 0" --replace_string="redis_db = $redis_db" --target_file="$discourse_config_file"
+	# Don't notify on new versions (handled by the YunoHost package)
+	ynh_replace_string --match_string="new_version_emails = true" --replace_string="new_version_emails = false" --target_file="$discourse_config_file"
 
-# Configure redis
-ynh_replace_string --match_string="redis_db = 0" --replace_string="redis_db = $redis_db" --target_file="$discourse_config_file"
+	# Calculate and store the config file checksum
+	ynh_store_file_checksum --file="$discourse_config_file"
 
-# Don't notify on new versions (handled by the YunoHost package)
-ynh_replace_string --match_string="new_version_emails = true" --replace_string="new_version_emails = false" --target_file="$discourse_config_file"
+	# Configure LDAP plugin
+	ldap_config_file="$final_path/plugins/discourse-ldap-auth/config/settings.yml"
+	# Make a backup of the original config file if modified
+	ynh_backup_if_checksum_is_different "$ldap_config_file"
 
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$discourse_config_file"
+	ynh_replace_string --match_string="adfs.example.com" --replace_string="localhost" --target_file="$ldap_config_file"
+	ynh_replace_string --match_string="dc=example,dc=com" --replace_string="ou=users,dc=yunohost,dc=org" --target_file="$ldap_config_file"
+	ynh_replace_string --match_string="sAMAccountName" --replace_string="uid" --target_file="$ldap_config_file"
 
-# Make a backup of the original config file if modified
-ynh_backup_if_checksum_is_different "$final_path/plugins/discourse-ldap-auth/config/settings.yml"
+	# Calculate and store the config file checksum
+	ynh_store_file_checksum --file="$ldap_config_file"
 
-# Configure LDAP plugin
-ldap_config_file="$final_path/plugins/discourse-ldap-auth/config/settings.yml"
-ynh_replace_string --match_string="adfs.example.com" --replace_string="localhost" --target_file="$ldap_config_file"
-ynh_replace_string --match_string="dc=example,dc=com" --replace_string="ou=users,dc=yunohost,dc=org" --target_file="$ldap_config_file"
-ynh_replace_string --match_string="sAMAccountName" --replace_string="uid" --target_file="$ldap_config_file"
-ynh_store_file_checksum --file="$ldap_config_file"
-
-# Disable svgo worker
-echo "svgo: false" > $final_path/.image_optim.yml
+	# Disable svgo worker
+	echo "svgo: false" > $final_path/.image_optim.yml
+fi
 
 #=================================================
 # SETUP UNICORN, A RUBY SERVER
 #=================================================
-ynh_script_progression --message="Setting up Unicorn..."
 
-unicorn_config_file="$final_path/config/unicorn.conf.rb"
-# Use socket connection
-ynh_replace_string --match_string='listen (ENV\["UNICORN_PORT"\] || 3000).to_i' --replace_string='# listen (ENV["UNICORN_PORT"] || 3000).to_i' --target_file="$unicorn_config_file"
-ynh_replace_string --match_string='# listen "#{discourse_path}/tmp/sockets/unicorn.sock"' --replace_string='listen "#{discourse_path}/tmp/sockets/unicorn.sock"' --target_file="$unicorn_config_file"
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$unicorn_config_file"
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Setting up Unicorn..."
 
-# Set a secret value
-cp ../conf/secrets.yml "$final_path/config/secrets.yml"
-ynh_replace_string --match_string="__SECRET__" --replace_string="$(ynh_string_random)" --target_file="$final_path/config/secrets.yml"
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$final_path/config/secrets.yml"
+	unicorn_config_file="$final_path/config/unicorn.conf.rb"
+	# Make a backup of the original config file if modified
+	ynh_backup_if_checksum_is_different "$unicorn_config_file"
 
-# Set permissions to app files
-chown -R $app: $final_path
+	# Use socket connection
+	ynh_replace_string --match_string='listen (ENV\["UNICORN_PORT"\] || 3000).to_i' --replace_string='# listen (ENV["UNICORN_PORT"] || 3000).to_i' --target_file="$unicorn_config_file"
+	ynh_replace_string --match_string='# listen "#{discourse_path}/tmp/sockets/unicorn.sock"' --replace_string='listen "#{discourse_path}/tmp/sockets/unicorn.sock"' --target_file="$unicorn_config_file"
 
-(cd "$final_path"
-# Install bundler, a gems installer
-gem install bundler
-# Install without documentation
-exec_as $app echo "gem: --no-ri --no-rdoc" >> "$final_path/.gemrc")
-# Specific actions on ARM architecture
-if [ -n "$(uname -m | grep arm)" ] ; then
-  # Define the platform specifically to retrieve binaries
-  # for libv8 because it currently doesn't compile on ARM devices
-  exec_login_as $app bundle config specific_platform arm-linux
-fi
-# Install dependencies
-exec_login_as $app bundle config set path 'vendor/bundle'
-exec_login_as $app bundle config set with 'development'
-exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2
+	# Calculate and store the config file checksum
+	ynh_store_file_checksum --file="$unicorn_config_file"
 
-# On ARM architecture, replace bundled libpsl by system native libpsl
-# because the provided binary isn't compatible
-if [ -n "$(uname -m | grep arm)" ] ; then
-  (cd $final_path/vendor/bundle/ruby/*/gems/mini_suffix-*/vendor
-  rm libpsl.so
-  ln -s $(ldconfig -p | grep libpsl | awk 'END {print $NF}') libpsl.so)
+	secret_config_file="$final_path/config/secrets.yml"
+	# Make a backup of the original config file if modified
+	ynh_backup_if_checksum_is_different "$secret_config_file"
+
+	# Set a secret value
+	cp ../conf/secrets.yml "$final_path/config/secrets.yml"
+	ynh_replace_string --match_string="__SECRET__" --replace_string="$(ynh_string_random)" --target_file="$secret_config_file"
+
+	# Calculate and store the config file checksum
+	ynh_store_file_checksum --file="$secret_config_file"
+
+	# Set permissions to app files
+	chown -R $app: $final_path
+
+	(
+		cd "$final_path"
+		# Install bundler, a gems installer
+		gem install bundler
+		# Install without documentation
+		exec_as $app echo "gem: --no-ri --no-rdoc" >> "$final_path/.gemrc"
+	)
+	# Specific actions on ARM architecture
+	if [ -n "$(uname -m | grep arm)" ] ; then
+  		# Define the platform specifically to retrieve binaries
+  		# for libv8 because it currently doesn't compile on ARM devices
+  		exec_login_as $app bundle config specific_platform arm-linux
+	fi
+	# Install dependencies
+	exec_login_as $app bundle config set path 'vendor/bundle'
+	exec_login_as $app bundle config set with 'development'
+	exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2
+
+	# On ARM architecture, replace bundled libpsl by system native libpsl
+	# because the provided binary isn't compatible
+	if [ -n "$(uname -m | grep arm)" ] ; then
+  		(
+  			cd $final_path/vendor/bundle/ruby/*/gems/mini_suffix-*/vendor
+  			rm libpsl.so
+  			ln -s $(ldconfig -p | grep libpsl | awk 'END {print $NF}') libpsl.so
+  		)
+	fi
 fi
 
 #=================================================
 # PREPARE THE DATABASE
 #=================================================
-ynh_script_progression --message="Preparing the database..."
 
-rake_exec="exec_login_as $app RAILS_ENV=production bin/rake"
-$rake_exec db:migrate
-$rake_exec assets:precompile
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Preparing the database..."
+
+	rake_exec="exec_login_as $app RAILS_ENV=production bin/rake"
+	$rake_exec db:migrate
+	$rake_exec assets:precompile
+fi
 
 #=================================================
 # CONFIGURE PLUGINS
 #=================================================
-ynh_script_progression --message="Configuring plugins..."
 
-# Patch ldap-auth plugin dependency (omniauth-ldap) to fix it when using domain subfolder
-# (Can only do that now because we are patching dependencies which have just been downloaded)
-# Patch applied: https://github.com/omniauth/omniauth-ldap/pull/16
-(cd $final_path/plugins/discourse-ldap-auth/gems/${RUBY_VERSION}/gems/omniauth-ldap*/
-patch -p1 < $YNH_CWD/../conf/ldap-auth-fix-subfolder.patch)
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Configuring plugins..."
+
+	# Patch ldap-auth plugin dependency (omniauth-ldap) to fix it when using domain subfolder
+	# (Can only do that now because we are patching dependencies which have just been downloaded)
+	# Patch applied: https://github.com/omniauth/omniauth-ldap/pull/16
+	(
+		cd $final_path/plugins/discourse-ldap-auth/gems/${RUBY_VERSION}/gems/omniauth-ldap*/
+		patch -p1 < $YNH_CWD/../conf/ldap-auth-fix-subfolder.patch
+	)
+fi
 
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..."
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Configuring a systemd service..."
 
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/systemd.service"
+	ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/systemd.service"
 
-additional_env="UNICORN_WORKERS=$unicorn_workers"
-ynh_replace_string --match_string="__ADDITIONAL_ENV__" --replace_string="$additional_env" --target_file="../conf/systemd.service"
-ynh_replace_string --match_string="__LIBJEMALLOC__" --replace_string="$(ldconfig -p | grep libjemalloc | awk 'END {print $NF}')" --target_file="../conf/systemd.service"
-ynh_add_systemd_config
+	additional_env="UNICORN_WORKERS=$unicorn_workers"
+	ynh_replace_string --match_string="__ADDITIONAL_ENV__" --replace_string="$additional_env" --target_file="../conf/systemd.service"
+	ynh_replace_string --match_string="__LIBJEMALLOC__" --replace_string="$(ldconfig -p | grep libjemalloc | awk 'END {print $NF}')" --target_file="../conf/systemd.service"
+	ynh_add_systemd_config
+fi
 
 #=================================================
 # GENERIC FINALIZATION
@@ -325,9 +362,9 @@ mkdir "$final_path/tmp/sockets"
 # Create specific folders and links for subfolder compatibilityn
 # (see: https://meta.discourse.org/t/subfolder-support-with-docker/30507)
 (
-cd $final_path
-mkdir -p "public/forum"
-cd public/forum && ln -s ../uploads && ln -s ../backups
+	cd $final_path
+	mkdir -p "public/forum"
+	cd public/forum && ln -s ../uploads && ln -s ../backups
 )
 
 # Set permissions to app files
@@ -343,8 +380,8 @@ ynh_script_progression --message="Upgrading SSOwat configuration..."
 # If app is public, add url to SSOWat conf as skipped_uris
 if [ $is_public -eq 1 ]
 then
-  # unprotected_uris allows SSO credentials to be passed anyway.
-  ynh_app_setting_set "$app" skipped_uris "/"
+	# unprotected_uris allows SSO credentials to be passed anyway.
+	ynh_app_setting_set "$app" skipped_uris "/"
 fi
 
 #=================================================