diff --git a/tools/toolchain/scripts/stage4/install_libxs.sh b/tools/toolchain/scripts/stage4/install_libxs.sh
index fa4eccf05b..7db05f7d58 100755
--- a/tools/toolchain/scripts/stage4/install_libxs.sh
+++ b/tools/toolchain/scripts/stage4/install_libxs.sh
@@ -27,13 +27,7 @@ case "$with_libxs" in
     if verify_checksums "${install_lock_file}"; then
       echo "libxs-${libxs_ver} is already installed, skipping it."
     else
-      # retrieve_package "${libxs_sha256}" "libxs-${libxs_ver}.tar.gz"
-      if [ -f libxs-${libxs_ver}.tar.gz ]; then
-        echo "libxs-${libxs_ver}.tar.gz is found"
-      else
-        download_pkg_from_urlpath "${libxs_sha256}" "libxs-${libxs_ver}.tar.gz" \
-          https://github.com/hfp/libxs/releases/download/${libxs_ver}
-      fi
+      retrieve_package "${libxs_sha256}" "libxs-${libxs_ver}.tar.gz"
       [ -d libxs-${libxs_ver} ] && rm -rf libxs-${libxs_ver}
       tar -xzf libxs-${libxs_ver}.tar.gz
 
diff --git a/tools/toolchain/scripts/stage4/install_libxstream.sh b/tools/toolchain/scripts/stage4/install_libxstream.sh
index 641fd5bf90..9f2fc58a3d 100755
--- a/tools/toolchain/scripts/stage4/install_libxstream.sh
+++ b/tools/toolchain/scripts/stage4/install_libxstream.sh
@@ -34,13 +34,7 @@ case "$with_libxstream" in
     if verify_checksums "${install_lock_file}"; then
       echo "libxstream-${libxstream_ver} is already installed, skipping it."
     else
-      # retrieve_package "${libxstream_sha256}" "libxstream-${libxstream_ver}.tar.gz"
-      if [ -f libxstream-${libxstream_ver}.tar.gz ]; then
-        echo "libxstream-${libxstream_ver}.tar.gz is found"
-      else
-        download_pkg_from_urlpath "${libxstream_sha256}" "libxstream-${libxstream_ver}.tar.gz" \
-          https://github.com/hfp/libxs/releases/download/${libxstream_ver}
-      fi
+      retrieve_package "${libxstream_sha256}" "libxstream-${libxstream_ver}.tar.gz"
       [ -d libxstream-${libxstream_ver} ] && rm -rf libxstream-${libxstream_ver}
       tar -xzf libxstream-${libxstream_ver}.tar.gz
 
diff --git a/tools/toolchain/scripts/stage9/install_dbcsr.sh b/tools/toolchain/scripts/stage9/install_dbcsr.sh
index 187e083f5c..b326c9dd03 100755
--- a/tools/toolchain/scripts/stage9/install_dbcsr.sh
+++ b/tools/toolchain/scripts/stage9/install_dbcsr.sh
@@ -27,13 +27,7 @@ case "${with_dbcsr}" in
     if verify_checksums "${install_lock_file}"; then
       echo "dbcsr-${dbcsr_ver} is already installed, skipping it."
     else
-      # retrieve_package "${dbcsr_sha256}" "dbcsr-${dbcsr_ver}.tar.gz"
-      if [ -f dbcsr-${dbcsr_ver}.tar.gz ]; then
-        echo "dbcsr-${dbcsr_ver}.tar.gz is found"
-      else
-        download_pkg_from_urlpath "${dbcsr_sha256}" "dbcsr-${dbcsr_ver}.tar.gz" \
-          https://github.com/cp2k/dbcsr/releases/download/v${dbcsr_ver}
-      fi
+      retrieve_package "${dbcsr_sha256}" "dbcsr-${dbcsr_ver}.tar.gz"
       echo "Installing from scratch into ${pkg_install_dir}"
       [ -d dbcsr-${dbcsr_ver} ] && rm -rf dbcsr-${dbcsr_ver}
       tar -xzf dbcsr-${dbcsr_ver}.tar.gz