diff --git a/complex-yaml/machines.yml b/complex-yaml/machines.yml
index 5810792..785f414 100644
--- a/complex-yaml/machines.yml
+++ b/complex-yaml/machines.yml
@@ -1,8 +1,8 @@
 ---
 - box:
-    vmw: slowe/debian-81-x64
-    vb: debian/jessie64
-  name: jessie
+    vmw: "bento/debian-8.6"
+    vb: "debian/jessie64"
+  name: "jessie"
   nics:
     - type: "private_network"
       ip_addr: "192.168.100.101"
diff --git a/consul-ansible/README.md b/consul-ansible/README.md
index 2beac5f..13e791c 100644
--- a/consul-ansible/README.md
+++ b/consul-ansible/README.md
@@ -24,7 +24,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, the Vagrant VMware plugin, and Ansible. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the vmware_fusion provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the vmware_fusion provider. The "bento/ubuntu-14.04" box is a good option here.
 
 2. Place the files from the `consul` directory of this GitHub repository into a directory on your local system. You can clone the entire "learning-tools" repository (using `git clone`) or just download the specific files from the the `consul` folder.
 
diff --git a/consul-ansible/machines.yml b/consul-ansible/machines.yml
index 11b46ec..679c3c2 100644
--- a/consul-ansible/machines.yml
+++ b/consul-ansible/machines.yml
@@ -1,21 +1,21 @@
 ---
 - name: "consul-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.101"
 - name: "consul-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.102"
 - name: "consul-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/consul/README.md b/consul/README.md
index 1b41078..1ba6104 100644
--- a/consul/README.md
+++ b/consul/README.md
@@ -20,7 +20,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed the virtualization provider (VMware Fusion or VirtualBox), Vagrant, and any necessary plugins (such as the Vagrant VMware plugin). Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for your virtualization provider. I have a base box for the "vmware_desktop" provider you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for your virtualization provider. For a VMware-formatted box, the "bento/ubuntu-14.04" box is one good option; for VirtualBox, the "ubuntu/trusty64" box will work just fine.
 
 2. Place the files from the `consul` directory of this GitHub repository into a directory on your local system. You can clone the entire "learning-tools" repository (using `git clone`) or just download the specific files from the the `consul` folder.
 
diff --git a/docker-macvlan/README.md b/docker-macvlan/README.md
index e56d9c8..0ea9e13 100644
--- a/docker-macvlan/README.md
+++ b/docker-macvlan/README.md
@@ -16,7 +16,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, and the Vagrant VMware plugin. Please refer to the documentation for those products for more information on installation or configuration. Note that Internet access is required when using `vagrant up` to create this environment.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x86_64 Vagrant box. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x86_64 Vagrant box. The "bento/ubuntu-14.04" box is a good option here.
 
 2. Place the files from the `docker-macvlan` directory of this GitHub repository into a directory on your local system. You can clone the entire "learning-tools" repository (using `git clone`) or just download the specific files from the the `docker-macvlan` folder.
 
diff --git a/docker-macvlan/machines.yml b/docker-macvlan/machines.yml
index 1b318fc..e3e8033 100644
--- a/docker-macvlan/machines.yml
+++ b/docker-macvlan/machines.yml
@@ -1,15 +1,15 @@
 ---
-- name: docker-01
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 1024
-  vcpu: 1
-  ip_addr: 192.168.100.100
+- name: "docker-01"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "1024"
+  vcpu: "1"
+  ip_addr: "192.168.100.100"
   docker: true
-- name: remote-01
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
-  ip_addr: 192.168.100.101
+- name: "remote-01"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
+  ip_addr: "192.168.100.101"
   docker: false
diff --git a/docker-swarm-etcd/README.md b/docker-swarm-etcd/README.md
index 66a769d..b322e80 100644
--- a/docker-swarm-etcd/README.md
+++ b/docker-swarm-etcd/README.md
@@ -22,7 +22,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed your virtualization provider (VMware Fusion/Workstation or VirtualBox), Vagrant, and any applicable Vagrant plugins (like the Vagrant VMware plugin). Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for your virtualization provider. If you are using VMware Fusion/Workstation, I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for your virtualization provider. If you are using VMware Fusion/Workstation, the "bento/ubuntu-14.04" box is a good option. For VirtualBox, the "ubuntu/trusty64" box will work fine.
 
 2. Use `vagrant box add` to install a CoreOS base box. The `Vagrantfile` assumes you are using the Stable release of CoreOS (the box named `coreos-stable`). If the box name is different, you'll need to edit both `machines.yml` and the `Vagrantfile` to specify the correct box name. You'll need to be sure to use a version of CoreOS that comes with Docker 1.4.0 or later, as Swarm requires Docker => 1.4.0. Note that CoreOS Stable 557.2.0 comes with Docker 1.4.1.
 
diff --git a/docker-swarm-etcd/machines.yml b/docker-swarm-etcd/machines.yml
index 9e55203..8b1bfac 100644
--- a/docker-swarm-etcd/machines.yml
+++ b/docker-swarm-etcd/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "etcd-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -9,7 +9,7 @@
   etcd: true
 - name: "etcd-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -17,7 +17,7 @@
   etcd: true
 - name: "etcd-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/docker-swarm-ha/README.md b/docker-swarm-ha/README.md
index c204653..1368c5d 100644
--- a/docker-swarm-ha/README.md
+++ b/docker-swarm-ha/README.md
@@ -4,35 +4,35 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 ## Contents
 
-* **config.json.erb**: This is an ERB template used by Vagrant (and leveraging the information provided in `servers.yml`) to create VM-specific Consul configuration files. When you run `vagrant up` or `vagrant status`, this template will be used to create three VM-specific configuration files, each named "hostname.config.json", where "hostname" is the VM name specified in `servers.yml`. No edits to this file are needed.
+* **config.json.erb**: This is an ERB template used by Vagrant (and leveraging the information provided in `machines.yml`) to create VM-specific Consul configuration files. When you run `vagrant up` or `vagrant status`, this template will be used to create three VM-specific configuration files, each named "hostname.config.json", where "hostname" is the VM name specified in `machines.yml`. No edits to this file are needed.
 
 * **consul.conf**: This is an Ubuntu Upstart script for Consul. No changes or edits to this file are needed.
 
 * **consul.sh**: This Bash shell script is used as a provisioning tool by Vagrant when setting up the Consul VMs. No changes to this file are needed.
 
+* **machines.yml**: This is a YAML file containing the configuration data used by Vagrant when creating and provisioning VMs. This Vagrant environment expects six (6) values in this file for each VM: name, Vagrant box, desired RAM, desired vCPUs, private IP address, and role (currently set to either "consul" or "docker"). At a minimum, you'll need to edit this file to specify the correct Vagrant box. Any other changes to this file are optional. Generally, the only other change that might be desired is to change the private IP addresses given to the VMs.
+
 * **README.md**: The file you're currently reading.
 
-* **servers.yml**: This is a YAML file containing the configuration data used by Vagrant when creating and provisioning VMs. This Vagrant environment expects six (6) values in this file for each VM: name, Vagrant box, desired RAM, desired vCPUs, private IP address, and role (currently set to either "consul" or "docker"). At a minimum, you'll need to edit this file to specify the correct Vagrant box. Any other changes to this file are optional. Generally, the only other change that might be desired is to change the private IP addresses given to the VMs.
-
-* **Vagrantfile**: This file is used by Vagrant to spin up the virtual machines for this environment. No changes need to be made to this document, as all the configuration data is found in other files (like `servers.yml`). However, if you are using a virtualization solution _other_ than VMware Fusion, you might need to make changes to this file.
+* **Vagrantfile**: This file is used by Vagrant to spin up the virtual machines for this environment. No changes need to be made to this document, as all the configuration data is found in other files (like `machines.yml`). However, if you are using a virtualization solution _other_ than VMware Fusion, you might need to make changes to this file.
 
 ## Instructions
 
 These instructions assume you've already installed VMware Fusion, Vagrant, and the Vagrant VMware plugin. Please refer to the documentation for those products for more information on installation or configuration. Note that Internet access is required when using `vagrant up` to create this environment.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x86_64 Vagrant box. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x86_64 Vagrant box. For a VMware-formatted box, the "bento/ubuntu-14.04" box is a good option. For VirtualBox, the "ubuntu/trusty64" box will work fine.
 
 2. Place the files from the `docker-swarm-ha` directory of this GitHub repository into a directory on your local system. You can clone the entire "learning-tools" repository (using `git clone`) or just download the specific files from the the `docker-swarm-ha` folder.
 
-3. If necessary, edit `servers.yml` to specify the name of the Vagrant box downloaded in step 1. You may also make changes to the private IP addresses or the RAM/CPU settings, although no changes are required.
+3. If necessary, edit `machines.yml` to specify the name of the Vagrant box downloaded in step 1. You may also make changes to the private IP addresses or the RAM/CPU settings, although no changes are required.
 
-4. Run `vagrant up` to instantiate the learning environment. This will spin up six (6) VMs based on the Ubuntu 14.04 base box you downloaded in step 1 and specified in `servers.yml` in step 3. Vagrant will also appropriately configure each VM and start the necessary services. Depending on the speed of your system and your Internet connection, this may take a few minutes.
+4. Run `vagrant up` to instantiate the learning environment. This will spin up six (6) VMs based on the Ubuntu 14.04 base box you downloaded in step 1 and specified in `machines.yml` in step 3. Vagrant will also appropriately configure each VM and start the necessary services. Depending on the speed of your system and your Internet connection, this may take a few minutes.
 
 5. Use `vagrant ssh docker-01` to connect to the first Docker host and join the Docker Engine to a Swarm cluster:
 
         docker run -d swarm join --addr=192.168.100.104 consul://192.168.100.101:8500/swarm
 
-    If you changed the private IP addresses in `servers.yml`, be sure to supply the appropriate IP addresses from that file in the command above.
+    If you changed the private IP addresses in `machines.yml`, be sure to supply the appropriate IP addresses from that file in the command above.
 
 6. Repeat step #5 for the second and third Docker VMs, substituting the correct IP address each time. This means that the `--addr=` parameter changes, but the `consul://...` URL does _not_ change.
 
diff --git a/docker-swarm-ha/machines.yml b/docker-swarm-ha/machines.yml
index 905483f..ba4dc6c 100644
--- a/docker-swarm-ha/machines.yml
+++ b/docker-swarm-ha/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "consul-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -9,7 +9,7 @@
   role: "consul"
 - name: "consul-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -17,7 +17,7 @@
   role: "consul"
 - name: "consul-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -25,7 +25,7 @@
   role: "consul"
 - name: "docker-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -33,7 +33,7 @@
   role: "docker"
 - name: "docker-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -41,7 +41,7 @@
   role: "docker"
 - name: "docker-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/docker-swarm/README.md b/docker-swarm/README.md
index cade286..888adff 100644
--- a/docker-swarm/README.md
+++ b/docker-swarm/README.md
@@ -22,7 +22,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed your virtualization provider (VMware Fusion/Workstation or VirtualBox), Vagrant, and any necessary plugins (such as the Vagrant VMware plugin). Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box. If you need a base box formatted for the VMware provider, I have a base box you can use for this purpose; to use my VMware-formatted Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box. The "bento/ubuntu-14.04" box is a good option here.
 
 2. Use `vagrant box add` to install a CoreOS base box. The `Vagrantfile` assumes you are using the Stable release of CoreOS (the box named `coreos-stable`). If the box name is different, you'll need to edit the `Vagrantfile` accordingly. You'll need to be sure to use a version of CoreOS that comes with Docker 1.4.0 or later, as Swarm requires Docker => 1.4.0. Note that CoreOS Stable 557.2.0 comes with Docker 1.4.1.
 
diff --git a/docker-swarm/machines.yml b/docker-swarm/machines.yml
index d335e7b..ada125d 100644
--- a/docker-swarm/machines.yml
+++ b/docker-swarm/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "consul-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -9,7 +9,7 @@
   role: "consul"
 - name: "consul-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -17,7 +17,7 @@
   role: "consul"
 - name: "consul-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/kvm-macvtap/README.md b/kvm-macvtap/README.md
index 1e8a53e..5efd2c3 100644
--- a/kvm-macvtap/README.md
+++ b/kvm-macvtap/README.md
@@ -24,7 +24,7 @@ These instructions assume you've already installed VMware Fusion, Vagrant, the V
 
 Note that you'll also need a VNC client to connect the console of the nested KVM VM; these instructions assume you've already installed, configured, and tested a VNC client.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. The "bento/ubuntu-14.04" box is a good option here. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
 2. Copy the files from the `kvm-macvtap` directory of this repository (the "learning-tools" repository) to a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `kvm-macvtap` directory.
 
diff --git a/kvm-macvtap/machines.yml b/kvm-macvtap/machines.yml
index b1d74d6..429774d 100644
--- a/kvm-macvtap/machines.yml
+++ b/kvm-macvtap/machines.yml
@@ -1,13 +1,13 @@
 ---
 - name: "kvm-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
+  vmw_box: "bento/ubuntu-14.04"
   ram: "1024"
   vcpu: "1"
   ip_addr: "192.168.100.100"
   nested: true
   provision: "provision.yml"
 - name: "remote-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
+  vmw_box: "bento/ubuntu-14.04"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.110"
diff --git a/kvm/README.md b/kvm/README.md
index 42647d7..4ebbcea 100644
--- a/kvm/README.md
+++ b/kvm/README.md
@@ -20,7 +20,7 @@ Note that this environment does **not** work with VirtualBox, as it relies on su
 
 These instructions assume you've already installed VMware Fusion, Vagrant, the Vagrant VMware plugin, and Ansible. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. The "bento/ubuntu-14.04" box is a good option here. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
 2. Copy the files from the `kvm` directory of this repository (the "learning-tools" repository) to a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `kvm` directory.
 
diff --git a/kvm/machines.yml b/kvm/machines.yml
index 26e8f93..7f3efa6 100644
--- a/kvm/machines.yml
+++ b/kvm/machines.yml
@@ -1,6 +1,6 @@
 ---
 - name: "kvm-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
+  vmw_box: "bento/ubuntu-14.04"
   ram: "1024"
   vcpu: "1"
   ip_addr: "192.168.100.100"
diff --git a/lxc/README.md b/lxc/README.md
index 643cf63..4b7d0e1 100644
--- a/lxc/README.md
+++ b/lxc/README.md
@@ -18,7 +18,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, the Vagrant VMware plugin, and Ansible. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. The "bento/ubuntu-14.04" box is a good option here. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
 2. Place the files from the `lxc` directory of this GitHub repository (the "lowescott/learning-tools" repository) into a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `lxc` directory.
 
diff --git a/lxc/machines.yml b/lxc/machines.yml
index 3ecb61e..08d396d 100644
--- a/lxc/machines.yml
+++ b/lxc/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "lxc-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/lxd-ansible/README.md b/lxd-ansible/README.md
index 3687982..27b3ea9 100644
--- a/lxd-ansible/README.md
+++ b/lxd-ansible/README.md
@@ -20,7 +20,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, the Vagrant VMware plugin, and Ansible. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. The "bento/ubuntu-14.04" box is a good option here. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
 2. Place the files from the `lxd` directory of this GitHub repository (the "lowescott/learning-tools" repository) into a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `lxd` directory.
 
diff --git a/lxd-ansible/machines.yml b/lxd-ansible/machines.yml
index 0573554..5efc8c1 100644
--- a/lxd-ansible/machines.yml
+++ b/lxd-ansible/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "lxd-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/lxd-shell/README.md b/lxd-shell/README.md
index e5f0aed..c1c673f 100644
--- a/lxd-shell/README.md
+++ b/lxd-shell/README.md
@@ -1,12 +1,12 @@
 # Running LXC-Based OS Containers with LXD
 
