diff --git a/scripts/_common.sh b/scripts/_common.sh
index 56dbe64..ce76d0b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -24,62 +24,62 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstrin
 #=================================================
 
 
-# readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17
-# # Declare the actual composer version to use.
-# # A packager willing to use another version of composer can override the variable into its _common.sh.
-# YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}
+readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.9
+# Declare the actual composer version to use.
+# A packager willing to use another version of composer can override the variable into its _common.sh.
+YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}
 
-# # Execute a command with Composer
-# #
-# # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands"
-# # | arg: -v, --phpversion - PHP version to use with composer
-# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
-# # | arg: -c, --commands - Commands to execute.
-# ynh_composer_exec () {
-# 	# Declare an array to define the options of this helper.
-# 	local legacy_args=vwc
-# 	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
-# 	local phpversion
-# 	local workdir
-# 	local commands
-# 	# Manage arguments with getopts
-# 	ynh_handle_getopts_args "$@"
-# 	workdir="${workdir:-$final_path}"
-# 	phpversion="${phpversion:-$YNH_PHP_VERSION}"
+# Execute a command with Composer
+#
+# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands"
+# | arg: -v, --phpversion - PHP version to use with composer
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -c, --commands - Commands to execute.
+ynh_composer_exec () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=vwc
+	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
+	local phpversion
+	local workdir
+	local commands
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	workdir="${workdir:-$final_path}"
+	phpversion="${phpversion:-$YNH_PHP_VERSION}"
 
-# 	COMPOSER_HOME="$workdir/.composer" \
-# 		php${phpversion} "$workdir/composer.phar" $commands \
-# 		-d "$workdir" --quiet --no-interaction
-# }
+	COMPOSER_HOME="$workdir/.composer" \
+		php${phpversion} "$workdir/composer.phar" $commands \
+		-d "$workdir" --quiet --no-interaction
+}
 
-# # Install and initialize Composer in the given directory
-# #
-# # usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion]
-# # | arg: -v, --phpversion - PHP version to use with composer
-# # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
-# # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
-# # | arg: -c, --composerversion - Composer version to install
-# ynh_install_composer () {
-# 	# Declare an array to define the options of this helper.
-# 	local legacy_args=vwa
-# 	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=)
-# 	local phpversion
-# 	local workdir
-# 	local install_args
-# 	local composerversion
-# 	# Manage arguments with getopts
-# 	ynh_handle_getopts_args "$@"
-# 	workdir="${workdir:-$final_path}"
-# 	phpversion="${phpversion:-$YNH_PHP_VERSION}"
-# 	install_args="${install_args:-}"
-# 	composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
+# Install and initialize Composer in the given directory
+#
+# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion]
+# | arg: -v, --phpversion - PHP version to use with composer
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
+# | arg: -c, --composerversion - Composer version to install
+ynh_install_composer () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=vwa
+	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=)
+	local phpversion
+	local workdir
+	local install_args
+	local composerversion
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	workdir="${workdir:-$final_path}"
+	phpversion="${phpversion:-$YNH_PHP_VERSION}"
+	install_args="${install_args:-}"
+	composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
 
-# 	curl -sS https://getcomposer.org/installer \
-# 		| COMPOSER_HOME="$workdir/.composer" \
-# 		php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
-# 		|| ynh_die "Unable to install Composer."
+	curl -sS https://getcomposer.org/installer \
+		| COMPOSER_HOME="$workdir/.composer" \
+		php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
+		|| ynh_die "Unable to install Composer."
 
-# 	# update dependencies to create composer.lock
-# 	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
-# 		|| ynh_die "Unable to update core dependencies with Composer."
-# }
+	# update dependencies to create composer.lock
+	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
+		|| ynh_die "Unable to update core dependencies with Composer."
+}
diff --git a/scripts/install b/scripts/install
index 9470951..cce9d12 100644
--- a/scripts/install
+++ b/scripts/install
@@ -131,11 +131,7 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php"
 # Install PHP dependencies using composer
 #=================================================
 
-pushd $final_path
-	export COMPOSER_HOME=$final_path
-	ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php${phpversion} -- --version="1.10.16" --install-dir="$final_path" \
-		&& php${phpversion} composer.phar install --no-interaction --quiet
-popd
+ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index cccab8d..9e374bd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -153,11 +153,7 @@ yunohost service add $app --description="Responsive web-based XMPP client" --log
 # INSTALL PHP DEPENDENCIES USING COMPOSER
 #=================================================
 
-pushd "$final_path"
-	ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php$phpversion -- --version="2.0.9" --install-dir="$final_path" \
-		&& php$phpversion composer.phar config --global discard-changes true --quiet \
-		&& php$phpversion composer.phar install --no-interaction --quiet
-popd
+ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
 
 #=================================================
 # Set-up database