diff --git a/scripts/install b/scripts/install
index 3f7f048..e6bcc44 100755
--- a/scripts/install
+++ b/scripts/install
@@ -8,6 +8,7 @@
 
 source _common.sh
 source ynh_systemd_action
+source ynh_add_secure_repos__2
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -88,19 +89,16 @@ port=$(ynh_find_port 8095)
 ynh_app_setting_set $app port $port
 
 #=================================================
-# INSTALL ERLANG AND ELIXIR
+# ADD ERLANG REPOSITORY
 #=================================================
-ynh_print_info "Installing erlang and elixir ..."
+ynh_print_info "Adding Erlang repository..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian jessie contrib"
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian stretch contrib"
 fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
 
 #=================================================
 # INSTALL DEPENDENCIES
diff --git a/scripts/remove b/scripts/remove
index a8c88ba..e93e514 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,6 +8,7 @@
 
 source _common.sh
 source ynh_systemd_action
+source ynh_add_secure_repos__2
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -70,12 +71,11 @@ ynh_print_info "Removing dependencies"
 ynh_remove_app_dependencies
 
 #=================================================
-# REMOVE ERLANG AND ELIXIR
+# REMOVE ERLANG REPOSITORY
 #=================================================
-ynh_print_info "Removing erlang and elixir..."
+ynh_print_info "Removing erlang repository..."
 
-ynh_secure_remove "/etc/apt/sources.list.d/erlang-solutions.list"
-apt-key del A14F4FCA
+ynh_remove_extra_repo "erlang-solutions"
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/restore b/scripts/restore
index da70161..e332402 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -8,6 +8,7 @@
 
 source ../settings/scripts/_common.sh
 source ../settings/scripts/ynh_systemd_action
+source ../settings/scripts/ynh_add_secure_repos__2
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -83,19 +84,16 @@ chown -R "$app":"$app" "$final_path"
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
-# INSTALL ERLANG AND ELIXIR
+# ADD ERLANG REPOSITORY
 #=================================================
-ynh_print_info "Installing erlang and elixir ..."
+ynh_print_info "Adding Erlang repository..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian jessie contrib"
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian stretch contrib"
 fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
 
 #=================================================
 # REINSTALL DEPENDENCIES
diff --git a/scripts/upgrade b/scripts/upgrade
index 630871c..4042e1d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -149,25 +149,6 @@ then
 	ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
 
-#=================================================
-# INSTALL ERLANG AND ELIXIR
-#=================================================
-ynh_print_info "Installing erlang and elixir ..."
-
-#remove old erlang packages
-sudo apt remove -y esl-erlang
-sudo apt remove -y elixir
-
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-elif 
-	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
diff --git a/scripts/ynh_add_secure_repos__2 b/scripts/ynh_add_secure_repos__2
new file mode 100644
index 0000000..51a9f1b
--- /dev/null
+++ b/scripts/ynh_add_secure_repos__2
@@ -0,0 +1,166 @@
+#!/bin/bash
+
+# Pin a repository.
+#
+# usage: ynh_pin_repo --package=packages --pin=pin_filter --priority=priority_value [--name=name] [--append]
+# | arg: -p, --package - Packages concerned by the pin. Or all, *.
+# | arg: -i, --pin - Filter for the pin.
+# | arg: -p, --priority - Priority for the pin
+# | arg: -n, --name - Name for the files for this repo, $app as default value.
+# | arg: -a, --append - Do not overwrite existing files.
+#
+# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning.
+#
+ynh_pin_repo () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=pirna
+	declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append )
+	local package
+	local pin
+	local priority
+	local name
+	local append
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	package="${package:-*}"
+	priority=${priority:-50}
+	name="${name:-$app}"
+	append=${append:-0}
+
+	if [ $append -eq 1 ]
+	then
+		append="tee -a"
+	else
+		append="tee"
+	fi
+
+	mkdir -p "/etc/apt/preferences.d"
+	echo "Package: $package
+Pin: $pin
+Pin-Priority: $priority" \
+	| $append "/etc/apt/preferences.d/$name"
+}
+
+# Add a repository.
+#
+# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append]
+# | arg: -u, --uri - Uri of the repository.
+# | arg: -s, --suite - Suite of the repository.
+# | arg: -c, --component - Component of the repository.
+# | arg: -n, --name - Name for the files for this repo, $app as default value.
+# | arg: -a, --append - Do not overwrite existing files.
+#
+# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable
+#                             uri                               suite   component
+# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable
+#
+ynh_add_repo () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=uscna
+	declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append )
+	local uri
+	local suite
+	local component
+	local name
+	local append
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	name="${name:-$app}"
+	append=${append:-0}
+
+	if [ $append -eq 1 ]
+	then
+		append="tee -a"
+	else
+		append="tee"
+	fi
+
+	mkdir -p "/etc/apt/sources.list.d"
+	# Add the new repo in sources.list.d
+	echo "deb $uri $suite $component" \
+		| $append "/etc/apt/sources.list.d/$name.list"
+}
+
+# Add an extra repository correctly, pin it and get the key.
+#
+# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--name=name] [--append]
+# | arg: -r, --repo - Complete url of the extra repository.
+# | arg: -k, --key - url to get the public key.
+# | arg: -n, --name - Name for the files for this repo, $app as default value.
+# | arg: -a, --append - Do not overwrite existing files.
+ynh_install_extra_repo () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=rkna
+	declare -Ar args_array=( [r]=repo= [k]=key= [n]=name= [a]=append )
+	local repo
+	local key
+	local name
+	local append
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	name="${name:-$app}"
+	append=${append:-0}
+	key=${key:-0}
+
+	if [ $append -eq 1 ]
+	then
+		append="--append"
+		wget_append="tee -a"
+	else
+		append=""
+		wget_append="tee"
+	fi
+
+	# Split the repository into uri, suite and components.
+	# Remove "deb " at the beginning of the repo.
+	repo="${repo#deb }"
+
+	# Get the uri
+	local uri="$(echo "$repo" | awk '{ print $1 }')"
+
+	# Get the suite
+	local suite="$(echo "$repo" | awk '{ print $2 }')"
+
+	# Get the components
+	local component="${repo##$uri $suite }"
+
+	# Add the repository into sources.list.d
+	ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append
+
+	# Pin the new repo with the default priority, so it won't be used for upgrades.
+	# Build $pin from the uri without http and any sub path
+	local pin="${uri#*://}"
+	pin="${pin%%/*}"
+	ynh_pin_repo --package="*" --pin="origin \"$pin\"" --name="$name" $append
+
+	# Get the public key for the repo
+	if [ -n "$key" ]
+	then
+		mkdir -p "/etc/apt/trusted.gpg.d"
+		wget -q "$key" -O - | $wget_append /etc/apt/trusted.gpg.d/$name.gpg
+	fi
+
+	# Update the list of package with the new repo
+	ynh_package_update
+}
+
+# Remove an extra repository and the assiociated configuration.
+#
+# usage: ynh_remove_extra_repo [--name=name]
+# | arg: -n, --name - Name for the files for this repo, $app as default value.
+ynh_remove_extra_repo () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=n
+	declare -Ar args_array=( [n]=name= )
+	local name
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	name="${name:-$app}"
+
+	ynh_secure_remove "/etc/apt/sources.list.d/$name.list"
+	ynh_secure_remove "/etc/apt/preferences.d/$name"
+	ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg"
+
+	# Update the list of package to exclude the old repo
+	ynh_package_update
+}