-These files were created to allow users to use Vagrant ([http://www.vagrantup.com](http://www.vagrantup.com)) quickly and relatively easily experiment with LXD (pronounced "lex-dee"), a new daemon and CLI client for working with LXC-based OS containers. The configuration was tested using Vagrant 1.7.2, VMware Fusion 6.0.5, and the Vagrant VMware plugin.
+These files were created to allow users to use Vagrant ([http://www.vagrantup.com](http://www.vagrantup.com)) quickly and relatively easily experiment with LXD (pronounced "lex-dee"), a new daemon and CLI client for working with LXC-based OS containers. The configuration was tested using Vagrant 1.8.x, VMware Fusion 8.1.0, and the Vagrant VMware plugin.
 
 ## Contents
 
 * **README.md**: This file you're currently reading.
 
-* **servers.yml**: This YAML file contains a list of VM definitions and associated configuration data. It is referenced by `Vagrantfile` when Vagrant instantiates the VMs. No changes should be necessary to use this file.
+* **machines.yml**: This YAML file contains a list of VM definitions and associated configuration data. It is referenced by `Vagrantfile` when Vagrant instantiates the VMs. No changes should be necessary to use this file.
 
 * **setup.sh**: This shell script is called by the Vagrant shell provisioner and configures `rkt` inside the VM created by Vagrant. No changes should be needed to this file.
 
@@ -16,13 +16,13 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, and the Vagrant VMware plugin. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the "vmware_fusion" provider. The "bento/ubuntu-14.04" box is a good option for a VMware-formatted box. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
-2. Place the files from the `lxd` directory of this GitHub repository (the "lowescott/learning-tools" repository) into a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `lxd` directory.
+2. Place the files from the `lxd-shell` directory of this GitHub repository (the "lowescott/learning-tools" repository) into a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `lxd-shell` directory.
 
-3. Edit `servers.yml` to ensure that the box specified in that file matches the Ubuntu 14.04 x64 base box you just installed and will be using. _I recommend that you do not change any other values in this file unless you know it is necessary._
+3. Edit `machines.yml` to ensure that the box specified in that file matches the Ubuntu 14.04 x64 base box you just installed and will be using. _I recommend that you do not change any other values in this file unless you know it is necessary._
 
-4. From a terminal window, change into the directory where the files from this directory are stored and run `vagrant up` to bring up the VMs specified in `servers.yml` and `Vagrantfile`. (By default, it will create and power on only a single VM.)
+4. From a terminal window, change into the directory where the files from this directory are stored and run `vagrant up` to bring up the VMs specified in `machines.yml` and `Vagrantfile`. (By default, it will create and power on only a single VM.)
 
 5. Once Vagrant has finished creating, booting, and provisioning the VM (note you'll need Internet access for this step), log into the VM (named "lxd-01" by default) using `vagrant ssh`.
 
diff --git a/lxd-shell/machines.yml b/lxd-shell/machines.yml
index 112eb26..9275307 100644
--- a/lxd-shell/machines.yml
+++ b/lxd-shell/machines.yml
@@ -1,6 +1,6 @@
 ---
-- name: lxd-01
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
+- name: "lxd-01"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
diff --git a/multi-provider-simple/machines.yml b/multi-provider-simple/machines.yml
index 0cd97e5..0763337 100644
--- a/multi-provider-simple/machines.yml
+++ b/multi-provider-simple/machines.yml
@@ -2,7 +2,7 @@
 - name: "instance-01"
   box:
     aws: "ami-20be7540"
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   aws:
     type: "t2.micro"
@@ -12,7 +12,7 @@
 - name: "instance-02"
   box:
     aws: "ami-20be7540"
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   aws:
     type: "t2.micro"
diff --git a/ovs-multi-br/README.md b/ovs-multi-br/README.md
index bb8d462..09ec2b7 100644
--- a/ovs-multi-br/README.md
+++ b/ovs-multi-br/README.md
@@ -1,6 +1,8 @@
 # Open vSwitch Multi-Bridge Configuration
 
-These files were created to test a method of providing a single Vagrant ([http://www.vagrantup.com](http://www.vagrantup.com)) environment that enables easier experimentation with Open vSwitch (OVS) configurations leveraging multiple OVS bridges. This environment was tested using Vagrant 1.8.1 with VMware Fusion 8.1.0 on OS X 10.11.3 using my self-built "slowe/ubuntu-trusty-x64" Vagrant box.
+These files were created to test a method of providing a single Vagrant ([http://www.vagrantup.com](http://www.vagrantup.com)) environment that enables easier experimentation with Open vSwitch (OVS) configurations leveraging multiple OVS bridges. This environment was tested using Vagrant 1.8.7 with VMware Fusion 8.1.0 on OS X 10.11.6.
+
+Note that VirtualBox is _not_ supported for this environment, as this environment uses a nested hypervisor (not supported by VirtualBox).
 
 ## Contents
 
@@ -8,7 +10,7 @@ These files were created to test a method of providing a single Vagrant ([http:/
 
 * **br0.xml** and **br1.xml**: These XML files are used to define a couple OVS-based Libvirt networks. No edits are necessary to this file.
 
-* **machines.yml**: This YAML file contains a list of VM definitions and associated configuration data. It is referenced by `Vagrantfile` when Vagrant instantiates the VMs. Separate box definitions are included: "vb_box" for VirtualBox, "vmw_box" for VMware Fusion.
+* **machines.yml**: This YAML file contains a list of VM definitions and associated configuration data. It is referenced by `Vagrantfile` when Vagrant instantiates the VMs. Use the "vmw_box" line to specify a box formatted for the VMware provider. VirtualBox is not supported here because the environment uses nested virtualization.
 
 * **provision.yml**: This YAML file is an Ansible playbook that configures the VMs created by Vagrant when they are first provisioned. Ansible is called automatically by Vagrant; you do not need to invoke Ansible separately. No changes are needed to this file.
 
@@ -18,13 +20,13 @@ These files were created to test a method of providing a single Vagrant ([http:/
 
 ## Instructions
 
-These instructions assume you've already installed Vagrant, the necessary back-end virtualization provider(s) (only VirtualBox and VMware Fusion are supported by this testing environment), and any necessary plugins. These instructions also assume that Ansible (version 2.1.1.0 or later) is installed and working properly. Please refer to the documentation for those products for more information on installation or configuration.
+These instructions assume you've already installed Vagrant, the necessary back-end virtualization provider(s) (only VMware providers are supported by this testing environment), and any necessary plugins. These instructions also assume that Ansible (version 2.1.1.0 or later) is installed and working properly. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install a 64-bit Ubuntu 14.04 Vagrant box. If you are a VMware Fusion user, I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
+1. Use `vagrant box add` to install a 64-bit Ubuntu 14.04 Vagrant box. For a VMware-formatted box, one good option is the "bento/ubuntu-14.04" box. (In theory you should be able to use this Vagrant environment with VMware Workstation as well, but only VMware Fusion was tested.)
 
 2. Copy the files from the `ovs-multi-br` directory of this repository (the "learning-tools" repository) to a directory on your system. You can clone the entire "learning-tools" repository (using `git clone`), or just download the specific files from the `ovs-multi-br` directory.
 
-3. Edit `machines.yml` to ensure that the box specified in that file matches the Ubuntu 14.04 x64 base box you just installed and will be using. If you are using VMware Fusion (or VMware Workstation), specify the value on the "vmw_box" line. If you are using VirtualBox, specify the value for "vb_box". _I recommend that you do not change any other values in this file unless you know it is necessary._
+3. Edit `machines.yml` to ensure that the box specified in that file matches the Ubuntu 14.04 x64 base box you just installed and will be using. If you are using VMware Fusion (or VMware Workstation), specify the value on the "vmw_box" line. _I recommend that you do not change any other values in this file unless you know it is necessary._
 
 4. From a terminal window, change into the directory where the files from this directory are stored and run `vagrant up` to bring up the VMs according to the instructions in `machines.yml` and `Vagrantfile`. (By default, it will create and power on a single VMs that will act as a KVM hypervisor.)
 
diff --git a/ovs-multi-br/Vagrantfile b/ovs-multi-br/Vagrantfile
index 584c897..05b976c 100644
--- a/ovs-multi-br/Vagrantfile
+++ b/ovs-multi-br/Vagrantfile
@@ -46,13 +46,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end # if machine['hypervisor']
       end # srv.vm.provider vmware_fusion
 
-      # Configure the VM with RAM and CPUs per machines.yml (VirtualBox)
-      srv.vm.provider 'virtualbox' do |vb, override|
-        vb.memory = machine['ram']
-        vb.cpus = machine['vcpu']
-        override.vm.box = machine['vb_box']
-      end # srv.vm.provider virtualbox
-
       # Provision with Ansible
       config.vm.provision 'ansible' do |ansible|
         ansible.playbook = 'provision.yml'
diff --git a/ovs-multi-br/machines.yml b/ovs-multi-br/machines.yml
index ad5ce1a..561b3af 100644
--- a/ovs-multi-br/machines.yml
+++ b/ovs-multi-br/machines.yml
@@ -1,7 +1,6 @@
 ---
-- name: hv-01
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 1024
-  vcpu: 1
+- name: "hv-01"
+  vmw_box: "bento/ubuntu-14.04"
+  ram: "1024"
+  vcpu: "1"
   hypervisor: true
diff --git a/rkt/README.md b/rkt/README.md
index f0f8814..0c66d2c 100644
--- a/rkt/README.md
+++ b/rkt/README.md
@@ -16,13 +16,13 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed Vagrant, your virtualization provider, and any necessary Vagrant plugins. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box for the vmware_fusion provider. I have a base box you can use for this purpose; to use my Ubuntu 14.04 x64 base box, add the box with `vagrant box add slowe/ubuntu-trusty-x64`.
+1. Use `vagrant box add` to install an Ubuntu 14.04 x64 box. For a VMware-formatted box, the "bento/ubuntu-14.04" box is one good option. For VirtualBox, you can use the "ubuntu/trusty64" box.
 
 2. Place the files from the `rkt` directory of this GitHub repository into a directory on your local system. You can clone the entire "learning-tools" repository (using `git clone`) or just download the specific files from the the `rkt` folder.
 
 3. Verify that the Vagrant box you added in step #1 is the box listed in `machines.yml`. Note there are separate lines for a VMware Fusion-formatted box (on the "vmw_box" line) and a VirtualBox-formatted box (on the "vb_box" line).
 
-4. If you download the `rkt-v1.4.0.tar.gz` release from GitHub (see [https://github.com/coreos/rkt/releases](https://github.com/coreos/rkt/releases)) and place it in the same directory with the `Vagrantfile` and other files, then the Vagrant provisioning script won't download it from the Internet and will use the local copy instead.
+4. If you download the `rkt-v1.20.0.tar.gz` release from GitHub (see [https://github.com/coreos/rkt/releases](https://github.com/coreos/rkt/releases)) and place it in the same directory with the `Vagrantfile` and other files, then the Vagrant provisioning script won't download it from the Internet and will use the local copy instead.
 
 5. Use `vagrant up` to instantiate the learning environment.
 
diff --git a/rkt/Vagrantfile b/rkt/Vagrantfile
index 06c7198..d3f4899 100644
--- a/rkt/Vagrantfile
+++ b/rkt/Vagrantfile
@@ -32,9 +32,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.synced_folder '.', '/vagrant', disabled: true
 
       # If it exists, copy the rkt download into the Vagrant VM
-      if File.file?(File.join(File.dirname(__FILE__), 'rkt-v1.4.0.tar.gz'))
-        srv.vm.provision 'file', source: 'rkt-v1.4.0.tar.gz',
-          destination: '/home/vagrant/rkt-v1.4.0.tar.gz'
+      if File.file?(File.join(File.dirname(__FILE__), 'rkt-v1.20.0.tar.gz'))
+        srv.vm.provision 'file', source: 'rkt-v1.20.0.tar.gz',
+          destination: '/home/vagrant/rkt-v1.20.0.tar.gz'
       end # if File.file?(rkt)
 
       # Run the provisioning shell script
diff --git a/rkt/machines.yml b/rkt/machines.yml
index 49c1139..7234cf4 100644
--- a/rkt/machines.yml
+++ b/rkt/machines.yml
@@ -1,6 +1,6 @@
 ---
-- name: rkt-01
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
+- name: "rkt-01"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
diff --git a/rkt/provision.sh b/rkt/provision.sh
index 39a72e6..c1c23bc 100755
--- a/rkt/provision.sh
+++ b/rkt/provision.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Set some variables for later
-VER="1.4.0"
+VER="1.20.0"
 URL="https://github.com/coreos/rkt/releases/download"
 FILE="rkt-v$VER.tar.gz"
 DIR="rkt-v$VER"
diff --git a/ssh-bastion-ansible/README.md b/ssh-bastion-ansible/README.md
index 4d1dbec..2c21466 100644
--- a/ssh-bastion-ansible/README.md
+++ b/ssh-bastion-ansible/README.md
@@ -24,7 +24,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed your virtualization provider, Vagrant, and any necessary Vagrant plugins. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to add a 64-bit Ubuntu 14.04 ("Trusty Tahr") base box to be used by this `Vagrantfile`. Be sure to add a base box for the virtualization provider you will be using. I have a base box that provides support for the `vmware_desktop` provider ("slowe/ubuntu-trusty-x64").
+1. Use `vagrant box add` to add a 64-bit Ubuntu 14.04 ("Trusty Tahr") base box to be used by this `Vagrantfile`. Be sure to add a base box for the virtualization provider you will be using. For a VMware-formatted box, the "bento/ubuntu-14.04" box is a good option. For VirtualBox, the "ubuntu/trusty64" box should work well.
 
 2. Edit the `machines.yml` file to ensure the box you downloaded in step 1 is specified in the "box:" line of this file for each VM. Modify the "vmw" line for a VMware-formatted box; modify the "vb" line for a VirtualBox-formatted box. (By default, there are four VMs, so make sure to specify the correct box name for all four VMs.)
 
diff --git a/ssh-bastion-ansible/machines.yml b/ssh-bastion-ansible/machines.yml
index 93857ca..249e225 100644
--- a/ssh-bastion-ansible/machines.yml
+++ b/ssh-bastion-ansible/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "client"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: 512
   vcpu: 1
@@ -10,7 +10,7 @@
       ip_addr: "192.168.100.101"
 - name: "bastion"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: 512
   vcpu: 1
@@ -21,7 +21,7 @@
       ip_addr: "10.100.60.10"
 - name: "remote1"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: 512
   vcpu: 1
@@ -30,7 +30,7 @@
       ip_addr: "10.100.60.11"
 - name: "remote2"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: 512
   vcpu: 1
diff --git a/ssh-bastion/README.md b/ssh-bastion/README.md
index 0615fd0..bebcb83 100644
--- a/ssh-bastion/README.md
+++ b/ssh-bastion/README.md
@@ -24,7 +24,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 These instructions assume you've already installed VMware Fusion, Vagrant, and the Vagrant VMware plugin. Please refer to the documentation for those products for more information on installation or configuration.
 
-1. Use `vagrant box add` to add a 64-bit Ubuntu 14.04 ("Trusty Tahr") base box to be used by this `Vagrantfile`. You'll need to specify a box that provides support for the `vmware_desktop` provider (it should work with either VMware Workstation or VMware Fusion). If you'd like, you can use my base box ("slowe/ubuntu-trusty-x64").
+1. Use `vagrant box add` to add a 64-bit Ubuntu 14.04 ("Trusty Tahr") base box to be used by this `Vagrantfile`. For a VMware-formatted box, the "bento/ubuntu-14.04" box is a good option. The "ubuntu/trusty64" box is a good option for VirtualBox.
 
 2. Edit the `servers.yml` file to ensure the box you downloaded in step 1 is specified on the "box:" line of this file for each VM. (By default, there are four VMs, so make sure to specify the correct box name for all four VMs.)
 
diff --git a/ssh-bastion/Vagrantfile b/ssh-bastion/Vagrantfile
index 8b307cd..c4ab082 100644
--- a/ssh-bastion/Vagrantfile
+++ b/ssh-bastion/Vagrantfile
@@ -9,7 +9,7 @@ VAGRANTFILE_API_VERSION = '2'
 require 'yaml'
 
 # Read YAML file with VM details (box, CPU, and RAM)
-servers = YAML.load_file(File.join(File.dirname(__FILE__), 'servers.yml'))
+machines = YAML.load_file(File.join(File.dirname(__FILE__), 'machines.yml'))
 
 # Create and configure the VMs
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -18,45 +18,45 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.ssh.insert_key = false
 
   # Iterate through entries in YAML file to create VMs
-  servers.each do |servers|
-    config.vm.define servers['name'] do |srv|
+  machines.each do |machine|
+    config.vm.define machine['name'] do |srv|
 
       # Don't check for box updates
       srv.vm.box_check_update = false
-      srv.vm.hostname = servers['name']
-      srv.vm.box = servers['vmw_box']
+      srv.vm.hostname = machine['name']
+      srv.vm.box = machine['vmw_box']
 
       # Configure default synced folder (disable by default)
-      if servers['sync_disabled'] != nil
-        srv.vm.synced_folder '.', '/vagrant', disabled: servers['sync_disabled']
+      if machine['sync_disabled'] != nil
+        srv.vm.synced_folder '.', '/vagrant', disabled: machine['sync_disabled']
       else
         srv.vm.synced_folder '.', '/vagrant', disabled: true
-      end #if servers['sync_disabled']
+      end #if machine['sync_disabled']
 
-      # Assign additional private network, if specified in servers.yml
-      if servers['ip_addr'] != nil
-        srv.vm.network 'private_network', ip: servers['ip_addr']
-      end # if servers['ip_addr']
+      # Assign additional private network, if specified in machines.yml
+      if machine['ip_addr'] != nil
+        srv.vm.network 'private_network', ip: machine['ip_addr']
+      end # if machine['ip_addr']
 
-      # Configure CPU & RAM per settings in servers.yml (Fusion)
+      # Configure CPU & RAM per settings in machines.yml (Fusion)
       srv.vm.provider 'vmware_fusion' do |vmw|
-        vmw.vmx['memsize'] = servers['ram']
-        vmw.vmx['numvcpus'] = servers['vcpu']
-        if servers['nested'] == true
+        vmw.vmx['memsize'] = machine['ram']
+        vmw.vmx['numvcpus'] = machine['vcpu']
+        if machine['nested'] == true
           vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if servers['nested']
+        end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in servers.yml (VirtualBox)
+      # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider 'virtualbox' do |vb, override|
-        vb.memory = servers['ram']
-        vb.cpus = servers['vcpu']
-        override.vm.box = servers['vb_box']
+        vb.memory = machine['ram']
+        vb.cpus = machine['vcpu']
+        override.vm.box = machine['vb_box']
       end # srv.vm.provider virtualbox
 
       # Provision key pairs according to VM name
       # If 'client' VM, copy in all keys
-      if servers['name'] == 'client'
+      if machine['name'] == 'client'
         srv.vm.provision 'file', source: 'bastion_rsa', 
           destination: '/home/vagrant/.ssh/bastion_rsa'
         srv.vm.provision 'file', source: 'bastion_rsa.pub', 
@@ -70,7 +70,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end # if 'client'
 
       # If 'bastion' VM, echo bastion_rsa.pub to authorized_keys
-      if servers['name'] == 'bastion'
+      if machine['name'] == 'bastion'
         srv.vm.provision 'file', source: 'bastion_rsa.pub', 
           destination: '/home/vagrant/bastion_rsa.pub'
         srv.vm.provision 'shell', 
@@ -84,7 +84,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end # if 'bastion'
 
       # If 'remote1' VM, echo remote_rsa.pub to authorized_keys
-      if servers['name'] == 'remote1'
+      if machine['name'] == 'remote1'
         srv.vm.provision 'file', source: 'remote_rsa.pub', 
           destination: '/home/vagrant/remote_rsa.pub'
         srv.vm.provision 'shell', 
@@ -93,7 +93,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end # if 'remote1'
 
       # If 'remote2' VM, echo remote_rsa.pub to authorized_keys
-      if servers['name'] == 'remote2'
+      if machine['name'] == 'remote2'
         srv.vm.provision 'file', source: 'remote_rsa.pub', 
           destination: '/home/vagrant/remote_rsa.pub'
         srv.vm.provision 'shell', 
@@ -101,5 +101,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         srv.vm.provision 'shell', inline: 'rm /home/vagrant/remote_rsa.pub'
       end # if 'remote2'
     end # config.vm.define
-  end # servers.each
+  end # machines.each
 end # Vagrant.configure
diff --git a/ssh-bastion/machines.yml b/ssh-bastion/machines.yml
new file mode 100644
index 0000000..6e364ae
--- /dev/null
+++ b/ssh-bastion/machines.yml
@@ -0,0 +1,24 @@
+---
+- name: "client"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
+- name: "bastion"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
+  ip_addr: "10.100.60.1"
+- name: "remote1"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
+  ip_addr: "10.100.60.2"
+- name: "remote2"
+  vmw_box: "bento/ubuntu-14.04"
+  vb_box: "ubuntu/trusty64"
+  ram: "512"
+  vcpu: "1"
+  ip_addr: "10.100.60.3"
diff --git a/ssh-bastion/servers.yml b/ssh-bastion/servers.yml
deleted file mode 100644
index dc533ca..0000000
--- a/ssh-bastion/servers.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: client
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
-- name: bastion
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
-  ip_addr: 10.100.60.1
-- name: remote1
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
-  ip_addr: 10.100.60.2
-- name: remote2
-  vmw_box: slowe/ubuntu-trusty-x64
-  vb_box: ubuntu/trusty64
-  ram: 512
-  vcpu: 1
-  ip_addr: 10.100.60.3
diff --git a/swarm-etcd2-photon/machines.yml b/swarm-etcd2-photon/machines.yml
index 6c32ebd..87704df 100644
--- a/swarm-etcd2-photon/machines.yml
+++ b/swarm-etcd2-photon/machines.yml
@@ -1,7 +1,7 @@
 ---
 - name: "etcd-01"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -10,7 +10,7 @@
   playbook: "cfg-etcd.yml"
 - name: "etcd-02"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
@@ -19,7 +19,7 @@
   playbook: "cfg-etcd.yml"
 - name: "etcd-03"
   box:
-    vmw: "slowe/ubuntu-trusty-x64"
+    vmw: "bento/ubuntu-14.04"
     vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
diff --git a/vagrant-docker-json/README.md b/vagrant-docker-json/README.md
index 53f4336..bfc7ccb 100644
--- a/vagrant-docker-json/README.md
+++ b/vagrant-docker-json/README.md
@@ -6,7 +6,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 * **containers.json**: This JSON file contains a list of the Docker containers and their properties for use by Vagrant. If you don't want to use the default values, you will need to edit this file to specify container friendly name, image, and exposed ports.
 
-* **host/Vagrantfile**: This file is used by Vagrant to spin up a "host VM" for use with the Vagrant Docker provider. Edit this file to change the Vagrant box you'd like to use; by default, this Vagrantfile uses the "slowe/ubuntu-trusty-x64" box (built for the "vmware_desktop" provider).
+* **host/Vagrantfile**: This file is used by Vagrant to spin up a "host VM" for use with the Vagrant Docker provider. Edit this file to change the Vagrant box you'd like to use; by default, this Vagrantfile uses the "bento/ubuntu-14.04" box (includes support for the "vmware_desktop" provider).
 
 * **README.md**: The file you're currently reading.
 
@@ -14,7 +14,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 ## Instructions
 
-1. If you wish to use a box _other_ than my "ubuntu-trusty-x64" base box (running Ubuntu 14.04), edit the `Vagrantfile` in the `host` subdirectory.
+1. If you wish to use a box _other_ than the "bento/ubuntu-14.04" box (running Ubuntu 14.04), edit the `Vagrantfile` in the `host` subdirectory.
 
 2. Edit the `containers.json` file to specify the Docker containers that Vagrant should create on the host VM (specified by `host/Vagrantfile`). Each container should contain three properties: `name` (the friendly name to be assigned to the Docker container), `image` (the name of the Docker image to be used for this container), and `ports` (a list of ports to be exposed for the container).
 
diff --git a/vagrant-docker-json/host/Vagrantfile b/vagrant-docker-json/host/Vagrantfile
index 967b9bb..454f835 100644
--- a/vagrant-docker-json/host/Vagrantfile
+++ b/vagrant-docker-json/host/Vagrantfile
@@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Spin up a "host box" for use with the Docker provider
   # and then provision it with Docker
-  config.vm.box = "slowe/ubuntu-trusty-x64"
+  config.vm.box = "bento/ubuntu-14.04"
   config.vm.provision "docker"
 
   # Disable synced folders (prevents an NFS error on "vagrant up")
diff --git a/vagrant-docker-yaml/README.md b/vagrant-docker-yaml/README.md
index 77cad1c..282067e 100644
--- a/vagrant-docker-yaml/README.md
+++ b/vagrant-docker-yaml/README.md
@@ -16,7 +16,7 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 ## Instructions
 
-1. Use `vagrant box add` to install an Ubuntu 14.04 base box. If you'd like to use a VMware Fusion-formatted box, you can use my base box ("slowe/ubuntu-trusty-x64").
+1. Use `vagrant box add` to install an Ubuntu 14.04 base box. For a VMware-formatted box, the "bento/ubuntu-14.04" box is a good option; on VirtualBox, you can use the "ubuntu/trusty64" box.
 
 2. Edit `hostvms.yml` to specify the name of the box you added in step #1.
 
@@ -24,4 +24,4 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 4. From the directory where the main `Vagrantfile` is located, simply run `vagrant up` to spin up the specified host VM and specified Docker containers. Note that Internet access **will be** required to download Docker and the Docker images.
 
-Enjoy!
\ No newline at end of file
+Enjoy!
diff --git a/vagrant-docker-yaml/hostvms.yml b/vagrant-docker-yaml/hostvms.yml
index 9f67afb..c78130e 100644
--- a/vagrant-docker-yaml/hostvms.yml
+++ b/vagrant-docker-yaml/hostvms.yml
@@ -1,6 +1,6 @@
 ---
 - name: "default"
-  vmw_box: "slowe/ubuntu-trusty-x64"
+  vmw_box: "bento/ubuntu-14.04"
   vb_box: "ubuntu/trusty64"
   ram: "1024"
   vcpu: "1"
diff --git a/vagrant-docker/README.md b/vagrant-docker/README.md
index 01c7bc1..2a9fa54 100644
--- a/vagrant-docker/README.md
+++ b/vagrant-docker/README.md
@@ -6,16 +6,16 @@ These files were created to allow users to use Vagrant ([http://www.vagrantup.co
 
 * **README.md**: The file you're currently reading.
 
-* **host/Vagrantfile**: This file is used by Vagrant to spin up a "host VM" for use with the Vagrant Docker provider. Edit this file to change the Vagrant box you'd like to use; by default, this Vagrantfile uses the "slowe/ubuntu-trusty-x64" box (built for the "vmware_desktop" provider).
+* **host/Vagrantfile**: This file is used by Vagrant to spin up a "host VM" for use with the Vagrant Docker provider. Edit this file to change the Vagrant box you'd like to use; by default, this Vagrantfile uses the "bento/ubuntu-14.04" box (includes support for the "vmware_desktop" provider).
 
 * **Vagrantfile**: This file is used by Vagrant to spin up the Docker containers on the host VM created by `host/Vagrantfile`. Edit this file to change any of the properties of the Docker container you want created by Vagrant.
 
 ## Instructions
 
-1. If you wish to use a box _other_ than my "ubuntu-trusty-x64" base box (running Ubuntu 14.04), edit the `Vagrantfile` in the host subdirectory.
+1. If you wish to use a box _other_ than the "bento/ubuntu-14.04" box (running Ubuntu 14.04), edit the `Vagrantfile` in the host subdirectory.
 
 2. If you wish to run a Docker container with an image _other_ than the standard Nginx image, edit the main `Vagrantfile` and specify a new image.
 
 3. From the directory where the main `Vagrantfile` is located, simply run `vagrant up` to spin up the specified host VM and specified Docker containers. Note that Internet access **will be** required to download Docker and the Docker images.
 
-Enjoy!
\ No newline at end of file
+Enjoy!
diff --git a/vagrant-docker/host/Vagrantfile b/vagrant-docker/host/Vagrantfile
index 402a91f..dda259f 100644
--- a/vagrant-docker/host/Vagrantfile
+++ b/vagrant-docker/host/Vagrantfile
@@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Spin up a 'host box' for use with the Docker provider
   # and then provision it with Docker
-  config.vm.box = 'slowe/ubuntu-trusty-x64'
+  config.vm.box = 'bento/ubuntu-14.04'
   config.vm.provision 'docker'
 
   # Kill SSH connection to Docker Host