diff --git a/tools/toolchain/scripts/stage5/install_elpa.sh b/tools/toolchain/scripts/stage5/install_elpa.sh
index 6145a6d9a2..9340e7a882 100755
--- a/tools/toolchain/scripts/stage5/install_elpa.sh
+++ b/tools/toolchain/scripts/stage5/install_elpa.sh
@@ -41,9 +41,7 @@ case "${with_elpa}" in
       echo "elpa-${elpa_ver} is already installed, skipping it."
     else
       require_env MATH_LIBS
-      # retrieve_package "${elpa_sha256}" "elpa-${elpa_ver}.tar.gz"
-      download_pkg_from_urlpath "${elpa_sha256}" "elpa-${elpa_ver}.tar.gz" \
-        https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${elpa_ver}
+      retrieve_package "${elpa_sha256}" "elpa-${elpa_ver}.tar.gz"
       echo "Installing from scratch into ${pkg_install_dir}"
       [ -d elpa-${elpa_ver} ] && rm -rf elpa-${elpa_ver}
       tar -xzf elpa-${elpa_ver}.tar.gz
diff --git a/tools/toolchain/scripts/stage6/install_plumed.sh b/tools/toolchain/scripts/stage6/install_plumed.sh
index 3f4d8057df..ad557207a3 100755
--- a/tools/toolchain/scripts/stage6/install_plumed.sh
+++ b/tools/toolchain/scripts/stage6/install_plumed.sh
@@ -29,9 +29,7 @@ case "$with_plumed" in
     if verify_checksums "${install_lock_file}"; then
       echo "plumed-${plumed_ver} is already installed, skipping it."
     else
-      # retrieve_package "${plumed_sha256}" "${plumed_pkg}"
-      download_pkg_from_urlpath "${plumed_sha256}" "${plumed_pkg}" \
-        https://github.com/plumed/plumed2/releases/download/v${plumed_ver}
+      retrieve_package "${plumed_sha256}" "${plumed_pkg}"
       echo "Installing from scratch into ${pkg_install_dir}"
       [ -d plumed-${plumed_ver} ] && rm -rf plumed-${plumed_ver}
       tar -xzf ${plumed_pkg}