diff --git a/consul-ansible/Vagrantfile b/consul-ansible/Vagrantfile
index 60be4bd..f7de6d8 100644
--- a/consul-ansible/Vagrantfile
+++ b/consul-ansible/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -59,16 +58,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/consul/Vagrantfile b/consul/Vagrantfile
index 16140a7..8cdb84b 100644
--- a/consul/Vagrantfile
+++ b/consul/Vagrantfile
@@ -6,7 +6,7 @@ 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'] = 'vmware_appcatalyst'
+#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 # Require 'yaml' module
 require 'yaml'
@@ -45,17 +45,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # Provision consul to the VMs
       srv.vm.provision 'shell', path: 'consul.sh'
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
+      # Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
       srv.vm.provider :vmware_fusion do |vmw|
         vmw.vmx['memsize'] = server['ram']
         vmw.vmx['numvcpus'] = server['vcpu']
       end # srv.vm.provider vmware_fusion
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = server['ram']
-        vmw.vmx['numvcpus'] = server['vcpu']
-      end # srv.vm.provider vmware_appcatalyst
+      # Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
+      srv.vm.provider :virtualbox do |vb|
+        vb.memory = server['ram']
+        vb.cpus = server['vcpu']
+      end # srv.vm.provider virtualbox
     end # config.vm.define
   end # servers.each
 end # Vagrant.configure
diff --git a/coreos-cloudinit-toolbox/Vagrantfile b/coreos-cloudinit-toolbox/Vagrantfile
index f9f5131..8d43268 100644
--- a/coreos-cloudinit-toolbox/Vagrantfile
+++ b/coreos-cloudinit-toolbox/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml', 'fileutils', and 'erb' modules
 require 'yaml'
@@ -63,16 +62,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/debian-generic/Vagrantfile b/debian-generic/Vagrantfile
index eacde50..3653f2c 100644
--- a/debian-generic/Vagrantfile
+++ b/debian-generic/Vagrantfile
@@ -4,7 +4,9 @@
 # Specify Vagrant version, Vagrant API version, and Vagrant clone location
 Vagrant.require_version ">= 1.6.0"
 VAGRANTFILE_API_VERSION = "2"
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
+#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 # Require 'yaml' module
 require 'yaml'
@@ -30,11 +32,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # Disable default synced folder
       srv.vm.synced_folder ".", "/vagrant", disabled: true
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
+      # Configure VMs with RAM and CPUs per servers.yml (Fusion)
       srv.vm.provider :vmware_fusion do |vmw|
         vmw.vmx["memsize"] = servers["ram"]
         vmw.vmx["numvcpus"] = servers["vcpu"]
-      end # srv.vm.provider
+      end # srv.vm.provider vmware_fusion
+
+      # Configure the VM with RAM and CPUs per servers.yml (VirtualBox)
+      srv.vm.provider :virtualbox do |vb|
+        vb.memory = servers["ram"]
+        vb.cpus = servers["vcpu"]
+      end # srv.vm.provider virtualbox
     end # config.vm.define
   end # servers.each
 end # Vagrant.configure
diff --git a/docker-ipvlan/Vagrantfile b/docker-ipvlan/Vagrantfile
index a2419b8..45c053e 100644
--- a/docker-ipvlan/Vagrantfile
+++ b/docker-ipvlan/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/docker-macvlan/Vagrantfile b/docker-macvlan/Vagrantfile
index a2419b8..45c053e 100644
--- a/docker-macvlan/Vagrantfile
+++ b/docker-macvlan/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/docker-swarm-ha/Vagrantfile b/docker-swarm-ha/Vagrantfile
index b232018..e10c113 100644
--- a/docker-swarm-ha/Vagrantfile
+++ b/docker-swarm-ha/Vagrantfile
@@ -6,7 +6,7 @@ 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'] = 'vmware_appcatalyst'
+#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 # Require 'yaml', 'fileutils', and 'erb' modules
 require 'yaml'
