diff --git a/scripts/cord-bootstrap.sh b/scripts/cord-bootstrap.sh
index 969ffc2..7ebe291 100755
--- a/scripts/cord-bootstrap.sh
+++ b/scripts/cord-bootstrap.sh
@@ -120,12 +120,12 @@
 
   if ! vagrant box list | grep -q ubuntu/trusty64.*libvirt
   then
-    add_box ubuntu/trusty64
+    add_box ubuntu/trusty64 https://app.vagrantup.com/ubuntu/boxes/trusty64
   fi
 }
 
 function add_box() {
-  vagrant box list | grep $1 | grep virtualbox || vagrant box add $1
+  vagrant box list | grep $1 | grep virtualbox || vagrant box add $2
   vagrant box list | grep $1 | grep libvirt || vagrant mutate $1 libvirt --input-provider virtualbox
 }
 
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
deleted file mode 100755
index 4778102..0000000
--- a/scripts/cord-in-a-box.sh
+++ /dev/null
@@ -1,424 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# cord-in-a-box.sh
-
-set -e -x
-
-# start time, used to name logfiles
-START_T=$(date -u "+%Y%m%d_%H%M%SZ")
-
-# Paths
-CORDDIR=~/cord
-VMDIR=/opt/cord/build/
-CONFIG=config/cord_in_a_box.yml
-SSHCONFIG=~/.ssh/config
-VAGRANT_CWD=${CORDDIR}/build/
-VAGRANT_VM_PREFIX=build
-
-# CORD versioning
-REPO_BRANCH="cord-4.0"
-VERSION_STRING="CiaB 4.0"
-
-function finish {
-    EXIT=$?
-    python $CORDDIR/build/elk-logger/mixpanel --event FINISH --corddir $CORDDIR --finish --status $EXIT
-}
-
-function add_box() {
-  vagrant box list | grep $1 | grep virtualbox || vagrant box add $1
-  vagrant box list | grep $1 | grep libvirt || vagrant mutate $1 libvirt --input-provider virtualbox
-}
-
-function run_stage {
-    cd $CORDDIR
-    python build/elk-logger/mixpanel --event $1-start --corddir $CORDDIR
-
-    echo "==> "$1": Starting"
-    $1
-    echo "==> "$1": Complete"
-
-    cd $CORDDIR
-    python build/elk-logger/mixpanel --event $1-end --corddir $CORDDIR
-}
-
-function cleanup_from_previous_test() {
-  echo "## Cleanup ##"
-
-  if [ -d $CORDDIR/build ]
-  then
-    echo "Destroying all Vagrant VMs"
-    cd $CORDDIR/build
-    for i in `seq 12`; do
-      sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD vagrant destroy" && break
-    done
-  fi
-
-  echo "Removing $CORDDIR"
-  cd ~
-  rm -rf $CORDDIR
-}
-
-function bootstrap() {
-
-  echo "Generating build id"
-  rm -f /tmp/cord-build-version
-  dd bs=18 count=1 if=/dev/urandom | base64 | tr +/ _. > /tmp/cord-build
-
-  if [ ! -x "/usr/local/bin/repo" ]
-  then
-    echo "Installing repo..."
-    REPO_SHA256SUM="394d93ac7261d59db58afa49bb5f88386fea8518792491ee3db8baab49c3ecda"
-    curl -o /tmp/repo 'https://gerrit.opencord.org/gitweb?p=repo.git;a=blob_plain;f=repo;hb=refs/heads/stable'
-    echo "$REPO_SHA256SUM  /tmp/repo" | sha256sum -c -
-    sudo mv /tmp/repo /usr/local/bin/repo
-    sudo chmod a+x /usr/local/bin/repo
-  fi
-
-  if [ ! -x "/usr/bin/vagrant" ]
-  then
-    echo "Installing vagrant and associated tools..."
-    VAGRANT_SHA256SUM="faff6befacc7eed3978b4b71f0dbb9c135c01d8a4d13236bda2f9ed53482d2c4"  # version 1.9.3
-    curl -o /tmp/vagrant.deb https://releases.hashicorp.com/vagrant/1.9.3/vagrant_1.9.3_x86_64.deb
-    echo "$VAGRANT_SHA256SUM  /tmp/vagrant.deb" | sha256sum -c -
-    sudo apt-get update
-    sudo dpkg -i /tmp/vagrant.deb
-    sudo apt-get -y install qemu-kvm libvirt-bin libvirt-dev curl nfs-kernel-server git build-essential python-pip
-    sudo adduser $USER libvirtd
-    sudo pip install pyparsing python-logstash mixpanel
-  fi
-
-  echo "Installing vagrant plugins..."
-  vagrant plugin list | grep vagrant-libvirt || vagrant plugin install vagrant-libvirt --plugin-version 0.0.35
-  vagrant plugin list | grep vagrant-mutate || vagrant plugin install vagrant-mutate
-
-  add_box ubuntu/trusty64
-
-  echo "Creating SSH key..."
-  [ -e ~/.ssh/id_rsa ] || ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
-
-  if [ ! -d "$CORDDIR" ]
-  then
-    echo "Downloading CORD/XOS..."
-
-    if [ ! -e "~/.gitconfig" ]
-    then
-      echo "No ~/.gitconfig, setting testing defaults"
-      git config --global user.name 'Test User'
-      git config --global user.email 'test@null.com'
-      git config --global color.ui false
-    fi
-
-    # make sure we can find gerrit.opencord.org as DNS failures will fail the build
-    dig +short gerrit.opencord.org || (echo "ERROR: gerrit.opencord.org can't be looked up in DNS" && exit 1)
-
-    mkdir $CORDDIR && cd $CORDDIR
-    repo init -u https://gerrit.opencord.org/manifest -b $REPO_BRANCH
-    repo sync
-
-    # check out gerrit branches using repo
-    for gerrit_branch in ${GERRIT_BRANCHES[@]}; do
-      echo "Checking out opencord gerrit branch: $gerrit_branch"
-      repo download ${gerrit_branch/:/ }
-    done
-  fi
-
-  exec > >(tee -i $CORDDIR/install.out)
-  exec 2>&1
-
-  # Start tracking failures from this point
-  trap finish EXIT
-
-}
-
-function cloudlab_setup() {
-
-  # Don't do anything if not a CloudLab node
-  [ ! -d /usr/local/etc/emulab ] && return
-
-  # The watchdog will sometimes reset groups, turn it off
-  if [ -e /usr/local/etc/emulab/watchdog ]
-  then
-    sudo /usr/bin/perl -w /usr/local/etc/emulab/watchdog stop
-    sudo mv /usr/local/etc/emulab/watchdog /usr/local/etc/emulab/watchdog-disabled
-  fi
-
-  # Mount extra space, if haven't already
-  if [ ! -d /mnt/extra ]
-  then
-    # for NVME SSD on Utah Cloudlab, not supported by mkextrafs
-    if $(df | grep -q nvme0n1p1) && [ -e /usr/testbed/bin/mkextrafs ]
-    then
-      sudo mkdir -p /mnt/extra
-
-      # set partition type of 4th partition to Linux, ignore errors
-      echo -e "t\n4\n82\np\nw\nq" | sudo fdisk /dev/nvme0n1 || true
-
-      sudo mkfs.ext4 /dev/nvme0n1p4
-      echo "/dev/nvme0n1p4 /mnt/extra/ ext4 defaults 0 0" | sudo tee -a /etc/fstab
-      sudo mount /mnt/extra
-      mount | grep nvme0n1p4 || (echo "ERROR: NVME mkfs/mount failed, exiting!" && exit 1)
-
-    elif [ -e /usr/testbed/bin/mkextrafs ]  # if on Clemson/Wisconsin Cloudlab
-    then
-      sudo mkdir -p /mnt/extra
-
-      # Sometimes this command fails on the first try
-      sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/mnt/extra/" || sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/mnt/extra/"
-
-      # Check that the mount succeeded (sometimes mkextrafs succeeds but device not mounted)
-      mount | grep sdb || (echo "ERROR: mkextrafs failed, exiting!" && exit 1)
-    fi
-  fi
-
-  # replace /var/lib/libvirt/images with a symlink
-  [ -d /var/lib/libvirt/images/ ] && [ ! -h /var/lib/libvirt/images ] && sudo rmdir /var/lib/libvirt/images
-  sudo mkdir -p /mnt/extra/libvirt_images
-
-  if [ ! -e /var/lib/libvirt/images ]
-  then
-    sudo ln -s /mnt/extra/libvirt_images /var/lib/libvirt/images
-  fi
-}
-
-function elk_up() {
-
-  cd $CORDDIR
-  sudo chmod +x build/elk-logger/logstash_tail
-
-  build/elk-logger/logstash_tail --file install.out --hostport 10.100.198.201:5617 &
-}
-
-function vagrant_vms_up() {
-
-  echo "Bringing up CORD-in-a-Box Vagrant VM's..."
-  cd $CORDDIR/build
-
-  sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD vagrant up corddev prod --provider libvirt"
-
-  # This is a workaround for a weird issue with ARP cache timeout breaking 'vagrant ssh'
-  # It allows SSH'ing to the machine via 'ssh corddev'
-  sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD vagrant ssh-config corddev prod > $SSHCONFIG"
-
-  # copy host SSH keypair to corddev
-  scp ~/.ssh/id_rsa* corddev:.ssh
-  ssh corddev "chmod go-r ~/.ssh/id_rsa"
-}
-
-function install_head_node() {
-  cd $CORDDIR/build
-
-  # SSH config saved earlier allows us to connect to VM without running 'vagrant'
-  ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG fetch"
-  ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG buildImages"
-  ssh corddev "cd $VMDIR; ping -c 3 prod; ./gradlew -PdeployConfig=$VMDIR/$CONFIG -PtargetReg=10.100.198.201:5000 publish"
-  ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG deploy"
-}
-
-function set_up_maas_user() {
-  # Set up MAAS user on server to restart nodes via libvirt
-  grep maas /etc/passwd || sudo useradd -m maas
-  sudo adduser maas libvirtd
-
-  # Copy generated public key to maas user's authorized_keys
-  sudo su maas -c "mkdir -p ~/.ssh"
-  sudo cp $HOME/.ssh/id_rsa.pub ~maas/.ssh/authorized_keys
-  sudo chown maas:maas ~maas/.ssh/authorized_keys
-
-  # Copy generated private key to maas user's home dir in prod VM
-  scp $HOME/.ssh/id_rsa prod:/tmp
-  ssh prod "sudo mkdir -p ~maas/.ssh"
-  ssh prod "sudo cp /tmp/id_rsa ~maas/.ssh/id_rsa"
-  ssh prod "sudo chown -R maas:maas ~maas/.ssh"
-}
-
-function turn_off_learning () {
-  NET=$1
-  BRIDGE=`sudo virsh net-info $NET|grep "Bridge:"|awk '{print $2}'`
-  sudo brctl setageing $BRIDGE 0
-  sudo brctl stp $BRIDGE off
-}
-
-function leaf_spine_up() {
-  cd $CORDDIR/build
-
-  if [[ $FABRIC -ne 0 ]]
-  then
-      sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD FABRIC=$FABRIC vagrant up leaf-1 leaf-2 spine-1 spine-2 --provider libvirt"
-  else
-      # Linux bridging seems to be having issues with two spine switches
-      sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD FABRIC=$FABRIC vagrant up leaf-1 leaf-2 spine-1 --provider libvirt"
-  fi
-
-  # Turn off MAC learning on "links" -- i.e., bridges created by libvirt.
-  # Without this, sometimes packets are dropped because the bridges
-  # think they are not local -- this needs further investigation.
-  # A better solution might be to replace the bridges with UDP tunnels, but this
-  # is not supported with the version of libvirt available on Ubuntu 14.04.
-  turn_off_learning head-node-leaf-1
-  turn_off_learning compute-node-1-leaf-1
-  turn_off_learning compute-node-2-leaf-2
-  turn_off_learning compute-node-3-leaf-2
-  turn_off_learning leaf-1-spine-1
-  turn_off_learning leaf-1-spine-2
-  turn_off_learning leaf-2-spine-1
-  turn_off_learning leaf-2-spine-2
-}
-
-function add_compute_node() {
-  echo add_compute_node: $1 $2
-
-  cd $CORDDIR/build
-  sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD vagrant up $1 --provider libvirt"
-
-  # Set up power cycling for the compute node and wait for it to be provisioned
-  ssh prod "cd $VMDIR/ansible; ansible-playbook maas-provision.yml --extra-vars \"maas_user=maas vagrant_name=$2\""
-
-  echo ""
-  echo "$1 is fully provisioned!"
-}
-
-function initialize_fabric() {
-  echo "Initializing fabric"
-  ssh prod "cd $VMDIR/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-refresh-fabric.yml"
-
-  echo "Fabric ping test"
-  ssh prod "cd $VMDIR/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-fabric-pingtest.yml"
-}
-
-function run_e2e_test () {
-  cd $CORDDIR/build
-
-  # User has been added to the lbvirtd group, but su $USER to be safe
-  ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG postDeployTests"
-}
-
-function run_diagnostics() {
-  ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG PIrunDiag"
-}
-
-# Parse options
-GERRIT_BRANCHES=
-RUN_TEST=0
-SETUP_ONLY=0
-DIAGNOSTICS=0
-CLEANUP=0
-FABRIC=0
-#By default, cord-in-a-box creates 1 compute node. If more than one compute is
-#needed, use -n option
-NUM_COMPUTE_NODES=1
-
-while getopts "b:cdfhn:stv" opt; do
-  case ${opt} in
-    b ) GERRIT_BRANCHES+=("$OPTARG")
-      ;;
-    c ) CLEANUP=1
-      ;;
-    d ) DIAGNOSTICS=1
-      ;;
-    f ) FABRIC=1
-      ;;
-    h ) echo "Usage:"
-      echo "    $0                install OpenStack and prep XOS and ONOS VMs [default]"
-      echo "    $0 -b <project:changeset/revision>  checkout a changesets from gerrit. Can"
-      echo "                      be used multiple times."
-      echo "    $0 -c             cleanup from previous test"
-      echo "    $0 -d             run diagnostic collector"
-      echo "    $0 -f             use ONOS fabric (EXPERIMENTAL)"
-      echo "    $0 -h             display this help message"
-      echo "    $0 -n #           number of compute nodes to setup. Currently max 2 nodes can be supported"
-      echo "    $0 -s             run initial setup phase only (don't start building CORD)"
-      echo "    $0 -t             do install, bring up cord-pod configuration, run E2E test"
-      echo "    $0 -v             print CiaB version and exit"
-      exit 0
-      ;;
-    n ) NUM_COMPUTE_NODES=$OPTARG
-      ;;
-    s ) SETUP_ONLY=1
-      ;;
-    t ) RUN_TEST=1
-      ;;
-    v ) echo "$VERSION_STRING ($REPO_BRANCH branch)"
-      exit 0
-      ;;
-    \? ) echo "Invalid option: -$OPTARG"
-      exit 1
-      ;;
-  esac
-done
-
-# What to do
-if [[ $CLEANUP -eq 1 ]]
-then
-  cleanup_from_previous_test
-fi
-
-echo ""
-echo "Preparing to install $VERSION_STRING ($REPO_BRANCH branch)"
-echo ""
-
-bootstrap
-run_stage cloudlab_setup
-run_stage vagrant_vms_up
-run_stage elk_up
-
-if [[ $SETUP_ONLY -ne 0 ]]
-then
-  echo "Finished build environment setup, exiting..."
-  exit 0
-fi
-
-run_stage install_head_node
-run_stage set_up_maas_user
-run_stage leaf_spine_up
-
-if [[ $NUM_COMPUTE_NODES -gt 3 ]]
-then
-   echo "currently max only three compute nodes can be supported..."
-   NUM_COMPUTE_NODES=3
-fi
-
-echo "==> Adding compute nodes: Starting"
-for i in `seq 1 $NUM_COMPUTE_NODES`;
-do
-   echo adding the compute node: compute-node-$i
-   add_compute_node compute-node-$i ${VAGRANT_VM_PREFIX}_compute-node-$i
-done
-echo "==> Adding compute nodes: Complete"
-
-# run diagnostics both before/after the fabric/e2e tests
-if [[ $DIAGNOSTICS -eq 1 ]]
-then
-  run_diagnostics
-fi
-
-
-if [[ $FABRIC -ne 0 ]]
-then
-  run_stage initialize_fabric
-fi
-
-if [[ $RUN_TEST -eq 1 ]]
-then
-  run_stage run_e2e_test
-fi
-
-if [[ $DIAGNOSTICS -eq 1 ]]
-then
-  run_stage run_diagnostics
-fi
-
-exit 0