diff --git a/docker-swarm-ha/Vagrantfile b/docker-swarm-ha/Vagrantfile
index bbb14ab..7164ddc 100644
--- a/docker-swarm-ha/Vagrantfile
+++ b/docker-swarm-ha/Vagrantfile
@@ -54,7 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.hostname = machine['name']
 
       # Specify the Vagrant box to use (use VMware box by default)
-      srv.vm.box = machine['vmw_box']
+      srv.vm.box = machine['box']['vmw']
 
       # Configure default synced folder (disable by default)
       if machine['sync_disabled'] != nil
@@ -81,7 +81,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.provider 'virtualbox' do |vb, override|
         vb.memory = machine['ram']
         vb.cpus = machine['vcpu']
-        override.vm.box = machine['vb_box']
+        override.vm.box = machine['box']['vb']
       end # srv.vm.provider 'virtualbox'
 
       # Configure VMs with the 'consul' role assigned in machines.yml
diff --git a/docker-swarm-ha/machines.yml b/docker-swarm-ha/machines.yml
index eff6b78..905483f 100644
--- a/docker-swarm-ha/machines.yml
+++ b/docker-swarm-ha/machines.yml
@@ -1,42 +1,48 @@
 ---
 - name: "consul-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.101"
   role: "consul"
 - name: "consul-02"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.102"
   role: "consul"
 - name: "consul-03"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.103"
   role: "consul"
 - name: "docker-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.104"
   role: "docker"
 - name: "docker-02"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.105"
   role: "docker"
 - name: "docker-03"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.100.106"
diff --git a/docker-swarm/Vagrantfile b/docker-swarm/Vagrantfile
index ac83d91..fdac5fa 100644
--- a/docker-swarm/Vagrantfile
+++ b/docker-swarm/Vagrantfile
@@ -55,7 +55,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.hostname = machine['name']
 
       # Specify the Vagrant box to use (use VMware box by default)
-      srv.vm.box = machine['vmw_box']
+      srv.vm.box = machine['box']['vmw']
 
       # Configure default synced folder (disable by default)
       if machine['sync_disabled'] != nil
@@ -82,7 +82,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.provider 'virtualbox' do |vb, override|
         vb.memory = machine['ram']
         vb.cpus = machine['vcpu']
-        override.vm.box = machine['vb_box']
+        override.vm.box = machine['box']['vb']
       end # srv.vm.provider 'virtualbox'
 
       # Configure VMs based on CoreOS box
diff --git a/docker-swarm/machines.yml b/docker-swarm/machines.yml
index 899eb6c..d335e7b 100644
--- a/docker-swarm/machines.yml
+++ b/docker-swarm/machines.yml
@@ -1,42 +1,48 @@
 ---
 - name: "consul-01"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.101"
   role: "consul"
 - name: "consul-02"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.102"
   role: "consul"
 - name: "consul-03"
-  vmw_box: "slowe/ubuntu-trusty-x64"
-  vb_box: "ubuntu/trusty64"
+  box:
+    vmw: "slowe/ubuntu-trusty-x64"
+    vb: "ubuntu/trusty64"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.103"
   role: "consul"
 - name: "coreos-01"
-  vmw_box: "coreos-stable"
-  vb_box: "coreos-stable"
+  box:
+    vmw: "coreos-stable"
+    vb: "coreos-stable"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.104"
   role: "docker"
 - name: "coreos-02"
-  vmw_box: "coreos-stable"
-  vb_box: "coreos-stable"
+  box:
+    vmw: "coreos-stable"
+    vb: "coreos-stable"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.105"
   role: "docker"
 - name: "coreos-03"
-  vmw_box: "coreos-stable"
-  vb_box: "coreos-stable"
+  box:
+    vmw: "coreos-stable"
+    vb: "coreos-stable"
   ram: "512"
   vcpu: "1"
   ip_addr: "192.168.1.106"
diff --git a/photon-ansible/Vagrantfile b/photon-ansible/Vagrantfile
index 2d003af..eb52e4a 100644
--- a/photon-ansible/Vagrantfile
+++ b/photon-ansible/Vagrantfile
@@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.hostname = machine['name']
 
       # Specify the Vagrant box to use (use VMware box by default)
-      srv.vm.box = machine['vmw_box']
+      srv.vm.box = machine['box']['vmw']
 
       # Configure default synced folder (disable by default)
       if machine['sync_disabled'] != nil
@@ -58,7 +58,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.provider 'virtualbox' do |vb, override|
         vb.memory = machine['ram']
         vb.cpus = machine['vcpu']
-        override.vm.box = machine['vb_box']
+        override.vm.box = machine['box']['vb']
       end # srv.vm.provider 'virtualbox'
     end # config.vm.define
 
diff --git a/photon-ansible/machines.yml b/photon-ansible/machines.yml
index 3edca12..8590de6 100644
--- a/photon-ansible/machines.yml
+++ b/photon-ansible/machines.yml
@@ -1,6 +1,7 @@
 ---
 - name: "photon-01"
-  vmw_box: "vmware/photon"
-  vb_box: "vmware/photon"
+  box:
+    vmw: "vmware/photon"
+    vb: "vmware/photon"
   ram: "512"
   vcpu: "1"
diff --git a/photon/Vagrantfile b/photon/Vagrantfile
index 17c8ac3..20aecdc 100644
--- a/photon/Vagrantfile
+++ b/photon/Vagrantfile
@@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.hostname = machine['name']
 
       # Specify the Vagrant box to use (use VMware box by default)
-      srv.vm.box = machine['vmw_box']
+      srv.vm.box = machine['box']['vmw']
 
       # Configure default synced folder (disable by default)
       if machine['sync_disabled'] != nil
@@ -58,7 +58,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       srv.vm.provider 'virtualbox' do |vb, override|
         vb.memory = machine['ram']
         vb.cpus = machine['vcpu']
-        override.vm.box = machine['vb_box']
+        override.vm.box = machine['box']['vb']
       end # srv.vm.provider 'virtualbox'
     end # config.vm.define
   end # machines.each
diff --git a/photon/machines.yml b/photon/machines.yml
index 3edca12..8590de6 100644
--- a/photon/machines.yml
+++ b/photon/machines.yml
@@ -1,6 +1,7 @@
 ---
 - name: "photon-01"
-  vmw_box: "vmware/photon"
-  vb_box: "vmware/photon"
+  box:
+    vmw: "vmware/photon"
+    vb: "vmware/photon"
   ram: "512"
   vcpu: "1"