diff --git a/builder/build.sh b/builder/build.sh
index 8cc77ec..9aa0dd7 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -20,7 +20,7 @@ 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 install --no-install-recommends -y $PACKAGES
+apt-get -o Acquire::ForceIPv6=true -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
@@ -30,7 +30,7 @@ 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 install -y $PACKAGES
+apt-get -o Acquire::ForceIPv6=true -o APT::Acquire::Retries=3 install -y $PACKAGES
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"
diff --git a/builder/stage0/00-configure-apt/files/sources.list b/builder/stage0/00-configure-apt/files/sources.list
index bbcd1d1..61820ac 100644
--- a/builder/stage0/00-configure-apt/files/sources.list
+++ b/builder/stage0/00-configure-apt/files/sources.list
@@ -1,3 +1,3 @@
-deb http://mirror.umd.edu/raspbian/raspbian buster main contrib non-free rpi
+deb http://raspbian.raspberrypi.org/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