diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh
index 37c7f169..9514d412 100644
--- a/scripts/bash_lib.sh
+++ b/scripts/bash_lib.sh
@@ -222,7 +222,10 @@ deb_setup_bb_artifacts_mirror() {
   # stop if any variable is undefined
   set -u
   bb_log_info "setup buildbot artifact repository"
-  sudo sh -c "echo 'deb [trusted=yes] $artifactsURL/$tarbuildnum/$parentbuildername/debs ./' >/etc/apt/sources.list.d/bb-artifacts.list"
+  sudo wget "$artifactsURL/$tarbuildnum/$parentbuildername/mariadb.sources" -O /etc/apt/sources.list.d/mariadb.sources || {
+    bb_log_err "unable to download $artifactsURL/$tarbuildnum/$parentbuildername/mariadb.sources"
+    exit 1
+  }
   set +u
 }
 
diff --git a/scripts/deb-install.sh b/scripts/deb-install.sh
index 97424814..c3055ed3 100755
--- a/scripts/deb-install.sh
+++ b/scripts/deb-install.sh
@@ -11,6 +11,10 @@ set -e
 # shellcheck disable=SC1091
 . ./bash_lib.sh
 
+# load OS variables
+# shellcheck disable=SC1091
+. /etc/os-release
+
 # function to be able to run the script manually (see bash_lib.sh)
 manual_run_switch "$1"
 
@@ -34,7 +38,7 @@ deb_setup_mariadb_mirror "$master_branch"
 # setup repository for BB artifacts
 deb_setup_bb_artifacts_mirror
 
-wget -O - "${artifactsURL}/${tarbuildnum}/${parentbuildername}/debs/Packages.gz" | gunzip >Packages
+wget -O - "${artifactsURL}/${tarbuildnum}/${parentbuildername}/dists/${VERSION_CODENAME}/main/binary-${arch}/Packages.gz" | gunzip >Packages
 
 set -x