diff --git a/builder/build.sh b/builder/build.sh
index e2369af..755b0c4 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -20,9 +20,11 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES
+apt-get -m --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES || true
+sleep 25
+apt-get -m --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES || true
+sleep 25
+apt-get --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
@@ -32,9 +34,11 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install -y $PACKAGES
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install -y $PACKAGES
-apt-get -o APT::Acquire::Retries=3 --ignore-missing --fix-missing install -y $PACKAGES
+apt-get -m --ignore-missing --fix-missing install -y $PACKAGES || true
+sleep 25
+apt-get -m --ignore-missing --fix-missing install -y $PACKAGES || true
+sleep 25
+apt-get --ignore-missing --fix-missing install -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"
diff --git a/builder/stage0/00-configure-apt/files/raspi.list b/builder/stage0/00-configure-apt/files/raspi.list
index 4b180e0..122287e 100644
--- a/builder/stage0/00-configure-apt/files/raspi.list
+++ b/builder/stage0/00-configure-apt/files/raspi.list
@@ -1,4 +1,3 @@
-deb http://www.mirrorservice.org/sites/archive.raspbian.org/raspbian
-f buster main
+deb http://archive.raspberrypi.org/debian/ buster main
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
 #deb-src http://archive.raspberrypi.org/debian/ buster main
diff --git a/builder/stage0/00-configure-apt/files/sources.list b/builder/stage0/00-configure-apt/files/sources.list
index 601d571..9cb5c06 100644
--- a/builder/stage0/00-configure-apt/files/sources.list
+++ b/builder/stage0/00-configure-apt/files/sources.list
@@ -1,3 +1,3 @@
-deb rsync://mirrors.ocf.berkeley.edu/raspbian/raspbian buster main contrib non-free rpi
+deb http://mirrors.ocf.berkeley.edu/raspbian/raspbian buster main contrib non-free rpi
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
 #deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi