diff --git a/lxd-shell/Vagrantfile b/lxd-shell/Vagrantfile
index 759c9a7..f9e3edb 100644
--- a/lxd-shell/Vagrantfile
+++ b/lxd-shell/Vagrantfile
@@ -10,7 +10,7 @@ ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 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|
@@ -19,13 +19,13 @@ 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']
 
       # Enable default synced folder
       srv.vm.synced_folder '.', '/vagrant'
@@ -33,18 +33,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # Perform final provisioning activities
       srv.vm.provision 'shell', path: 'setup.sh', privileged: true
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
+      # Configure VMs with RAM and CPUs per settings in machines.yml (Fusion)
       srv.vm.provider 'vmware_fusion' do |vmw|
-        vmw.vmx['memsize'] = servers['ram']
-        vmw.vmx['numvcpus'] = servers['vcpu']
+        vmw.vmx['memsize'] = machine['ram']
+        vmw.vmx['numvcpus'] = machine['vcpu']
       end # srv.vm.provider vmware_fusion
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
+      # Configure VMs with RAM and CPUs 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
     end # config.vm.define
-  end # servers.each
+  end # machines.each
 end # Vagrant.configure
diff --git a/lxd-shell/servers.yml b/lxd-shell/machines.yml
similarity index 100%
rename from lxd-shell/servers.yml
rename to lxd-shell/machines.yml
diff --git a/openstack-cli/Vagrantfile b/openstack-cli/Vagrantfile
index 4687cd1..0f0dd2f 100644
--- a/openstack-cli/Vagrantfile
+++ b/openstack-cli/Vagrantfile
@@ -2,17 +2,15 @@
 # vi: set ft=ruby :
 
 # Specify Vagrant version and Vagrant API version
-Vagrant.require_version ">= 1.6.0"
-VAGRANTFILE_API_VERSION = "2"
+Vagrant.require_version '>= 1.6.0'
+VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 # Require 'yaml' module
 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|
@@ -21,32 +19,35 @@ 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["box"]
+      srv.vm.hostname = machine['name']
+
+      # Specify Vagrant box to use (use VMware box by default)
+      srv.vm.box = machine['vmw_box']
 
       # Enable default synced folder
-      srv.vm.synced_folder ".", "/vagrant"
+      srv.vm.synced_folder '.', '/vagrant'
 
       # Perform final provisioning activities
-      srv.vm.provision "shell", path: "config.sh", privileged: true
-      srv.vm.provision "file", source: "adminrc", destination: "/home/vagrant/adminrc"
+      srv.vm.provision 'shell', path: 'config.sh', privileged: true
+      srv.vm.provision 'file', source: 'adminrc', destination: '/home/vagrant/adminrc'
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
-      srv.vm.provider :vmware_fusion do |vmw|
-        vmw.vmx["memsize"] = servers["ram"]
-        vmw.vmx["numvcpus"] = servers["vcpu"]
+      # Configure VMs with RAM and CPUs per settings in machines.yml (Fusion)
+      srv.vm.provider 'vmware_fusion' do |vmw|
+        vmw.vmx['memsize'] = machine['ram']
+        vmw.vmx['numvcpus'] = machine['vcpu']
       end # srv.vm.provider vmware_fusion
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
-      srv.vm.provider :virtualbox do |vb|
-        vb.memory = servers["ram"]
-        vb.cpus = servers["vcpu"]
+      # Configure VMs with RAM and CPUs per settings in 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
     end # config.vm.define
-  end # servers.each
+  end # machines.each
 end # Vagrant.configure
diff --git a/openstack-cli/machines.yml b/openstack-cli/machines.yml
new file mode 100644
index 0000000..efb4f6d
--- /dev/null
+++ b/openstack-cli/machines.yml
@@ -0,0 +1,6 @@
+---
+- name: openstack-cli
+  vmw_box: slowe/ubuntu-trusty-x64
+  vb_box: ubuntu/trusty64
+  ram: 512
+  vcpu: 1
diff --git a/openstack-cli/servers.yml b/openstack-cli/servers.yml
deleted file mode 100644
index 415a323..0000000
--- a/openstack-cli/servers.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: openstack-cli
-  box: slowe/ubuntu-trusty-x64
-  ram: 512
-  vcpu: 1