diff --git a/scripts/install b/scripts/install
index 5d1b43b..cffefaa 100755
--- a/scripts/install
+++ b/scripts/install
@@ -92,9 +92,9 @@ ynh_app_setting_set $app port $port
 ynh_print_info "Adding Erlang repository..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian jessie contrib" --key="https://packages.erlang-solutions.com/debian/erlang_solutions.asc"
+	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian jessie contrib" --key="https://packages.erlang-solutions.com/debian/dists/jessie/Release.gpg"
 elif [ "$(lsb_release --codename --short)" == "stretch" ]; then
-	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian stretch contrib" --key="https://packages.erlang-solutions.com/debian/erlang_solutions.asc"
+	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian stretch contrib" --key="https://packages.erlang-solutions.com/debian/dists/stretch/Release.gpg"
 fi
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 7907ede..30ac277 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -75,8 +75,7 @@ ynh_remove_app_dependencies
 #=================================================
 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
 
 #=================================================
 # REMOVE APP MAIN DIR