@@ -77,17 +77,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         srv.vm.provision 'shell', inline: 'service docker restart', privileged: true
       end
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
+      # Configure VMs with RAM and CPUs per settings in servers.yml (Fusion)
       srv.vm.provider :vmware_fusion do |vmw|
         vmw.vmx['memsize'] = server['ram']
         vmw.vmx['numvcpus'] = server['vcpu']
       end # srv.vm.provider vmware_fusion
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = server['ram']
-        vmw.vmx['numvcpus'] = server['vcpu']
-      end # srv.vm.provider vmware_appcatalyst
+      # Configure VMs with RAM and CPUs per settings in servers.yml (VirtualBox)
+      srv.vm.provider :virtualbox do |vb|
+        vb.memory = server['ram']
+        vb.cpus = server['vcpu']
+      end # srv.vm.provider virtualbox
     end # config.vm.define
   end # servers.each
 end # Vagrant.configure
diff --git a/kvm-macvtap/Vagrantfile b/kvm-macvtap/Vagrantfile
index 7eb8f0b..028ccec 100644
--- a/kvm-macvtap/Vagrantfile
+++ b/kvm-macvtap/Vagrantfile
@@ -2,11 +2,11 @@
 # vi: set ft=ruby :
 
 # Specify Vagrant version, Vagrant API version, and desired clone location
+# VirtualBox is not included here because it does not support nested virt
 Vagrant.require_version '>= 1.6.0'
 VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -50,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Provision the VM with Ansible if enabled in machines.yml
       if machine['provision'] != nil
         srv.vm.provision 'ansible' do |ansible|
diff --git a/kvm/Vagrantfile b/kvm/Vagrantfile
index 6f689c1..01043ae 100644
--- a/kvm/Vagrantfile
+++ b/kvm/Vagrantfile
@@ -2,12 +2,11 @@
 # vi: set ft=ruby :
 
 # Specify Vagrant version, Vagrant API version, and desired clone location
+# VirtualBox is not included here because it does not support nested virt
 Vagrant.require_version '>= 1.6.0'
 VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,23 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
-      # Configure CPU & RAM per settings in machines.yml (VirtualBox)
-      srv.vm.provider :virtualbox do |vb|
-        vb.memory = machine['ram']
-        vb.cpus = machine['vcpu']
-      end # srv.vm.provider virtualbox
-    end # config.vm.define
-
     # Provision the VM with Ansible
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = 'provision.yml'
diff --git a/lxc/Vagrantfile b/lxc/Vagrantfile
index 6f689c1..00565fb 100644
--- a/lxc/Vagrantfile
+++ b/lxc/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/lxd-ansible/Vagrantfile b/lxd-ansible/Vagrantfile
index 6f689c1..00565fb 100644
--- a/lxd-ansible/Vagrantfile
+++ b/lxd-ansible/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/ovs-geneve/Vagrantfile b/ovs-geneve/Vagrantfile
index 3bf5948..8932670 100644
--- a/ovs-geneve/Vagrantfile
+++ b/ovs-geneve/Vagrantfile
@@ -2,12 +2,11 @@
 # vi: set ft=ruby :
 
 # Specify Vagrant version, Vagrant API version, and desired clone location
+# VirtualBox is not included here because it does not support nested virt
 Vagrant.require_version '>= 1.6.0'
 VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,24 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
-      # Configure CPU & RAM per settings in machines.yml (VirtualBox)
-      srv.vm.provider :virtualbox do |vb|
-        vb.memory = machine['ram']
-        vb.cpus = machine['vcpu']
-      end # srv.vm.provider virtualbox
-    end # config.vm.define
-  end # machines.each
-
   # Provision the VM with Ansible
   config.vm.provision 'ansible' do |ansible|
     ansible.playbook = 'provision.yml'
diff --git a/photon-ansible/Vagrantfile b/photon-ansible/Vagrantfile
index 7a92726..54f4095 100644
--- a/photon-ansible/Vagrantfile
+++ b/photon-ansible/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -49,14 +48,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         vmw.vmx['numvcpus'] = machine['vcpu']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      # Nested virt not included because not supported with Photon
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']
diff --git a/photon-cloudinit/Vagrantfile b/photon-cloudinit/Vagrantfile
index 91c2c73..520d732 100644
--- a/photon-cloudinit/Vagrantfile
+++ b/photon-cloudinit/Vagrantfile
@@ -5,10 +5,9 @@
 # Adjust commented lines to specify provider
 Vagrant.require_version ">= 1.6.0"
 VAGRANTFILE_API_VERSION = "2"
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
-#ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
+ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -51,12 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         vmw.vmx["numvcpus"] = servers["vcpu"]
       end # srv.vm.provider vmware_fusion
 
-      # Configure VMs with RAM and CPUs per servers.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx["memsize"] = servers["ram"]
-        vmw.vmx["numvcpus"] = servers["vcpu"]
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure VMs with RAM and CPUs per servers.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = servers["ram"]
diff --git a/ssh-bastion/Vagrantfile b/ssh-bastion/Vagrantfile
index 0960acc..1562917 100644
--- a/ssh-bastion/Vagrantfile
+++ b/ssh-bastion/Vagrantfile
@@ -6,7 +6,6 @@ Vagrant.require_version ">= 1.6.0"
 VAGRANTFILE_API_VERSION = "2"
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'yaml' module
 require 'yaml'
@@ -50,16 +49,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if servers["nested"]
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in servers.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx["memsize"] = servers["ram"]
-        vmw.vmx["numvcpus"] = servers["vcpu"]
-        #vmw.vmx['guestos'] = "other3xlinux-64"
-        if servers["nested"] == true
-          vmw.vmx["vhv.enable"] = "TRUE"
-        end #if servers["nested"]
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in servers.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = servers["ram"]
diff --git a/ubuntu-generic/Vagrantfile b/ubuntu-generic/Vagrantfile
index eacde50..378e6e1 100644
--- a/ubuntu-generic/Vagrantfile
+++ b/ubuntu-generic/Vagrantfile
@@ -4,7 +4,9 @@
 # Specify Vagrant version, Vagrant API version, and Vagrant clone location
 Vagrant.require_version ">= 1.6.0"
 VAGRANTFILE_API_VERSION = "2"
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
+#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 # Require 'yaml' module
 require 'yaml'
@@ -30,11 +32,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # Disable default synced folder
       srv.vm.synced_folder ".", "/vagrant", disabled: true
 
-      # Configure VMs with RAM and CPUs per settings in servers.yml
+      # 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"]
-      end # srv.vm.provider
+      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"]
+      end # srv.vm.provider virtualbox
     end # config.vm.define
   end # servers.each
 end # Vagrant.configure
diff --git a/vagrant-json/Vagrantfile b/vagrant-json/Vagrantfile
index 818d368..5f4f55f 100644
--- a/vagrant-json/Vagrantfile
+++ b/vagrant-json/Vagrantfile
@@ -7,7 +7,6 @@ VAGRANTFILE_API_VERSION = '2'
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
 ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
 #ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_appcatalyst'
 
 # Require 'json' module
 require 'json'
@@ -51,16 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         end #if machine['nested']
       end # srv.vm.provider vmware_fusion
 
-      # Configure CPU & RAM per settings in machines.yml (AppCatalyst)
-      srv.vm.provider :vmware_appcatalyst do |vmw|
-        vmw.vmx['memsize'] = machine['ram']
-        vmw.vmx['numvcpus'] = machine['vcpu']
-        #vmw.vmx['guestos'] = 'other3xlinux-64'
-        if machine['nested'] == true
-          vmw.vmx['vhv.enable'] = 'TRUE'
-        end #if machine['nested']
-      end # srv.vm.provider vmware_appcatalyst
-
       # Configure CPU & RAM per settings in machines.yml (VirtualBox)
       srv.vm.provider :virtualbox do |vb|
         vb.memory = machine['ram']