diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh
index 959ad54..758fc29 100644
--- a/Vagrant/bootstrap.sh
+++ b/Vagrant/bootstrap.sh
@@ -20,8 +20,8 @@ install_python_apt_source() {
 apt_install_prerequisites() {
   # Install prerequisites and useful tools
   apt-get update
-  #apt-get install -y apt-fast
-  time apt-fast install -y jq whois build-essential git docker docker-compose unzip mongodb-org python3.6 python3.6-dev
+  apt-get install -y apt-fast
+  apt-fast install -y jq whois build-essential git docker docker-compose unzip mongodb-org python3.6 python3.6-dev
   # Install pip for Python 3.6
   curl https://bootstrap.pypa.io/get-pip.py | sudo -H python3.6
 }
diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh
index 77d6c4e..f31f6a0 100755
--- a/ci/build_machine_bootstrap.sh
+++ b/ci/build_machine_bootstrap.sh
@@ -28,8 +28,6 @@ fi
 
 echo "Args: $ARGS"
 
-sed -i 's/archive.ubuntu.com/us.archive.ubuntu.com/g' /etc/apt/sources.list
-
 if [[ "$VAGRANT_ONLY" -eq 1 ]] && [[ "$PACKER_ONLY" -eq 1 ]]; then
   echo "Somehow this build is configured as both packer-only and vagrant-only. This means something has gone horribly wrong."
   exit 1
@@ -37,6 +35,7 @@ fi
 
 # Install Virtualbox 5.2
 echo "deb http://download.virtualbox.org/virtualbox/debian xenial contrib" >> /etc/apt/sources.list
+sed -i "2ideb mirror://mirrors.ubuntu.com/mirrors.txt xenial main restricted universe multiverse\ndeb mirror://mirrors.ubuntu.com/mirrors.txt xenial-updates main restricted universe multiverse\ndeb mirror://mirrors.ubuntu.com/mirrors.txt xenial-backports main restricted universe multiverse\ndeb mirror://mirrors.ubuntu.com/mirrors.txt xenial-security main restricted universe multiverse" /etc/apt/sources.list
 wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
 apt-get update
 apt-get install -y linux-headers-"$(uname -r)" virtualbox-5.2 build-essential unzip git ufw apache2