diff --git a/scripts/install b/scripts/install
index 350eda4..532105b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -133,10 +133,7 @@ ynh_print_info "Setting up source files ..."
 
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app"
-pushd $final_path/$app
-	git checkout -b master
-popd
+ynh_setup_source "$final_path/$app"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/restore b/scripts/restore
index e332402..edae5e1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,10 +89,10 @@ chown -R "$app":"$app" "$final_path"
 ynh_print_info "Adding Erlang repository..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian jessie contrib"
+	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian jessie contrib" --key=https://packages.erlang-solutions.com/debian/erlang_solutions.asc
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	ynh_install_extra_repo "deb http://packages.erlang-solutions.com/debian stretch contrib"
+	ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian stretch contrib" --key=https://packages.erlang-solutions.com/debian/erlang_solutions.asc
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index af15ad0..65aa1ad 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,12 +116,7 @@ path_url=$(ynh_normalize_url_path $path_url)
 ynh_print_info "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src
-git clone --quiet https://git.pleroma.social/pleroma/pleroma "$final_path/upgrade"
-pushd "$final_path/upgrade"
-	git checkout -b master
-popd
-cp -a "$final_path/upgrade/." "$final_path/$app/."
-rm -r "$final_path/upgrade"
+ynh_setup_source "$final_path/$app"
 
 #=================================================
 # NGINX CONFIGURATION