diff --git a/Vagrantfile b/Vagrantfile
index 11d2032f..fd90f742 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,13 +3,13 @@
 
 MOUNT_POINT = '/home/vagrant/ganeti_webmgr'
 
-box_ver = "20140121"
-box_url = "http://vagrant.osuosl.org/centos-6-#{box_ver}.box"
-
 Vagrant.configure("2") do |config|
   config.vm.hostname = "gwm.example.org"
-  config.vm.box       = "centos-6-#{box_ver}"
-  config.vm.box_url   = "#{box_url}"
+  config.vm.box       = "bento/centos-6.8"
+
+  config.vm.provider 'virtualbox' do |v|
+    v.customize ['modifyvm', :id, '--cableconnected1', 'on']
+  end
 
   config.vm.network :private_network, ip: "33.33.33.100", adapter: 2
 
diff --git a/chef/environments/vagrant.json b/chef/environments/vagrant.json
index d5d1bd78..064540dd 100644
--- a/chef/environments/vagrant.json
+++ b/chef/environments/vagrant.json
@@ -18,6 +18,7 @@
         "host": "localhost",
         "port": 3306
       },
+      "path": "/home/vagrant/ganeti_webmgr",
       "apache": {
         "server_aliases": ["localhost"]
       },
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 4b5fd46f..c4a61a93 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -274,7 +274,8 @@ check_if_exists "$venv"
 if [ $upgrade -eq 0 ]; then
     echo "Installing to: $install_directory"
 
-    ${sudo} ${venv} --setuptools --no-site-packages "$install_directory"
+    ${sudo} ${venv} --no-site-packages "$install_directory"
+    echo "Ran venv."
     # check if virtualenv has succeeded
     if [ ! $? -eq 0 ]; then
         echo "${txtboldred}Something went wrong. Could not create virtual" \
@@ -294,10 +295,23 @@ else
     # automatically.
 fi
 
-### updating pip and setuptools to the newest versions, installing wheel
+### first install a local setuptools to bootstrap everything
+python="/usr/bin/python"
+${python} -m ensurepip --user
+echo
+
+### then install pip, which depends on setuptools, and can install the rest
 pip="$install_directory/bin/pip"
 check_if_exists "$pip"
-${sudo} ${pip} install $pip_proxy --upgrade setuptools pip wheel
+${sudo} ${pip} install ${pip_proxy} --upgrade pip
+echo
+
+### then install all of the dependencies of setuptools, which are cyclic
+${sudo} ${pip} install ${pip_proxy} --upgrade appdirs six pyparsing packaging
+echo
+
+### setuptools to the newest version, installing wheel
+${sudo} ${pip} install $pip_proxy --upgrade setuptools wheel
 echo
 
 # check if successfully upgraded pip and setuptools