diff --git a/.gitignore b/.gitignore
index f2f7ae42..d2d54406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ tmp
 .vagrant/
 *.swp
 Makefile.local
+rspec_html_reports
 
 .DS_Store
diff --git a/AUTHORS b/AUTHORS
index 75d529f2..dacfcbef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@
 Blake Garner <blake@netjibbing.com>
 Joe Fitzgerald <jfitzgerald@pivotal.io>
 Julian C. Dunn <jdunn@aquezada.com>
+Brian Marsh <pezhore@gmail.com>
 Ken Sykora <ksykora@nerdery.com>
 Mischa Taylor <mischa@misheska.com>
 Nolen Scaife <nolen@scaife.org>
diff --git a/Makefile b/Makefile
index 8ffa511f..816a3507 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ EVAL_WIN81_X64 ?= http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E
 EVAL_WIN81_X64_CHECKSUM ?= 7c7d99546077c805faae40a8864882c46f0ca141
 EVAL_WIN2008R2_X64 ?= http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso
 EVAL_WIN2008R2_X64_CHECKSUM ?= beed231a34e90e1dd9a04b3afabec31d62ce3889
-EVAL_WIN2012R2_X64 ?= http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO
+EVAL_WIN2012R2_X64 ?= http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO
 EVAL_WIN2012R2_X64_CHECKSUM ?= 849734f37346385dac2c101e4aacba4626bb141c
 
 EVAL_WIN7_X86 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso
@@ -19,12 +19,12 @@ EVAL_WIN81_X86_CHECKSUM ?= 4ddd0881779e89d197cb12c684adf47fd5d9e540
 EVAL_WIN8_X64 ?= http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO
 EVAL_WIN8_X64_CHECKSUM ?= ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d
 
-EVAL_WIN10_X64 ?= http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X64FRE_EN-US.ISO
-EVAL_WIN10_X64_CHECKSUM ?= 6c60f91bf0ad7b20f469ab8f80863035c517f34f
-EVAL_WIN10_X86 ?= http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X86FRE_EN-US.ISO
-EVAL_WIN10_X86_CHECKSUM ?= 1aa6d3c4451e79e69e84118ec629ad99e2ad36e7
+EVAL_WIN10_X64 ?= https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso
+EVAL_WIN10_X64_CHECKSUM ?= a4ea45ec1282e85fc84af49acf7a8d649c31ac5c
+EVAL_WIN10_X86 ?= https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso
+EVAL_WIN10_X86_CHECKSUM ?= ddb496534203cb98284e5484e0ad60af3c0efce7
 
-EVAL_WIN2016_X64 ?= http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO
+EVAL_WIN2016_X64 ?= https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO
 EVAL_WIN2016_X64_CHECKSUM ?= 772700802951b36c8cb26a61c040b9a8dc3816a3
 
 # @todo:
@@ -64,7 +64,7 @@ WIN81_X64_PRO_CHECKSUM ?= e50a6f0f08e933f25a71fbc843827fe752ed0365
 WIN81_X86_PRO ?= iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso
 WIN81_X86_PRO_CHECKSUM ?= c2d6f5d06362b7cb17dfdaadfb848c760963b254
 
-# Possible values for CM: (nocm | chef | chefdk | salt | puppet)
+# Possible values for CM: (nocm | chef | chefdk | chef-workstation | salt | puppet)
 CM ?= nocm
 # Possible values for CM_VERSION: (latest | x.y.z | x.y)
 CM_VERSION ?=
@@ -91,15 +91,22 @@ else
 endif
 # Packer does not allow empty variables, so only pass variables that are defined
 PACKER_VARS := -var 'cm=$(CM)' -var 'version=$(BOX_VERSION)' -var 'update=$(UPDATE)' -var 'headless=$(HEADLESS)' -var "shutdown_command=$(SHUTDOWN_COMMAND)"
+ifdef HW_VERSION
+	PACKER_VARS += -var 'hw_version=$(HW_VERSION)'
+endif
+ifdef CM_OPTIONS
+	PACKER_VARS += -var 'cm_options=$(CM_OPTIONS)'
+endif
 ifdef CM_VERSION
 	PACKER_VARS += -var 'cm_version=$(CM_VERSION)'
 endif
+ON_ERROR ?= cleanup
 PACKER ?= packer
 ifdef PACKER_DEBUG
 	PACKER := PACKER_LOG=1 $(PACKER)
 else
 endif
-BUILDER_TYPES ?= vmware virtualbox parallels
+BUILDER_TYPES ?= vmware virtualbox parallels hyperv
 ifeq ($(OS),Windows_NT)
 	VAGRANT_PROVIDER ?= vmware_workstation
 else
@@ -111,16 +118,20 @@ TEST_BOX_FILES := $(foreach builder, $(BUILDER_TYPES), $(foreach box_filename, $
 VMWARE_BOX_DIR := box/vmware
 VIRTUALBOX_BOX_DIR := box/virtualbox
 PARALLELS_BOX_DIR := box/parallels
+HYPERV_BOX_DIR := box/hyperv
 VMWARE_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(VMWARE_BOX_DIR)/$(box_filename))
 VIRTUALBOX_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(VIRTUALBOX_BOX_DIR)/$(box_filename))
 PARALLELS_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(PARALLELS_BOX_DIR)/$(box_filename))
+HYPERV_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(HYPERV_BOX_DIR)/$(box_filename))
 BOX_FILES := $(foreach builder, $(BUILDER_TYPES), $(foreach box_filename, $(BOX_FILENAMES), box/$(builder)/$(box_filename)))
 VMWARE_OUTPUT := output-vmware-iso
 VIRTUALBOX_OUTPUT := output-virtualbox-iso
 PARALLELS_OUTPUT := output-parallels-iso
+HYPERV_OUTPUT := output-hyperv-iso
 VMWARE_BUILDER := vmware-iso
 VIRTUALBOX_BUILDER := virtualbox-iso
 PARALLELS_BUILDER := parallels-iso
+HYPERV_BUILDER := hyperv-iso
 CURRENT_DIR := $(shell pwd)
 UNAME_O := $(shell uname -o 2> /dev/null)
 UNAME_P := $(shell uname -p 2> /dev/null)
@@ -193,6 +204,12 @@ parallels/$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
 
 parallels/$(1)-ssh: $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
 
+hyperv/$(1): $(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX)
+
+hyperv/$(1)-cygwin: $(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
+
+hyperv/$(1)-ssh: $(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
+
 test-vmware/$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
 
 test-vmware/$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
@@ -211,6 +228,12 @@ test-parallels/$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
 
 test-parallels/$(1)-ssh: test-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
 
+test-hyperv/$(1): test-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX)
+
+test-hyperv/$(1)-cygwin: test-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
+
+test-hyperv/$(1)-ssh: test-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
+
 ssh-vmware/$(1): ssh-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
 
 ssh-vmware/$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
@@ -229,11 +252,19 @@ ssh-parallels/$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
 
 ssh-parallels/$(1)-ssh: ssh-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
 
+ssh-hyperv/$(1): ssh-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX)
+
+ssh-hyperv/$(1)-cygwin: ssh-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
+
+ssh-hyperv/$(1)-ssh: ssh-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX)
+
 s3cp-vmware/$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
 
 s3cp-virtualbox/$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
 
 s3cp-parallels/$(1): s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX)
+
+s3cp-hyperv/$(1): s3cp-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX)
 endef
 
 SHORTCUT_TARGETS := $(basename $(TEMPLATE_FILENAMES))
@@ -380,48 +411,62 @@ define BUILDBOX
 $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json
 	rm -rf $(VIRTUALBOX_OUTPUT)
 	mkdir -p $(VIRTUALBOX_BOX_DIR)
-	$(PACKER) build -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
 
 $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json
 	rm -rf $(VMWARE_OUTPUT)
 	mkdir -p $(VMWARE_BOX_DIR)
-	$(PACKER) build -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
 
 $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json
 	rm -rf $(PARALLELS_OUTPUT)
 	mkdir -p $(PARALLELS_BOX_DIR)
-	$(PACKER) build -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
+
+$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json
+	rm -rf $(HYPERV_OUTPUT)
+	mkdir -p $(HYPERV_BOX_DIR)
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json
 
 $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json
 	rm -rf $(VIRTUALBOX_OUTPUT)
 	mkdir -p $(VIRTUALBOX_BOX_DIR)
-	$(PACKER) build -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
 
 $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json
 	rm -rf $(VMWARE_OUTPUT)
 	mkdir -p $(VMWARE_BOX_DIR)
-	$(PACKER) build -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
+	$(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
 
 $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json
 	rm -rf $(PARALLELS_OUTPUT)
 	mkdir -p $(PARALLELS_BOX_DIR)
-	$(PACKER) build -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
+
+$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json
+	rm -rf $(HYPERV_OUTPUT)
+	mkdir -p $(HYPERV_BOX_DIR)
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json
 
 $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json
 	rm -rf $(VIRTUALBOX_OUTPUT)
 	mkdir -p $(VIRTUALBOX_BOX_DIR)
-	$(PACKER) build -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
 
 $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json
 	rm -rf $(VMWARE_OUTPUT)
 	mkdir -p $(VMWARE_BOX_DIR)
-	$(PACKER) build -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
 
 $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json
 	rm -rf $(PARALLELS_OUTPUT)
 	mkdir -p $(PARALLELS_BOX_DIR)
-	$(PACKER) build -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
 
+$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json
+	rm -rf $(HYPERV_OUTPUT)
+	mkdir -p $(HYPERV_BOX_DIR)
+	$(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json
 endef
 
 $(eval $(call BUILDBOX,win2008r2-datacenter,$(WIN2008R2_X64),$(WIN2008R2_X64_CHECKSUM)))
@@ -517,7 +562,7 @@ list:
 	@echo "To build for all target platforms:"
 	@echo "  make win7x64-pro"
 	@echo ""
-	@echo "Prepend 'vmware/' or 'virtualbox/' or 'parallels/' to build only one target platform:"
+	@echo "Prepend 'vmware/' or 'virtualbox/' or 'parallels/' or 'hyperv/' to build only one target platform:"
 	@echo "  make vmware/win7x64-pro"
 	@echo ""
 	@echo "Append '-cygwin' to use Cygwin's SSH instead of OpenSSH:"
@@ -569,6 +614,10 @@ test-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
 	-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
 	bin/test-box.sh $< parallels parallels $(CURRENT_DIR)/test/*_spec.rb
 
+test-$(HYPERV_BOX_DIR)/%$(BOX_SUFFIX): $(HYPERV_BOX_DIR)/%$(BOX_SUFFIX)
+	-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
+	bin/test-box.sh $< hyperv hyperv $(CURRENT_DIR)/test/*_spec.rb
+
 ssh-$(VMWARE_BOX_DIR)/%$(BOX_SUFFIX): $(VMWARE_BOX_DIR)/%$(BOX_SUFFIX)
 	-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
 	bin/ssh-box.sh $< vmware_desktop $(VAGRANT_PROVIDER) $(CURRENT_DIR)/test/*_spec.rb
@@ -581,6 +630,10 @@ ssh-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
 	-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
 	bin/ssh-box.sh $< parallels parallels $(CURRENT_DIR)/test/*_spec.rb
 
+ssh-$(HYPERV_BOX_DIR)/%$(BOX_SUFFIX): $(HYPERV_BOX_DIR)/%$(BOX_SUFFIX)
+	-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
+	bin/ssh-box.sh $< hyperv hyperv $(CURRENT_DIR)/test/*_spec.rb
+
 S3_STORAGE_CLASS ?= REDUCED_REDUNDANCY
 S3_ALLUSERS_ID ?= uri=http://acs.amazonaws.com/groups/global/AllUsers
 
@@ -593,6 +646,10 @@ s3cp-$(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX): $(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX)
 s3cp-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
 	aws s3 cp $< $(PARALLELS_S3_BUCKET) --storage-class $(S3_STORAGE_CLASS) --grants full=$(S3_GRANT_ID) read=$(S3_ALLUSERS_ID)
 
+s3cp-$(HYPERV_BOX_DIR)/%$(BOX_SUFFIX): $(HYPERV_BOX_DIR)/%$(BOX_SUFFIX)
+	aws s3 cp $< $(HYPERV_S3_BUCKET) --storage-class $(S3_STORAGE_CLASS) --grants full=$(S3_GRANT_ID) read=$(S3_ALLUSERS_ID)
+
 s3cp-vmware: $(addprefix s3cp-,$(VMWARE_BOX_FILES))
 s3cp-virtualbox: $(addprefix s3cp-,$(VIRTUALBOX_BOX_FILES))
 s3cp-parallels: $(addprefix s3cp-,$(PARALLELS_BOX_FILES))
+s3cp-hyperv: $(addprefix s3cp-,$(HYPERV_BOX_FILES))
diff --git a/README.md b/README.md
index c43c5f05..c8c1dcd8 100644
--- a/README.md
+++ b/README.md
@@ -71,14 +71,38 @@ the output of `make list` accordingly.
 Possible values for the CM variable are:
 
 * `nocm` - No configuration management tool
-* `chef` - Install Chef
+* `chef` - Install Chef Client
+* `chefdk` - Install Chef Development Kit
+* `chef-workstation` - Install Chef Workstation
 * `puppet` - Install Puppet
 * `salt`  - Install Salt
 
-You can also specify a variable `CM_VERSION`, if supported by the
-configuration management tool, to override the default of `latest`.
-The value of `CM_VERSION` should have the form `x.y` or `x.y.z`,
-such as `CM_VERSION := 11.12.4`
+You can also specify a variable `CM_VERSION` for all configuration management
+tools to override the default of `latest`. The value of `CM_VERSION` should
+have the form `x.y` or `x.y.z`, such as `CM_VERSION := 11.12.4`
+
+When changing the value of the `CM` variable to one of the chef-based
+configuration management tools, it is relevant to note that recent versions of
+chef require a license in order to use. Due to this, specifying the default
+version of "latest" for the `CM_VERSION` field will result in using the most
+recent "free" version that doesn't require a license. If the user wishes to use
+the most recent version that DOES requires licensing, however, the user will
+need to explicitly specify "licensed" for `CM_VERSION`. Specifying "licensed"
+for `CM_VERSION` will then result in using the most recently available licensed
+version. More information on how to accept the chef-client license via
+configuration after building a template can be found at
+[Accepting the Chef License](https://docs.chef.io/chef_license_accept.html).
+
+It is also possible to specify a `HW_VERSION` if a specific hardware
+version is to be used for a build. This is commonly used to provide
+compatibility with newer versions of VMware Workstation. For example,
+you may indicate version 14 of Workstation: `HW_VERSION := 14`.
+
+For configuration management tools (such as Salt), you can specify a
+variable `CM_OPTIONS`. This variable will be passed to the installer for
+the configuration management tool. For information on possible values
+please read the documentation for the respective configuration management
+tool.
 
 Another use for `Makefile.local` is to override the default locations
 for the Windows install ISO files.
diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json
index e24db54c..01817afd 100644
--- a/eval-win10x64-enterprise-cygwin.json
+++ b/eval-win10x64-enterprise-cygwin.json
@@ -1,173 +1,188 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows9-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows10_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x64-enterprise-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -179,13 +194,20 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x64-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json
index 1edfa138..ef548e40 100644
--- a/eval-win10x64-enterprise-ssh.json
+++ b/eval-win10x64-enterprise-ssh.json
@@ -1,170 +1,184 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows9-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows10_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x64-enterprise-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -176,13 +190,20 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x64-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json
index a831ad92..6ec43db0 100644
--- a/eval-win10x64-enterprise.json
+++ b/eval-win10x64-enterprise.json
@@ -1,180 +1,201 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows9-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows10_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x64-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x64-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+    "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json
index 6ad1d36d..73e833d3 100644
--- a/eval-win10x86-enterprise-cygwin.json
+++ b/eval-win10x86-enterprise-cygwin.json
@@ -1,173 +1,188 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows9",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows10",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x86-enterprise-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -179,13 +194,20 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x86-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json
index ddf13fe6..d1ed1f7a 100644
--- a/eval-win10x86-enterprise-ssh.json
+++ b/eval-win10x86-enterprise-ssh.json
@@ -1,170 +1,184 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows9",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows10",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x86-enterprise-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/openssh.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -176,13 +190,20 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x86-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json
index bededd4e..c1e80951 100644
--- a/eval-win10x86-enterprise.json
+++ b/eval-win10x86-enterprise.json
@@ -1,180 +1,201 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows9",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win10x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows81",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win10x86-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/_post_update_install.bat",
-        "floppy/autologon.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win10x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/_post_update_install.bat",
+        "{{template_dir}}/floppy/autologon.bat",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/slim_win10.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win10x86-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win10x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso",
+    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json
index 87ab1ced..4f60199b 100644
--- a/eval-win2008r2-datacenter-cygwin.json
+++ b/eval-win2008r2-datacenter-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-datacenter-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-datacenter",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json
index 17628e5d..878377fb 100644
--- a/eval-win2008r2-datacenter-ssh.json
+++ b/eval-win2008r2-datacenter-ssh.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-datacenter-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-datacenter",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json
index 4459c077..eeb1b6f4 100644
--- a/eval-win2008r2-datacenter.json
+++ b/eval-win2008r2-datacenter.json
@@ -1,167 +1,180 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-datacenter",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-datacenter",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-datacenter",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json
index 36afa060..bce17f00 100644
--- a/eval-win2008r2-standard-cygwin.json
+++ b/eval-win2008r2-standard-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json
index 04eb08f9..85d21fd1 100644
--- a/eval-win2008r2-standard-ssh.json
+++ b/eval-win2008r2-standard-ssh.json
@@ -1,151 +1,155 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -157,15 +161,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json
index 264ef0d3..1bcf88ec 100644
--- a/eval-win2008r2-standard.json
+++ b/eval-win2008r2-standard.json
@@ -1,164 +1,176 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2008r2-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win2008r2-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2008r2-standard",
+      "communicator": "winrm",
+      "cpus": "{{ user `cpus` }}",
+      "headless": "{{ user `headless` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win2008r2-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "hw_version": "7",
     "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+    "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json
index a0afcd45..5ba282e1 100644
--- a/eval-win2012r2-datacenter-cygwin.json
+++ b/eval-win2012r2-datacenter-cygwin.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-datacenter-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-datacenter-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,40 +109,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -173,15 +182,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-datacenter",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json
index 2b1c3266..c8272660 100644
--- a/eval-win2012r2-datacenter-ssh.json
+++ b/eval-win2012r2-datacenter-ssh.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-datacenter-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-datacenter-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-datacenter",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json
index eca5529a..c5b6c5f8 100644
--- a/eval-win2012r2-datacenter.json
+++ b/eval-win2012r2-datacenter.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-datacenter",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-datacenter",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-datacenter/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,50 +109,85 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-datacenter",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json
index 350ea077..0d057259 100644
--- a/eval-win2012r2-standard-cygwin.json
+++ b/eval-win2012r2-standard-cygwin.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-standard-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,40 +109,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -173,15 +182,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json
index 5fc747f7..efb14c42 100644
--- a/eval-win2012r2-standard-ssh.json
+++ b/eval-win2012r2-standard-ssh.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-standard-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json
index 00a48aec..fc30b727 100644
--- a/eval-win2012r2-standard.json
+++ b/eval-win2012r2-standard.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2012r2-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2012r2-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2012r2-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,50 +109,85 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2012r2-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win2012r2-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
     "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json
index af5f99e6..1c7f81ac 100644
--- a/eval-win2016-standard-cygwin.json
+++ b/eval-win2016-standard-cygwin.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2016-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2016-standard-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,40 +109,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2016-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/eval-win2016-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -173,15 +182,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2016-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json
index 98e78b2a..d3e1e16f 100644
--- a/eval-win2016-standard-ssh.json
+++ b/eval-win2016-standard-ssh.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2016-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2016-standard-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2016-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/eval-win2016-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win2016-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json
index 8e2a8b64..72d718a0 100644
--- a/eval-win2016-standard.json
+++ b/eval-win2016-standard.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win2016-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win2016-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win2016-standard/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,50 +109,85 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win2016-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/eval-win2016-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win2016-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
+    "hw_version": "7",
+    "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json
index 653711fa..73fc13d8 100644
--- a/eval-win7x64-enterprise-cygwin.json
+++ b/eval-win7x64-enterprise-cygwin.json
@@ -1,160 +1,167 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "3072",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "hard_drive_interface": "sata",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "3072"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "3072"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -166,15 +173,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x64-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "3072",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json
index 57b89328..07c75e0a 100644
--- a/eval-win7x64-enterprise-ssh.json
+++ b/eval-win7x64-enterprise-ssh.json
@@ -1,160 +1,167 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "3072",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "3072"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "3072"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -166,15 +173,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x64-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "3072",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json
index 2c0d8829..b3de49d6 100644
--- a/eval-win7x64-enterprise.json
+++ b/eval-win7x64-enterprise.json
@@ -1,170 +1,184 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "3072",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "3072"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x64-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/upgrade-wua.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "20000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "3072"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/upgrade-wua.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x64-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "20000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "3072",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json
index c761c00a..1f016a2b 100644
--- a/eval-win7x86-enterprise-cygwin.json
+++ b/eval-win7x86-enterprise-cygwin.json
@@ -1,160 +1,167 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -166,15 +173,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x86-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso",
+    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json
index 8d0e9006..753110f0 100644
--- a/eval-win7x86-enterprise-ssh.json
+++ b/eval-win7x86-enterprise-ssh.json
@@ -1,157 +1,163 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -163,15 +169,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x86-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso",
+    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json
index d6c20861..8e541b69 100644
--- a/eval-win7x86-enterprise.json
+++ b/eval-win7x86-enterprise.json
@@ -1,167 +1,180 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win7x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win7x86-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win7x86-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win7x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso",
+    "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json
index 42564641..29e6e602 100644
--- a/eval-win81x64-enterprise-cygwin.json
+++ b/eval-win81x64-enterprise-cygwin.json
@@ -1,161 +1,168 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows9-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x64-enterprise-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,13 +174,20 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x64-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
+    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json
index 3d897664..fc21eb1e 100644
--- a/eval-win81x64-enterprise-ssh.json
+++ b/eval-win81x64-enterprise-ssh.json
@@ -1,161 +1,168 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/update.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/update.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x64-enterprise-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/update.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,15 +174,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x64-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
+    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json
index c9f80646..af5cd869 100644
--- a/eval-win81x64-enterprise.json
+++ b/eval-win81x64-enterprise.json
@@ -1,174 +1,189 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x64-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/update.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/update.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x64-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
+    "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json
index 4cf3182d..f9717274 100644
--- a/eval-win81x86-enterprise-cygwin.json
+++ b/eval-win81x86-enterprise-cygwin.json
@@ -1,161 +1,168 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x86-enterprise-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,15 +174,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x86-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO",
+    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json
index adc20c9f..177ff9e6 100644
--- a/eval-win81x86-enterprise-ssh.json
+++ b/eval-win81x86-enterprise-ssh.json
@@ -1,158 +1,164 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x86-enterprise-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -164,15 +170,21 @@
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x86-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO",
+    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json
index 4b74393e..5b22e65a 100644
--- a/eval-win81x86-enterprise.json
+++ b/eval-win81x86-enterprise.json
@@ -1,171 +1,185 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win81x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "eval-win81x86-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/eval-win81x86-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win81x86-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "eval-win81x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO",
+    "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/eval-win8x64-enterprise-cygwin.json b/eval-win8x64-enterprise-cygwin.json
deleted file mode 100644
index a5a409bb..00000000
--- a/eval-win8x64-enterprise-cygwin.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win8x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win8x64-enterprise-cygwin"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win8x64-enterprise-cygwin"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win8x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win8x64-enterprise-cygwin.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
-      "remote_path": "C:/Windows/Temp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /cygdrive/c/Windows/Temp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/eval-win8x64-enterprise-ssh.json b/eval-win8x64-enterprise-ssh.json
deleted file mode 100644
index 63dbcac2..00000000
--- a/eval-win8x64-enterprise-ssh.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win8x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win8x64-enterprise-ssh"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "eval-win8x64-enterprise-ssh"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win8x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win8x64-enterprise-ssh.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-      "remote_path": "/tmp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /tmp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/eval-win8x64-enterprise.json b/eval-win8x64-enterprise.json
deleted file mode 100644
index f199134b..00000000
--- a/eval-win8x64-enterprise.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "builders": [
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "eval-win8x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "eval-win8x64-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/eval-win8x64-enterprise/Autounattend.xml",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "eval-win8x64-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win8x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win8x64-enterprise.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d",
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd
index c33f0f48..4087ed2a 100644
--- a/floppy/01-install-wget.cmd
+++ b/floppy/01-install-wget.cmd
@@ -28,6 +28,10 @@ powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WGET_URL%'
 
 if exist "%filename%" goto exit0
 
+if defined DISABLE_BITS (
+    if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1
+)
+
 set bitsadmin=
 
 for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i
diff --git a/floppy/_download.cmd b/floppy/_download.cmd
index 434b0f83..1c650eee 100644
--- a/floppy/_download.cmd
+++ b/floppy/_download.cmd
@@ -60,6 +60,10 @@ if not errorlevel 1 if exist "%filename%" goto exit0
 
 :bitsadmin
 
+if defined DISABLE_BITS (
+    if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1
+)
+
 set bitsadmin=
 
 for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i
diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd
index e18ca80d..6ede89e2 100644
--- a/floppy/_packer_config.cmd
+++ b/floppy/_packer_config.cmd
@@ -13,6 +13,11 @@
 :: Default: z:\c\packer_logs
 :: set PACKER_LOG_DIR=z:\c\packer_logs
 
+:: Uncomment the following to disable BITS so scripts can fail instead of hanging when
+:: BITS doesn't work right.
+:: Default: (unset)
+:: set DISABLE_BITS=1
+
 :: Uncomment the following to change the pagefile size in MB as set by
 :: floppy/pagefile.bat
 :: Default: 512
diff --git a/floppy/disablewinupdate.bat b/floppy/disablewinupdate.bat
index 8cf294a9..a5ddbec8 100644
--- a/floppy/disablewinupdate.bat
+++ b/floppy/disablewinupdate.bat
@@ -3,31 +3,22 @@
 @for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i"
 @if defined PACKER_DEBUG (@echo on) else (@echo off)
 
-echo ==^> Enabling updates for other products from Microsoft Update
-net stop wuauserv
+echo ==^> Disabling Windows Updates
 
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v EnableFeaturedSoftware /t REG_DWORD /d 1 /f
+:: stop the service and disable it
+SC stop wuauserv
+SC config wuauserv start= disabled
 
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v IncludeRecommendedUpdates /t REG_DWORD /d 1 /f
+:: Notify before download
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f
 
-cscript //nologo "%~f0?.wsf"
+:: turn the whole thing off
+reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 0 /f
+reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 1 /f
 
-net start wuauserv
-exit /b
-
------ Begin wsf script --->
-<job><script language="VBScript">
-  Set ServiceManager = CreateObject("Microsoft.Update.ServiceManager")
-  Set NewUpdateService = ServiceManager.AddService2("7971f918-a847-4430-9279-4a52d1efe18d",7,"")
+:: disable the update prompt scheduled tasks
+schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\USO_UxBroker_Display" /disable
+schtasks.exe /change /tn "\Microsoft\Windows\UpdateOrchestrator\MusUx_UpdateInterval" /disable
+schtasks.exe /change /tn "\Microsoft\Windows\WindowsUpdate\sih" /disable
 
-  Const NOT_CONFIGURED = 0
-  Const DISABLED = 1
-  Const PROMPT_TO_APPROVE_BEFORE_DOWNLOAD = 2
-  Const DOWNLOAD_AUTOMATICALLY = 3
-  Const SCHEDULED_INSTALLATION = 4
-  Set AutoUpdate = CreateObject("Microsoft.Update.AutoUpdate")
-  Set AutoUpdateSettings = AutoUpdate.Settings
-  AutoUpdateSettings.NotificationLevel = DISABLED
-  AutoUpdateSettings.Save
-  AutoUpdateSettings.Refresh
-</script></job>
+exit /b
diff --git a/floppy/eval-win8x64-enterprise/Autounattend.xml b/floppy/eval-win8x64-enterprise/Autounattend.xml
deleted file mode 100644
index c33714b9..00000000
--- a/floppy/eval-win8x64-enterprise/Autounattend.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ImageInstall>
-                <OSImage>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/NAME</Key>
-                            <Value>Windows 8 Enterprise Evaluation</Value>
-                        </MetaData>
-                    </InstallFrom>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                </OSImage>
-            </ImageInstall>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-            </UserData>
-            <DiskConfiguration>
-                <WillShowUI>OnError</WillShowUI>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Size>10000</Size>
-                            <Type>Primary</Type>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Active>true</Active>
-                            <Extend>true</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-            </DiskConfiguration>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>*</ComputerName>
-            <TimeZone>Pacific Standard Time</TimeZone>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="wow64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <fDenyTSConnections>false</fDenyTSConnections>
-        </component>
-        <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <FirewallGroups>
-                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
-                    <Active>true</Active>
-                    <Group>Remote Desktop</Group>
-                    <Profile>all</Profile>
-                </FirewallGroup>
-            </FirewallGroups>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>3</ProtectYourPC>
-            </OOBE>
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Password>
-                            <Value>vagrant</Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                        <Description>Vagrant User</Description>
-                        <DisplayName>vagrant</DisplayName>
-                        <Group>Administrators</Group>
-                        <Name>vagrant</Name>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Enabled>true</Enabled>
-                <Username>vagrant</Username>
-                <Password>
-                    <Value>vagrant</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\00-run-all-scripts.cmd</CommandLine>
-                    <Description>Run all *.bat and *.cmd scripts on drive A:</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <cpi:offlineImage cpi:source="wim:c:/users/misheska/sources/win8enterprise/x64/install.wim#Windows 8 Enterprise" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
diff --git a/floppy/oracle-cert.cer b/floppy/oracle-cert.cer
deleted file mode 100755
index d1bc63fc..00000000
Binary files a/floppy/oracle-cert.cer and /dev/null differ
diff --git a/floppy/slim_win10.bat b/floppy/slim_win10.bat
new file mode 100644
index 00000000..c0dc984f
--- /dev/null
+++ b/floppy/slim_win10.bat
@@ -0,0 +1,36 @@
+<!-- :
+@setlocal EnableDelayedExpansion EnableExtensions
+@for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i"
+@if defined PACKER_DEBUG (@echo on) else (@echo off)
+
+echo ==^> Disabling auto downloading for the store
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsStore" /v "AutoDownload" /t REG_DWORD /d 2 /f
+
+echo ==^> Disabling Cortana
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
+
+echo ==^> Disabling Windows Defender
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /v DisableAntiSpyware /t REG_DWORD /d 1 /f
+
+echo ==^> Disabling feedback prompts
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Siuf\Rules" /t REG_DWORD /v "NumberOfSIUFInPeriod" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Siuf\Rules" /t REG_DWORD /v "PeriodInNanoSeconds" /d 0 /f
+
+echo ==^> Disabling telemetry
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /t REG_DWORD /v "AITEnable" /d 0 /f      
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /t REG_DWORD /v "DisableInventory" /d 1 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /t REG_DWORD /v "DisableUAR" /d 1 /f
+
+echo ==^> Disabling Ads and Suggestions
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "SystemPaneSuggestionsEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "SoftLandingEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "RotatingLockScreenEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "RotatingLockScreenOverlayEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "SystemPaneSuggestionsEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "PreInstalledAppsEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "PreInstalledAppsEverEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "OEMPreInstalledAppsEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /t REG_DWORD /v "ShowSyncProviderNotifications" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "SilentInstalledAppsEnabled" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "ContentDeliveryAllowed" /d 0 /f
+Reg Add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /t REG_DWORD /v "SubscribedContentEnabled" /d 0 /f
\ No newline at end of file
diff --git a/floppy/win8x64-enterprise/Autounattend.xml b/floppy/win8x64-enterprise/Autounattend.xml
deleted file mode 100644
index 702c9d2a..00000000
--- a/floppy/win8x64-enterprise/Autounattend.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ImageInstall>
-                <OSImage>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/NAME</Key>
-                            <Value>Windows 8 Enterprise</Value>
-                        </MetaData>
-                    </InstallFrom>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                </OSImage>
-            </ImageInstall>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-            </UserData>
-            <DiskConfiguration>
-                <WillShowUI>OnError</WillShowUI>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Size>10000</Size>
-                            <Type>Primary</Type>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Active>true</Active>
-                            <Extend>true</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-            </DiskConfiguration>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>*</ComputerName>
-            <TimeZone>Pacific Standard Time</TimeZone>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>https://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="wow64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-            <Help_Page>about:blank</Help_Page>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <fDenyTSConnections>false</fDenyTSConnections>
-        </component>
-        <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <FirewallGroups>
-                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
-                    <Active>true</Active>
-                    <Group>Remote Desktop</Group>
-                    <Profile>all</Profile>
-                </FirewallGroup>
-            </FirewallGroups>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>3</ProtectYourPC>
-            </OOBE>
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Password>
-                            <Value>vagrant</Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                        <Description>Vagrant User</Description>
-                        <DisplayName>vagrant</DisplayName>
-                        <Group>Administrators</Group>
-                        <Name>vagrant</Name>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Enabled>true</Enabled>
-                <Username>vagrant</Username>
-                <Password>
-                    <Value>vagrant</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\00-run-all-scripts.cmd</CommandLine>
-                    <Description>Run all *.bat and *.cmd scripts on drive A:</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <cpi:offlineImage cpi:source="wim:c:/users/misheska/sources/win8enterprise/x64/install.wim#Windows 8 Enterprise" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
diff --git a/floppy/win8x64-pro/Autounattend.xml b/floppy/win8x64-pro/Autounattend.xml
deleted file mode 100644
index a13133ff..00000000
--- a/floppy/win8x64-pro/Autounattend.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ImageInstall>
-                <OSImage>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/NAME</Key>
-                            <Value>Windows 8 Pro</Value>
-                        </MetaData>
-                    </InstallFrom>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                </OSImage>
-            </ImageInstall>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-                <ProductKey>
-                    <Key>NG4HW-VH26C-733KW-K6F98-J8CK4</Key>
-                    <WillShowUI>OnError</WillShowUI>
-                </ProductKey>
-            </UserData>
-            <DiskConfiguration>
-                <WillShowUI>OnError</WillShowUI>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Size>10000</Size>
-                            <Type>Primary</Type>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Active>true</Active>
-                            <Extend>true</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-            </DiskConfiguration>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>*</ComputerName>
-            <TimeZone>Pacific Standard Time</TimeZone>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>https://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="wow64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-            <Help_Page>about:blank</Help_Page>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <fDenyTSConnections>false</fDenyTSConnections>
-        </component>
-        <component name="Networking-MPSSVC-Svc" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <FirewallGroups>
-                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
-                    <Active>true</Active>
-                    <Group>Remote Desktop</Group>
-                    <Profile>all</Profile>
-                </FirewallGroup>
-            </FirewallGroups>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>3</ProtectYourPC>
-            </OOBE>
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Password>
-                            <Value>vagrant</Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                        <Description>Vagrant User</Description>
-                        <DisplayName>vagrant</DisplayName>
-                        <Group>Administrators</Group>
-                        <Name>vagrant</Name>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Enabled>true</Enabled>
-                <Username>vagrant</Username>
-                <Password>
-                    <Value>vagrant</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\00-run-all-scripts.cmd</CommandLine>
-                    <Description>Run all *.bat and *.cmd scripts on drive A:</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <cpi:offlineImage cpi:source="wim:c:/users/misheska/sources/win8/x64/install.wim#Windows 8 Pro" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
diff --git a/floppy/win8x86-enterprise/Autounattend.xml b/floppy/win8x86-enterprise/Autounattend.xml
deleted file mode 100644
index c2a45230..00000000
--- a/floppy/win8x86-enterprise/Autounattend.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ImageInstall>
-                <OSImage>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/NAME</Key>
-                            <Value>Windows 8 Enterprise</Value>
-                        </MetaData>
-                    </InstallFrom>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                    <WillShowUI>OnError</WillShowUI>
-                </OSImage>
-            </ImageInstall>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-            </UserData>
-            <DiskConfiguration>
-                <WillShowUI>OnError</WillShowUI>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Size>10000</Size>
-                            <Type>Primary</Type>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Active>true</Active>
-                            <Extend>true</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-            </DiskConfiguration>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>*</ComputerName>
-            <TimeZone>Pacific Standard Time</TimeZone>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-            <Help_Page>about:blank</Help_Page>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <fDenyTSConnections>false</fDenyTSConnections>
-        </component>
-        <component name="Networking-MPSSVC-Svc" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <FirewallGroups>
-                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
-                    <Active>true</Active>
-                    <Group>Remote Desktop</Group>
-                    <Profile>all</Profile>
-                </FirewallGroup>
-            </FirewallGroups>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>3</ProtectYourPC>
-            </OOBE>
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Password>
-                            <Value>vagrant</Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                        <Description>Vagrant User</Description>
-                        <DisplayName>vagrant</DisplayName>
-                        <Group>Administrators</Group>
-                        <Name>vagrant</Name>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Enabled>true</Enabled>
-                <Username>vagrant</Username>
-                <Password>
-                    <Value>vagrant</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\00-run-all-scripts.cmd</CommandLine>
-                    <Description>Run all *.bat and *.cmd scripts on drive A:</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <cpi:offlineImage cpi:source="wim:c:/users/misheska/sources/win8enterprise/x86/install.wim#Windows 8 Enterprise" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
diff --git a/floppy/win8x86-pro/Autounattend.xml b/floppy/win8x86-pro/Autounattend.xml
deleted file mode 100644
index accfd492..00000000
--- a/floppy/win8x86-pro/Autounattend.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ImageInstall>
-                <OSImage>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/NAME</Key>
-                            <Value>Windows 8 Pro</Value>
-                        </MetaData>
-                    </InstallFrom>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                    <WillShowUI>OnError</WillShowUI>
-                </OSImage>
-            </ImageInstall>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-                <ProductKey>
-                    <WillShowUI>OnError</WillShowUI>
-                    <Key>NG4HW-VH26C-733KW-K6F98-J8CK4</Key>
-                </ProductKey>
-            </UserData>
-            <DiskConfiguration>
-                <WillShowUI>OnError</WillShowUI>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Size>10000</Size>
-                            <Type>Primary</Type>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Active>true</Active>
-                            <Extend>true</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-            </DiskConfiguration>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>*</ComputerName>
-            <TimeZone>Pacific Standard Time</TimeZone>
-        </component>
-        <component name="Microsoft-Windows-IE-InternetExplorer" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SearchScopes>
-                <Scope wcm:action="add">
-                    <ScopeDefault>true</ScopeDefault>
-                    <ScopeDisplayName>Google</ScopeDisplayName>
-                    <ScopeKey>Google</ScopeKey>
-                    <ScopeUrl>http://www.google.com/search?q={searchTerms}</ScopeUrl>
-                </Scope>
-            </SearchScopes>
-            <DisableAccelerators>true</DisableAccelerators>
-            <DisableFirstRunWizard>true</DisableFirstRunWizard>
-            <Home_Page>about:blank</Home_Page>
-            <Help_Page>about:blank</Help_Page>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <fDenyTSConnections>false</fDenyTSConnections>
-        </component>
-        <component name="Networking-MPSSVC-Svc" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <FirewallGroups>
-                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
-                    <Active>true</Active>
-                    <Group>Remote Desktop</Group>
-                    <Profile>all</Profile>
-                </FirewallGroup>
-            </FirewallGroups>
-        </component>
-        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <UserAuthentication>0</UserAuthentication>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>3</ProtectYourPC>
-            </OOBE>
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Password>
-                            <Value>vagrant</Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                        <Description>Vagrant User</Description>
-                        <DisplayName>vagrant</DisplayName>
-                        <Group>Administrators</Group>
-                        <Name>vagrant</Name>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Enabled>true</Enabled>
-                <Username>vagrant</Username>
-                <Password>
-                    <Value>vagrant</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\00-run-all-scripts.cmd</CommandLine>
-                    <Description>Run all *.bat and *.cmd scripts on drive A:</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <cpi:offlineImage cpi:source="catalog:c:/users/misheska/sources/win8/x86/install_windows 8 pro.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
diff --git a/script/cmtool.bat b/script/cmtool.bat
index 6b15068d..49bf8dd3 100644
--- a/script/cmtool.bat
+++ b/script/cmtool.bat
@@ -2,34 +2,129 @@
 @for %%i in (a:\_packer_config*.cmd) do @call "%%~i"
 @if defined PACKER_DEBUG (@echo on) else (@echo off)
 
-if not defined CM echo ==^> ERROR: The "CM" variable was not found in the environment & goto exit1
+:: Get the PlatformVersion from SystemInfo
+for /f "delims=:; tokens=1,2" %%a in ('systeminfo') do (
+  if "%%a" == "OS Version" set PlatformVersionRow=%%b
+)
+
+:: Extract the major/minor version (stripped)
+for /f "delims=.; tokens=1,2" %%a in ("%PlatformVersionRow%") do (
+  for /f "tokens=*" %%v in ("%%a") do set PlatformVersionMajor=%%v
+  for /f "tokens=*" %%v in ("%%b") do set PlatformVersionMinor=%%v
+)
+
+echo ==^> Detected Windows Platform Version: %PlatformVersionMajor%.%PlatformVersionMinor%
 
-if "%CM%" == "nocm"   goto nocm
+:: Set some reasonable defaults
+if not defined TEMP set TEMP=%LOCALAPPDATA%\Temp
 
-if not defined CM_VERSION echo ==^> ERROR: The "CM_VERSION" variable was not found in the environment & set CM_VERSION=latest
+:: Figure out which configuration management tool to use
+if not defined CM echo ==^> ERROR: The "CM" variable was not found in the environment & goto exit1
+if "%CM%" == "nocm" goto nocm
+
+if not defined CM_VERSION (
+  echo ==^> ERROR: The "CM_VERSION" variable was not found in the environment
+  set CM_VERSION=latest
+)
 
-if "%CM%" == "chef"   goto chef
-if "%CM%" == "chefdk" goto chefdk
+if "%CM%" == "chef" goto omnitruck
+if "%CM%" == "chefdk" goto omnitruck
+if "%CM%" == "chef-workstation" goto omnitruck
 if "%CM%" == "puppet" goto puppet
-if "%CM%" == "salt"   goto salt
+if "%CM%" == "salt" goto salt
 
 echo ==^> ERROR: Unknown value for environment variable CM: "%CM%"
 
 goto exit1
 
 ::::::::::::
-:chef
+:omnitruck
 ::::::::::::
 
-if not defined CHEF_URL if "%CM_VERSION%" == "latest" set CM_VERSION=13.6.4
-if not defined CHEF_URL set CHEF_64_URL=https://packages.chef.io/files/stable/chef/%CM_VERSION%/windows/2008r2/chef-client-%CM_VERSION%-1-x64.msi
-if not defined CHEF_URL set CHEF_32_URL=https://packages.chef.io/files/stable/chef/%CM_VERSION%/windows/2008r2/chef-client-%CM_VERSION%-1-x86.msi
+:: If we already have the CHEF_URL, then we don't need to use Omnitruck and we can move on
+if defined CHEF_URL goto chef
+
+:: Determine each component for using the Omnitruck API to get the desired Chef component
+if not defined OMNITRUCK_CHANNEL set OMNITRUCK_CHANNEL=stable
+
+:: Figure out the Omnitruck product
+if "%CM%" == "chef" (
+  set "OMNITRUCK_PRODUCT=chef"
+  set "OMNITRUCK_FREE_VERSION=14.14.29"
+) else if "%CM%" == "chefdk" (
+  set "OMNITRUCK_PRODUCT=chefdk"
+  set "OMNITRUCK_FREE_VERSION=3.12.10"
+) else if "%CM%" == "chef-workstation" (
+  set "OMNITRUCK_PRODUCT=chef-workstation"
+  set "OMNITRUCK_FREE_VERSION=0.3.2"
+) else (
+  echo Unknown Chef Product: %CM%
+  goto exit1
+)
+
+:: Check the CM_VERSION that the user specified..
+if "%CM_VERSION%" == "latest" (
+    :: ...and let them know if they chose the most recent free version.
+    echo ==^> User has chosen the most recent free version of %OMNITRUCK_PRODUCT%
+    set OMNITRUCK_VERSION=%OMNITRUCK_FREE_VERSION%
+
+) else if "%CM_VERSION%" == "licensed" (
+    :: ...or the most recent licensed version.
+    echo ==^> User has chosen the most recent licensed version of %OMNITRUCK_PRODUCT%
+    set OMNITRUCK_VERSION=latest
+
+) else if defined OMNITRUCK_VERSION (
+    :: ...or their own version if they explicitly set an environment variable
+    echo ==^> User has explicitly chosen the version %OMNITRUCK_VERSION% for %OMNITRUCK_PRODUCT%
+)
+
+:: Deterine the other desired parameters here
+if not defined OMNITRUCK_PLATFORM set OMNITRUCK_PLATFORM=windows
+if not defined OMNITRUCK_VERSION set OMNITRUCK_VERSION=%CM_VERSION%
+
+if not defined OMNITRUCK_MACHINE_ARCH (
+  if "%PROCESSOR_ARCHITECTURE%" == "x86" (
+    set OMNITRUCK_MACHINE_ARCH=x86
+  ) else (
+    set OMNITRUCK_MACHINE_ARCH=x64
+  )
+)
+
+:: We exclude the platform version as the Omnitruck API doesn't seem to use this
+:: set OMNITRUCK_PLATFORM_VERSION=
+
+:: strip -1 if %OMNITRUCK_VERSION% ends in -1
+set OMNITRUCK_VERSION=%OMNITRUCK_VERSION:-1=%
+
+:: Use the Omnitruck API to determine the CHEF_URL
+echo ==^> Getting %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% %OMNITRUCK_MACHINE_ARCH% download URL
+set url="https://omnitruck.chef.io/%OMNITRUCK_CHANNEL%/%OMNITRUCK_PRODUCT%/metadata?p=%OMNITRUCK_PLATFORM%&m=%OMNITRUCK_MACHINE_ARCH%&v=%OMNITRUCK_VERSION%"
+set filename="%TEMP%\omnitruck.txt"
+
+echo ==^> Using Chef Omnitruck API URL: !url!
+powershell -command "(New-Object System.Net.WebClient).DownloadFile('!url!', '!filename!')"
+
+if not exist "%TEMP%\omnitruck.txt" (
+  echo Unable to download metadata for %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% on the %OMNITRUCK_CHANNEL% channel for %OMNITRUCK_PLATFORM% %OMNITRUCK_MACHINE_ARCH%
 
-if defined ProgramFiles(x86) (
-  SET CHEF_URL=%CHEF_64_URL%
 ) else (
-  SET CHEF_URL=%CHEF_32_URL%
+  for /f "tokens=2 usebackq" %%a in (`findstr "url" "%TEMP%\omnitruck.txt"`) do (
+      set CHEF_URL=%%a
+  )
+)
+
+if not defined CHEF_URL (
+  echo Could not determine the %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% download url...
+  goto exit1
 )
+echo ==^> Got %OMNITRUCK_PRODUCT% download URL: !CHEF_URL!
+
+goto chef
+
+::::::::::::
+:chef
+::::::::::::
+if not defined CHEF_OPTIONS set CHEF_OPTIONS=%CM_OPTIONS%
 
 for %%i in ("%CHEF_URL%") do set CHEF_MSI=%%~nxi
 set CHEF_DIR=%TEMP%\chef
@@ -47,7 +142,7 @@ if exist "%SystemRoot%\_download.cmd" (
 )
 if not exist "%CHEF_PATH%" goto exit1
 
-echo ==^> Installing Chef client %CM_VERSION%
+echo ==^> Installing %CM% %CM_VERSION%
 msiexec /qb /i "%CHEF_PATH%" /l*v "%CHEF_DIR%\chef.log" %CHEF_OPTIONS%
 
 @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: msiexec /qb /i "%CHEF_PATH%" /l*v "%CHEF_DIR%\chef.log" %CHEF_OPTIONS%
@@ -56,57 +151,57 @@ ver>nul
 goto exit0
 
 ::::::::::::
-:chefdk
+:puppet
 ::::::::::::
+if not defined PUPPET_OPTIONS set PUPPET_OPTIONS=%CM_OPTIONS%
 
-if not defined CHEFDK_URL if "%CM_VERSION%" == "latest" set CM_VERSION=2.3.4
-if not defined CHEFDK_URL set CHEFDK_64_URL=https://packages.chef.io/files/stable/chefdk/%CM_VERSION%/windows/2008r2/chefdk-%CM_VERSION%-1-x86.msi
-if not defined CHEFDK_URL set CHEFDK_32_URL=https://packages.chef.io/files/stable/chefdk/%CM_VERSION%/windows/2008r2/chefdk-%CM_VERSION%-1-x86.msi
+if defined PUPPET_URL goto puppetinstall
 
-if defined ProgramFiles(x86) (
-  SET CHEFDK_URL=%CHEFDK_64_URL%
-) else (
-  SET CHEFDK_URL=%CHEFDK_32_URL%
+:: If we're using the latest, then hardcode the 32-bit/64-bit urls and install
+if "%CM_VERSION%" == "latest" (
+    set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-x86-latest.msi
+    set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-x64-latest.msi
+    goto puppetinstall
 )
 
-for %%i in ("%CHEFDK_URL%") do set CHEFDK_MSI=%%~nxi
-set CHEFDK_DIR=%TEMP%\chefdk
-set CHEFDK_PATH=%CHEFDK_DIR%\%CHEFDK_MSI%
-
-echo ==^> Creating "%CHEFDK_DIR%"
-mkdir "%CHEFDK_DIR%"
-pushd "%CHEFDK_DIR%"
+:: Figure out the major version requested by the user
+for /f "delims=." %%v in ("%CM_VERSION%") do set PUPPET_MAJOR_VERSION=%%v
 
-echo ==^> Downloading Chef DK to %CHEFDK_PATH%
-if exist "%SystemRoot%\_download.cmd" (
-  call "%SystemRoot%\_download.cmd" "%CHEFDK_URL%" "%CHEFDK_PATH%"
-) else (
-  echo ==^> Downloading %CHEFDK_URL% to %CHEFDK_PATH%
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"%CHEFDK_URL%\", '%CHEFDK_PATH%')" <NUL
-)
-if not exist "%CHEFDK_PATH%" goto exit1
-
-echo ==^> Installing Chef Development Kit %CM_VERSION%
-msiexec /qb /i "%CHEFDK_PATH%" /l*v "%CHEFDK_DIR%\chef.log" %CHEFDK_OPTIONS%
-
-@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: msiexec /qb /i "%CHEFDK_PATH%" /l*v "%CHEFDK_DIR%\chef.log" %CHEFDK_OPTIONS%
-ver>nul
-
-goto exit0
+:: Now we can use it to figure out the correct url format for that version
+if "%PUPPET_MAJOR_VERSION%" == "1" goto puppet1
+if "%PUPPET_MAJOR_VERSION%" == "5" goto puppet5
+goto puppetlatest
 
 ::::::::::::
-:puppet
+:puppet1
 ::::::::::::
+if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-agent-%CM_VERSION%-x64.msi
+if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet-agent-%CM_VERSION%-x86.msi
+goto puppetinstall
 
-:: if "%CM_VERSION%" == "latest" set CM_VERSION=3.8.7
+::::::::::::
+:puppet5
+::::::::::::
+if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-%CM_VERSION%-x64.msi
+if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-%CM_VERSION%-x86.msi
+goto puppetinstall
 
-if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-x64-%CM_VERSION%.msi
-if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-%CM_VERSION%.msi
+::::::::::::
+:puppetlatest
+::::::::::::
+if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x64.msi
+if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x86.msi
+goto puppetinstall
 
-if defined ProgramFiles(x86) (
-  set PUPPET_URL=%PUPPET_64_URL%
-) else (
-  set PUPPET_URL=%PUPPET_32_URL%
+::::::::::::
+:puppetinstall
+::::::::::::
+if not defined PUPPET_URL (
+  if "%PROCESSOR_ARCHITECTURE%" == "x86" (
+    set PUPPET_URL=%PUPPET_32_URL%
+  ) else (
+    set PUPPET_URL=%PUPPET_64_URL%
+  )
 )
 
 for %%i in ("%PUPPET_URL%") do set PUPPET_MSI=%%~nxi
@@ -138,36 +233,78 @@ goto exit0
 ::::::::::::
 :salt
 ::::::::::::
+if not defined SALT_OPTIONS set SALT_OPTIONS=%CM_OPTIONS%
+if not defined SALT_REVISION set SALT_REVISION=stable
+
+set SALT_DIR=%TEMP%\salt
+echo ==^> Creating "%SALT_DIR%"
+mkdir "%SALT_DIR%"
+pushd "%SALT_DIR%"
+
+:: If we're on a platform where salt-bootstrap is buggy, then fall back to just
+:: using the regular salt-repository method.
+if "%PlatformVersionMajor%" == "5" goto saltrepository
+if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "0" goto saltrepository
+if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto saltrepository
+
+::::::::::::
+:saltbootstrap
+::::::::::::
 
-if "%CM_VERSION%" == "latest" set CM_VERSION=2015.8.8-2
+:: We hardcode the CM_VERSION here to workaround saltstack/salt-bootstrap#1394
+if "%CM_VERSION%" == "latest" set CM_VERSION=2019.2.2
 
-if not defined SALT_64_URL set SALT_64_URL=https://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-AMD64-Setup.exe
-if not defined SALT_32_URL set SALT_32_URL=https://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-x86-Setup.exe
+set SALT_URL=http://raw.githubusercontent.com/saltstack/salt-bootstrap/%SALT_REVISION%/bootstrap-salt.ps1
 
-if defined ProgramFiles(x86) (
-  set SALT_URL=%SALT_64_URL%
+set SALT_PATH=%SALT_DIR%\bootstrap-salt.ps1
+set SALT_DOWNLOAD=%SALT_DIR%\bootstrap-salt.download.ps1
+
+echo ==^> Downloading %SALT_URL% to %SALT_DOWNLOAD%
+powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" <NUL
+
+if not exist "%SALT_DOWNLOAD%" goto exit1
+echo ==^> Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD%
+powershell -command "(get-content \"%SALT_DOWNLOAD%\") -replace \"'Tls,Tls11,Tls12'\", \"0xc0,0x300,0xc00\" | set-content \"%SALT_PATH%\""
+
+echo ==^> Installing Salt minion with %SALT_PATH%
+if "%CM_VERSION%" == "latest" (
+  powershell "%SALT_PATH%" %SALT_OPTIONS%
 ) else (
-  set SALT_URL=%SALT_32_URL%
+  powershell "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS%
 )
 
-for %%i in ("%SALT_URL%") do set SALT_EXE=%%~nxi
-set SALT_DIR=%TEMP%\salt
-set SALT_PATH=%SALT_DIR%\%SALT_EXE%
+@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS%
+ver>nul
 
-echo ==^> Creating "%SALT_DIR%"
-mkdir "%SALT_DIR%"
-pushd "%SALT_DIR%"
+goto exit0
 
-if exist "%SystemRoot%\_download.cmd" (
-  call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_PATH%"
+::::::::::::
+:saltrepository
+::::::::::::
+
+if not defined SALT_PYTHONVERSION set SALT_PYTHONVERSION=Py3
+
+if not defined SALT_ARCH (
+  if "%PROCESSOR_ARCHITECTURE%" == "x86" (
+    set SALT_ARCH=x86
+  ) else (
+    set SALT_ARCH=AMD64
+  )
+)
+
+if "%CM_VERSION%" == "latest" (
+  set SALT_URL=http://repo.saltstack.com/windows/Salt-Minion-Latest-%SALT_PYTHONVERSION%-%SALT_ARCH%-Setup.exe
 ) else (
-  echo ==^> Downloading %SALT_URL% to %SALT_PATH%
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" <NUL
+  set SALT_URL=http://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-%SALT_PYTHONVERSION%-%SALT_ARCH%-Setup.exe
 )
-if not exist "%SALT_PATH%" goto exit1
 
-echo ==^> Installing Salt minion
-:: see http://docs.saltstack.com/en/latest/topics/installation/windows.html
+set SALT_PATH=%SALT_DIR%\Salt-Minion-Setup.exe
+
+echo ==^> Downloading %SALT_URL% to %SALT_PATH%
+powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" <NUL
+
+echo ==^> Installing Salt minion %CM_VERSION%-%SALT_PYTHONVERSION% with %SALT_PATH%
+
 "%SALT_PATH%" /S %SALT_OPTIONS%
 
 @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" /S %SALT_OPTIONS%
diff --git a/script/vmtool.bat b/script/vmtool.bat
index 353c770c..13a51ec4 100644
--- a/script/vmtool.bat
+++ b/script/vmtool.bat
@@ -1,3 +1,4 @@
+:: TODO: add steps to download hyperv Integration Tools .cab file based on OS and install them if the user hasn't specific their own URL
 @setlocal EnableDelayedExpansion EnableExtensions
 @for %%i in (a:\_packer_config*.cmd) do @call "%%~i"
 @if defined PACKER_DEBUG (@echo on) else (@echo off)
@@ -88,6 +89,8 @@ echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul
 if not errorlevel 1 goto virtualbox
 echo "%PACKER_BUILDER_TYPE%" | findstr /i "parallels" >nul
 if not errorlevel 1 goto parallels
+echo "%PACKER_BUILDER_TYPE%" | findstr /i "hyperv" >nul
+if not errorlevel 1 goto hyperv
 echo ==^> ERROR: Unknown PACKER_BUILDER_TYPE: "%PACKER_BUILDER_TYPE%"
 pushd .
 goto exit1
@@ -257,6 +260,31 @@ echo ==^> Removing "%PARALLELS_ISO_PATH"
 del /F "%PARALLELS_ISO_PATH"
 goto :exit0
 
+::::::::::::
+:hyperv
+::::::::::::
+for /F "usebackq tokens=3,4,5" %%i in (`REG query "hklm\software\microsoft\windows NT\CurrentVersion" /v ProductName`) do set GUEST_OS=%%i %%j %%k
+
+set GUEST_OS
+
+if "%GUEST_OS%" == "Windows Server 2016" goto :exit0
+
+::First, download the appropriate Windows Update CAB file from here: https://support.microsoft.com/en-us/kb/3063109
+::  Windows 8.1: http://www.microsoft.com/downloads/details.aspx?familyid=cd142c42-204a-4566-b767-795e3409b135
+::  Windows 8.1: http://www.microsoft.com/downloads/details.aspx?familyid=3a5a9015-c121-44dd-ad2e-962f66532da7
+::  Windows Server 2012 R2: http://www.microsoft.com/downloads/details.aspx?familyid=a7704851-70bb-46c1-96d2-1b6f7ca226af
+::  Windows Server 2012: http://www.microsoft.com/downloads/details.aspx?familyid=185812c8-8eb5-43c8-8505-70a262f4277d
+::  Windows 7: http://www.microsoft.com/downloads/details.aspx?familyid=54c62651-0fc9-4642-ad12-404b3356825e
+::  Windows 7: http://www.microsoft.com/downloads/details.aspx?familyid=c84f2899-d997-42af-bd5d-cb97086e3b09
+::  Windows Server 2008 R2: http://www.microsoft.com/downloads/details.aspx?familyid=2dd45bd8-6bcd-47aa-8322-3e10b52b1f1f
+::Open up Windows Powershell with elevated privileges.
+::Set the correct path to the CAB file you’ve downloaded. For example:
+::  $integrationServicesCabPath="C:\Downloads\windows6.2-hypervintegrationservices-x86.cab"
+::Install the patch using the following command:
+::  Add-WindowsPackage -Online -PackagePath $integrationServicesCabPath
+
+goto :exit0
+
 :exit0
 @ver>nul
 @goto :exit
diff --git a/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl
index c180f333..2dfa47dd 100644
--- a/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl
index 7b0bfa56..0e331692 100644
--- a/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win10x64-enterprise.tpl b/tpl/vagrantfile-eval-win10x64-enterprise.tpl
index 9e7520a3..b3de2920 100644
--- a/tpl/vagrantfile-eval-win10x64-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win10x64-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl
index 4a0765be..acfa975f 100644
--- a/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl
index 73dfed55..d97959bf 100644
--- a/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win10x86-enterprise.tpl b/tpl/vagrantfile-eval-win10x86-enterprise.tpl
index a8e6fc94..fed81d6f 100644
--- a/tpl/vagrantfile-eval-win10x86-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win10x86-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl b/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl
index 00db8d87..284d5fc2 100644
--- a/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl b/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl
index 777a96d0..c73489ee 100644
--- a/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-datacenter.tpl b/tpl/vagrantfile-eval-win2008r2-datacenter.tpl
index 02e2cb71..5d41282d 100644
--- a/tpl/vagrantfile-eval-win2008r2-datacenter.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-datacenter.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl b/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl
index 7117a05c..724ce3b1 100644
--- a/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl b/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl
index e84bd788..bef96121 100644
--- a/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2008r2-standard.tpl b/tpl/vagrantfile-eval-win2008r2-standard.tpl
index c7385bff..1d9e5d99 100644
--- a/tpl/vagrantfile-eval-win2008r2-standard.tpl
+++ b/tpl/vagrantfile-eval-win2008r2-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl b/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl
index aa882c82..6e71c357 100644
--- a/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl b/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl
index dd9c28e8..b5915c7c 100644
--- a/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-datacenter.tpl b/tpl/vagrantfile-eval-win2012r2-datacenter.tpl
index e1234115..ff7d0f45 100644
--- a/tpl/vagrantfile-eval-win2012r2-datacenter.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-datacenter.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl b/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl
index 922bbc74..c119ea3f 100644
--- a/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl b/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl
index 0997c301..49600be1 100644
--- a/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2012r2-standard.tpl b/tpl/vagrantfile-eval-win2012r2-standard.tpl
index 64201a5b..b21fbc1d 100644
--- a/tpl/vagrantfile-eval-win2012r2-standard.tpl
+++ b/tpl/vagrantfile-eval-win2012r2-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl b/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl
index 6b08eee1..a199584a 100644
--- a/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2016-standard-ssh.tpl b/tpl/vagrantfile-eval-win2016-standard-ssh.tpl
index 86341045..b10bd4df 100644
--- a/tpl/vagrantfile-eval-win2016-standard-ssh.tpl
+++ b/tpl/vagrantfile-eval-win2016-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win2016-standard.tpl b/tpl/vagrantfile-eval-win2016-standard.tpl
index 45868232..3bf0ffe5 100644
--- a/tpl/vagrantfile-eval-win2016-standard.tpl
+++ b/tpl/vagrantfile-eval-win2016-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl
index 3d6682f5..80625249 100644
--- a/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl
index 262a7a7a..0ff203b4 100644
--- a/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x64-enterprise.tpl b/tpl/vagrantfile-eval-win7x64-enterprise.tpl
index a197bf3e..bdab8e75 100644
--- a/tpl/vagrantfile-eval-win7x64-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win7x64-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl
index d8f9c936..29fea7e1 100644
--- a/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl
index c6b1e50d..5e98557f 100644
--- a/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win7x86-enterprise.tpl b/tpl/vagrantfile-eval-win7x86-enterprise.tpl
index e6e2685b..487642ad 100644
--- a/tpl/vagrantfile-eval-win7x86-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win7x86-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl
index cf478dc8..3b0bae7e 100644
--- a/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl
index 0ac30824..e4290481 100644
--- a/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x64-enterprise.tpl b/tpl/vagrantfile-eval-win81x64-enterprise.tpl
index 3bd8b606..00e376f0 100644
--- a/tpl/vagrantfile-eval-win81x64-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win81x64-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl
index f65be736..7121942a 100644
--- a/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl
index 1ac65394..20d07392 100644
--- a/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win81x86-enterprise.tpl b/tpl/vagrantfile-eval-win81x86-enterprise.tpl
index 91651e4e..6c0570d8 100644
--- a/tpl/vagrantfile-eval-win81x86-enterprise.tpl
+++ b/tpl/vagrantfile-eval-win81x86-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-eval-win8x64-enterprise-cygwin.tpl b/tpl/vagrantfile-eval-win8x64-enterprise-cygwin.tpl
deleted file mode 100644
index df0a0f75..00000000
--- a/tpl/vagrantfile-eval-win8x64-enterprise-cygwin.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-eval-win8x64-enterprise-cygwin"
-  config.vm.box = "eval-win8x64-enterprise-cygwin"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-eval-win8x64-enterprise-ssh.tpl b/tpl/vagrantfile-eval-win8x64-enterprise-ssh.tpl
deleted file mode 100644
index 0c38f58b..00000000
--- a/tpl/vagrantfile-eval-win8x64-enterprise-ssh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-eval-win8x64-enterprise-ssh"
-  config.vm.box = "eval-win8x64-enterprise-ssh"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-eval-win8x64-enterprise.tpl b/tpl/vagrantfile-eval-win8x64-enterprise.tpl
deleted file mode 100644
index 0c3a741a..00000000
--- a/tpl/vagrantfile-eval-win8x64-enterprise.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-eval-win8x64-enterprise"
-  config.vm.box = "eval-win8x64-enterprise"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  #config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl b/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl
index 19b70e6f..6daa2b50 100644
--- a/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl
+++ b/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl b/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl
index ef6caa97..2e681744 100644
--- a/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl
+++ b/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-datacenter.tpl b/tpl/vagrantfile-win2008r2-datacenter.tpl
index 7c4ad4e1..a6983a29 100644
--- a/tpl/vagrantfile-win2008r2-datacenter.tpl
+++ b/tpl/vagrantfile-win2008r2-datacenter.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl b/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl
index 09a6d501..0a0d0d79 100644
--- a/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl b/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl
index 585711e3..1b614e21 100644
--- a/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-enterprise.tpl b/tpl/vagrantfile-win2008r2-enterprise.tpl
index 65acdfe2..a95925e6 100644
--- a/tpl/vagrantfile-win2008r2-enterprise.tpl
+++ b/tpl/vagrantfile-win2008r2-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standard-cygwin.tpl b/tpl/vagrantfile-win2008r2-standard-cygwin.tpl
index 10044f97..3af5f7c8 100644
--- a/tpl/vagrantfile-win2008r2-standard-cygwin.tpl
+++ b/tpl/vagrantfile-win2008r2-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standard-ssh.tpl b/tpl/vagrantfile-win2008r2-standard-ssh.tpl
index 027ac75f..4bc476d9 100644
--- a/tpl/vagrantfile-win2008r2-standard-ssh.tpl
+++ b/tpl/vagrantfile-win2008r2-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standard.tpl b/tpl/vagrantfile-win2008r2-standard.tpl
index a19cd919..acd24516 100644
--- a/tpl/vagrantfile-win2008r2-standard.tpl
+++ b/tpl/vagrantfile-win2008r2-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl b/tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl
index f4426a07..6d046ef8 100644
--- a/tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl
+++ b/tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standardcore-ssh.tpl b/tpl/vagrantfile-win2008r2-standardcore-ssh.tpl
index 80230be5..497ef73f 100644
--- a/tpl/vagrantfile-win2008r2-standardcore-ssh.tpl
+++ b/tpl/vagrantfile-win2008r2-standardcore-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-standardcore.tpl b/tpl/vagrantfile-win2008r2-standardcore.tpl
index 0d7973d0..4cd04195 100644
--- a/tpl/vagrantfile-win2008r2-standardcore.tpl
+++ b/tpl/vagrantfile-win2008r2-standardcore.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-web-cygwin.tpl b/tpl/vagrantfile-win2008r2-web-cygwin.tpl
index c7ca555a..19fb5857 100644
--- a/tpl/vagrantfile-win2008r2-web-cygwin.tpl
+++ b/tpl/vagrantfile-win2008r2-web-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-web-ssh.tpl b/tpl/vagrantfile-win2008r2-web-ssh.tpl
index 75c05283..9c01d034 100644
--- a/tpl/vagrantfile-win2008r2-web-ssh.tpl
+++ b/tpl/vagrantfile-win2008r2-web-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2008r2-web.tpl b/tpl/vagrantfile-win2008r2-web.tpl
index 794f88c9..d429ac06 100644
--- a/tpl/vagrantfile-win2008r2-web.tpl
+++ b/tpl/vagrantfile-win2008r2-web.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-datacenter-cygwin.tpl b/tpl/vagrantfile-win2012-datacenter-cygwin.tpl
index eecf64d0..0df317de 100644
--- a/tpl/vagrantfile-win2012-datacenter-cygwin.tpl
+++ b/tpl/vagrantfile-win2012-datacenter-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-datacenter-ssh.tpl b/tpl/vagrantfile-win2012-datacenter-ssh.tpl
index 87193d7c..8b51bf81 100644
--- a/tpl/vagrantfile-win2012-datacenter-ssh.tpl
+++ b/tpl/vagrantfile-win2012-datacenter-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-datacenter.tpl b/tpl/vagrantfile-win2012-datacenter.tpl
index c075baa9..e5381984 100644
--- a/tpl/vagrantfile-win2012-datacenter.tpl
+++ b/tpl/vagrantfile-win2012-datacenter.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-standard-cygwin.tpl b/tpl/vagrantfile-win2012-standard-cygwin.tpl
index e4a8a4d5..b2965d78 100644
--- a/tpl/vagrantfile-win2012-standard-cygwin.tpl
+++ b/tpl/vagrantfile-win2012-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-standard-ssh.tpl b/tpl/vagrantfile-win2012-standard-ssh.tpl
index 6b6cf308..e1fb61b4 100644
--- a/tpl/vagrantfile-win2012-standard-ssh.tpl
+++ b/tpl/vagrantfile-win2012-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012-standard.tpl b/tpl/vagrantfile-win2012-standard.tpl
index 03e6a374..96b9ac1d 100644
--- a/tpl/vagrantfile-win2012-standard.tpl
+++ b/tpl/vagrantfile-win2012-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl b/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl
index ab05b4be..e6e817a7 100644
--- a/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl
+++ b/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl b/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl
index 4fde76ab..26c8c25d 100644
--- a/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl
+++ b/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-datacenter.tpl b/tpl/vagrantfile-win2012r2-datacenter.tpl
index 2bb5d2a3..c00552cd 100644
--- a/tpl/vagrantfile-win2012r2-datacenter.tpl
+++ b/tpl/vagrantfile-win2012r2-datacenter.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standard-cygwin.tpl b/tpl/vagrantfile-win2012r2-standard-cygwin.tpl
index a348468a..0e1d2a47 100644
--- a/tpl/vagrantfile-win2012r2-standard-cygwin.tpl
+++ b/tpl/vagrantfile-win2012r2-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standard-ssh.tpl b/tpl/vagrantfile-win2012r2-standard-ssh.tpl
index a23e523f..285bd6e7 100644
--- a/tpl/vagrantfile-win2012r2-standard-ssh.tpl
+++ b/tpl/vagrantfile-win2012r2-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standard.tpl b/tpl/vagrantfile-win2012r2-standard.tpl
index 8e54215a..88dae9ff 100644
--- a/tpl/vagrantfile-win2012r2-standard.tpl
+++ b/tpl/vagrantfile-win2012r2-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl b/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl
index 5cf7a27c..05b9e6ab 100644
--- a/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl
+++ b/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standardcore-ssh.tpl b/tpl/vagrantfile-win2012r2-standardcore-ssh.tpl
index 90ea5c14..91c7f138 100644
--- a/tpl/vagrantfile-win2012r2-standardcore-ssh.tpl
+++ b/tpl/vagrantfile-win2012r2-standardcore-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2012r2-standardcore.tpl b/tpl/vagrantfile-win2012r2-standardcore.tpl
index 6fb90496..14c4a344 100644
--- a/tpl/vagrantfile-win2012r2-standardcore.tpl
+++ b/tpl/vagrantfile-win2012r2-standardcore.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2016-standard-cygwin.tpl b/tpl/vagrantfile-win2016-standard-cygwin.tpl
index 66ed05f4..fc4d5426 100644
--- a/tpl/vagrantfile-win2016-standard-cygwin.tpl
+++ b/tpl/vagrantfile-win2016-standard-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2016-standard-ssh.tpl b/tpl/vagrantfile-win2016-standard-ssh.tpl
index 88426344..3ef0c544 100644
--- a/tpl/vagrantfile-win2016-standard-ssh.tpl
+++ b/tpl/vagrantfile-win2016-standard-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win2016-standard.tpl b/tpl/vagrantfile-win2016-standard.tpl
index 6bf20fc8..fa90b97c 100644
--- a/tpl/vagrantfile-win2016-standard.tpl
+++ b/tpl/vagrantfile-win2016-standard.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl b/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl
index cdf94d59..c8e2d46e 100644
--- a/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-enterprise-ssh.tpl b/tpl/vagrantfile-win7x64-enterprise-ssh.tpl
index 3983e4eb..7b2320a8 100644
--- a/tpl/vagrantfile-win7x64-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-win7x64-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-enterprise.tpl b/tpl/vagrantfile-win7x64-enterprise.tpl
index 25ce773c..442284b7 100644
--- a/tpl/vagrantfile-win7x64-enterprise.tpl
+++ b/tpl/vagrantfile-win7x64-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-pro-cygwin.tpl b/tpl/vagrantfile-win7x64-pro-cygwin.tpl
index 889e1d5e..9c59e975 100644
--- a/tpl/vagrantfile-win7x64-pro-cygwin.tpl
+++ b/tpl/vagrantfile-win7x64-pro-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-pro-ssh.tpl b/tpl/vagrantfile-win7x64-pro-ssh.tpl
index 47bf87a0..eb029a41 100644
--- a/tpl/vagrantfile-win7x64-pro-ssh.tpl
+++ b/tpl/vagrantfile-win7x64-pro-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x64-pro.tpl b/tpl/vagrantfile-win7x64-pro.tpl
index c7e55702..4eadcc7e 100644
--- a/tpl/vagrantfile-win7x64-pro.tpl
+++ b/tpl/vagrantfile-win7x64-pro.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 2048]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl b/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl
index 6499687f..8fd40def 100644
--- a/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl
@@ -39,4 +39,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-enterprise-ssh.tpl b/tpl/vagrantfile-win7x86-enterprise-ssh.tpl
index a3eeac52..8b9413f6 100644
--- a/tpl/vagrantfile-win7x86-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-win7x86-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-enterprise.tpl b/tpl/vagrantfile-win7x86-enterprise.tpl
index ec0a2973..221a4c5b 100644
--- a/tpl/vagrantfile-win7x86-enterprise.tpl
+++ b/tpl/vagrantfile-win7x86-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-pro-cygwin.tpl b/tpl/vagrantfile-win7x86-pro-cygwin.tpl
index d532b162..2ee4dd3f 100644
--- a/tpl/vagrantfile-win7x86-pro-cygwin.tpl
+++ b/tpl/vagrantfile-win7x86-pro-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-pro-ssh.tpl b/tpl/vagrantfile-win7x86-pro-ssh.tpl
index b271a794..ae293dbd 100644
--- a/tpl/vagrantfile-win7x86-pro-ssh.tpl
+++ b/tpl/vagrantfile-win7x86-pro-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win7x86-pro.tpl b/tpl/vagrantfile-win7x86-pro.tpl
index ecdc8be5..78f1df07 100644
--- a/tpl/vagrantfile-win7x86-pro.tpl
+++ b/tpl/vagrantfile-win7x86-pro.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl b/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl
index 420f0bc9..5839059a 100644
--- a/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-enterprise-ssh.tpl b/tpl/vagrantfile-win81x64-enterprise-ssh.tpl
index 6a1118a1..3e04c698 100644
--- a/tpl/vagrantfile-win81x64-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-win81x64-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-enterprise.tpl b/tpl/vagrantfile-win81x64-enterprise.tpl
index be43274e..e8eeb311 100644
--- a/tpl/vagrantfile-win81x64-enterprise.tpl
+++ b/tpl/vagrantfile-win81x64-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-pro-cygwin.tpl b/tpl/vagrantfile-win81x64-pro-cygwin.tpl
index 96d2b11b..d3b58072 100644
--- a/tpl/vagrantfile-win81x64-pro-cygwin.tpl
+++ b/tpl/vagrantfile-win81x64-pro-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-pro-ssh.tpl b/tpl/vagrantfile-win81x64-pro-ssh.tpl
index 9073fc61..30fbfff1 100644
--- a/tpl/vagrantfile-win81x64-pro-ssh.tpl
+++ b/tpl/vagrantfile-win81x64-pro-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x64-pro.tpl b/tpl/vagrantfile-win81x64-pro.tpl
index e7e835ad..aa957bd3 100644
--- a/tpl/vagrantfile-win81x64-pro.tpl
+++ b/tpl/vagrantfile-win81x64-pro.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl b/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl
index 662f2dc3..5a6ef14f 100644
--- a/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl
+++ b/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-enterprise-ssh.tpl b/tpl/vagrantfile-win81x86-enterprise-ssh.tpl
index 8304b7ea..1f92b94d 100644
--- a/tpl/vagrantfile-win81x86-enterprise-ssh.tpl
+++ b/tpl/vagrantfile-win81x86-enterprise-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-enterprise.tpl b/tpl/vagrantfile-win81x86-enterprise.tpl
index 6a47043d..5ed31712 100644
--- a/tpl/vagrantfile-win81x86-enterprise.tpl
+++ b/tpl/vagrantfile-win81x86-enterprise.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-pro-cygwin.tpl b/tpl/vagrantfile-win81x86-pro-cygwin.tpl
index af0323b2..0e9ef259 100644
--- a/tpl/vagrantfile-win81x86-pro-cygwin.tpl
+++ b/tpl/vagrantfile-win81x86-pro-cygwin.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-pro-ssh.tpl b/tpl/vagrantfile-win81x86-pro-ssh.tpl
index dd409f09..f107c7da 100644
--- a/tpl/vagrantfile-win81x86-pro-ssh.tpl
+++ b/tpl/vagrantfile-win81x86-pro-ssh.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win81x86-pro.tpl b/tpl/vagrantfile-win81x86-pro.tpl
index 8a7497ac..efa9dba2 100644
--- a/tpl/vagrantfile-win81x86-pro.tpl
+++ b/tpl/vagrantfile-win81x86-pro.tpl
@@ -40,4 +40,9 @@ Vagrant.configure("2") do |config|
     v.customize ["set", :id, "--memsize", 1536]
     v.customize ["set", :id, "--videosize", "256"]
   end
+
+  config.vm.provider :hyperv do |v, override|
+    v.cpus = "1"
+    v.memory = "1536"
+  end
 end
diff --git a/tpl/vagrantfile-win8x64-enterprise-cygwin.tpl b/tpl/vagrantfile-win8x64-enterprise-cygwin.tpl
deleted file mode 100644
index 72789a89..00000000
--- a/tpl/vagrantfile-win8x64-enterprise-cygwin.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-enterprise-cygwin"
-  config.vm.box = "win8x64-enterprise-cygwin"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x64-enterprise-ssh.tpl b/tpl/vagrantfile-win8x64-enterprise-ssh.tpl
deleted file mode 100644
index e0039c9b..00000000
--- a/tpl/vagrantfile-win8x64-enterprise-ssh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-enterprise-ssh"
-  config.vm.box = "win8x64-enterprise-ssh"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x64-enterprise.tpl b/tpl/vagrantfile-win8x64-enterprise.tpl
deleted file mode 100644
index a048a6f7..00000000
--- a/tpl/vagrantfile-win8x64-enterprise.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-enterprise"
-  config.vm.box = "win8x64-enterprise"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  #config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x64-pro-cygwin.tpl b/tpl/vagrantfile-win8x64-pro-cygwin.tpl
deleted file mode 100644
index f9526cc9..00000000
--- a/tpl/vagrantfile-win8x64-pro-cygwin.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-pro-cygwin"
-  config.vm.box = "win8x64-pro-cygwin"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x64-pro-ssh.tpl b/tpl/vagrantfile-win8x64-pro-ssh.tpl
deleted file mode 100644
index 82061c4d..00000000
--- a/tpl/vagrantfile-win8x64-pro-ssh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-pro-ssh"
-  config.vm.box = "win8x64-pro-ssh"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x64-pro.tpl b/tpl/vagrantfile-win8x64-pro.tpl
deleted file mode 100644
index e46f3e93..00000000
--- a/tpl/vagrantfile-win8x64-pro.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x64-pro"
-  config.vm.box = "win8x64-pro"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  #config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-enterprise-cygwin.tpl b/tpl/vagrantfile-win8x86-enterprise-cygwin.tpl
deleted file mode 100644
index 4cb58a3b..00000000
--- a/tpl/vagrantfile-win8x86-enterprise-cygwin.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-enterprise-cygwin"
-  config.vm.box = "win8x86-enterprise-cygwin"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-enterprise-ssh.tpl b/tpl/vagrantfile-win8x86-enterprise-ssh.tpl
deleted file mode 100644
index b767abad..00000000
--- a/tpl/vagrantfile-win8x86-enterprise-ssh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-enterprise-ssh"
-  config.vm.box = "win8x86-enterprise-ssh"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-enterprise.tpl b/tpl/vagrantfile-win8x86-enterprise.tpl
deleted file mode 100644
index 226b13d9..00000000
--- a/tpl/vagrantfile-win8x86-enterprise.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-enterprise"
-  config.vm.box = "win8x86-enterprise"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  #config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-pro-cygwin.tpl b/tpl/vagrantfile-win8x86-pro-cygwin.tpl
deleted file mode 100644
index 777b190c..00000000
--- a/tpl/vagrantfile-win8x86-pro-cygwin.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-pro-cygwin"
-  config.vm.box = "win8x86-pro-cygwin"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-pro-ssh.tpl b/tpl/vagrantfile-win8x86-pro-ssh.tpl
deleted file mode 100644
index 10130920..00000000
--- a/tpl/vagrantfile-win8x86-pro-ssh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-pro-ssh"
-  config.vm.box = "win8x86-pro-ssh"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/tpl/vagrantfile-win8x86-pro.tpl b/tpl/vagrantfile-win8x86-pro.tpl
deleted file mode 100644
index 93352e38..00000000
--- a/tpl/vagrantfile-win8x86-pro.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.define "vagrant-win8x86-pro"
-  config.vm.box = "win8x86-pro"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
-  config.vm.communicator = "winrm"
-  config.vm.guest = :windows
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct:true
-  # Port forward SSH
-  #config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct:true
-
-  config.vm.provider :virtualbox do |v, override|
-    v.gui = true
-    v.customize ["modifyvm", :id, "--memory", 1536]
-    v.customize ["modifyvm", :id, "--cpus", 1]
-    v.customize ["modifyvm", :id, "--vram", "256"]
-    v.customize ["setextradata", "global", "GUI/MaxGuestResolution", "any"]
-    v.customize ["setextradata", :id, "CustomVideoMode1", "1024x768x32"]
-  end
-
-  ["vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.gui = true
-      v.vmx["memsize"] = "1536"
-      v.vmx["numvcpus"] = "1"
-      v.vmx["cpuid.coresPerSocket"] = "1"
-      v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-      v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-      v.vmx["RemoteDisplay.vnc.port"] = "5900"
-      v.vmx["scsi0.virtualDev"] = "lsilogic"
-    end
-  end
-
-  config.vm.provider :parallels do |v, override|
-    v.customize ["set", :id, "--cpus", 1]
-    v.customize ["set", :id, "--memsize", 1536]
-    v.customize ["set", :id, "--videosize", "256"]
-  end
-end
diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json
index d8896358..d16477f6 100644
--- a/win2008r2-datacenter-cygwin.json
+++ b/win2008r2-datacenter-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-datacenter-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "hard_drive_interface": "sata",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-datacenter",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json
index f920e234..9b31e826 100644
--- a/win2008r2-datacenter-ssh.json
+++ b/win2008r2-datacenter-ssh.json
@@ -1,151 +1,155 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-datacenter-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -157,15 +161,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-datacenter",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json
index c28ad5f0..1c2189d5 100644
--- a/win2008r2-datacenter.json
+++ b/win2008r2-datacenter.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-datacenter",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-datacenter",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-datacenter",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json
index 09bc859c..8d3b29e8 100644
--- a/win2008r2-enterprise-cygwin.json
+++ b/win2008r2-enterprise-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json
index 363cde16..53117a67 100644
--- a/win2008r2-enterprise-ssh.json
+++ b/win2008r2-enterprise-ssh.json
@@ -1,151 +1,155 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -157,15 +161,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json
index 1f9a0345..38147389 100644
--- a/win2008r2-enterprise.json
+++ b/win2008r2-enterprise.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json
index b79cdecb..2cee05f2 100644
--- a/win2008r2-standard-cygwin.json
+++ b/win2008r2-standard-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json
index 570a2b8f..39382153 100644
--- a/win2008r2-standard-ssh.json
+++ b/win2008r2-standard-ssh.json
@@ -1,151 +1,155 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -157,15 +161,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-standard.json b/win2008r2-standard.json
index fac216fe..9b4808d4 100644
--- a/win2008r2-standard.json
+++ b/win2008r2-standard.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json
index 3933e6f8..cc659966 100644
--- a/win2008r2-web-cygwin.json
+++ b/win2008r2-web-cygwin.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-web-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-web-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-web-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-web-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-web-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-web",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json
index b8e36cb0..84314e23 100644
--- a/win2008r2-web-ssh.json
+++ b/win2008r2-web-ssh.json
@@ -1,151 +1,155 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-web-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-web-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/disablewinupdate.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-web-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-web-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-web-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -157,15 +161,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-web",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2008r2-web.json b/win2008r2-web.json
index a7d75a63..f9a94261 100644
--- a/win2008r2-web.json
+++ b/win2008r2-web.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2008r2-web",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2008_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2008r2-web",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/disablewinupdate.bat",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2008r2-web/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2008",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/disablewinupdate.bat",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2008r2-web",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-web-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-web.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2008r2-web",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
+    "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json
index dc651415..87a99ce2 100644
--- a/win2012-datacenter-cygwin.json
+++ b/win2012-datacenter-cygwin.json
@@ -1,122 +1,101 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-datacenter-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -124,40 +103,69 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -169,15 +177,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012-datacenter",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json
index b58adcaa..30b6f011 100644
--- a/win2012-datacenter-ssh.json
+++ b/win2012-datacenter-ssh.json
@@ -1,119 +1,98 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-datacenter-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -121,40 +100,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -166,15 +173,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012-datacenter",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012-datacenter.json b/win2012-datacenter.json
index 9dd87a10..71a43f9b 100644
--- a/win2012-datacenter.json
+++ b/win2012-datacenter.json
@@ -1,121 +1,100 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-datacenter",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-datacenter",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -123,50 +102,86 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2012-datacenter",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2012-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json
index ea0bddb4..5f08c40d 100644
--- a/win2012-standard-cygwin.json
+++ b/win2012-standard-cygwin.json
@@ -1,122 +1,101 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -124,40 +103,69 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -169,15 +177,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json
index f32b05b6..63bbd7d0 100644
--- a/win2012-standard-ssh.json
+++ b/win2012-standard-ssh.json
@@ -1,119 +1,98 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -121,40 +100,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -166,15 +173,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012-standard.json b/win2012-standard.json
index ade2ac97..806ea99e 100644
--- a/win2012-standard.json
+++ b/win2012-standard.json
@@ -1,121 +1,100 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win2012-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2012-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -123,50 +102,86 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/hotfix-KB2842230.bat",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2012-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2012-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso",
+    "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json
index ba9a7209..02f68e0f 100644
--- a/win2012r2-datacenter-cygwin.json
+++ b/win2012r2-datacenter-cygwin.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-datacenter-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-datacenter-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/cygwin.sh",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-datacenter-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-datacenter",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso",
+    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json
index 69388045..b5f6873e 100644
--- a/win2012r2-datacenter-ssh.json
+++ b/win2012r2-datacenter-ssh.json
@@ -1,120 +1,101 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-datacenter-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-datacenter-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -122,40 +103,66 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-datacenter-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,15 +174,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-datacenter",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso",
+    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json
index bb426761..60aa9a90 100644
--- a/win2012r2-datacenter.json
+++ b/win2012r2-datacenter.json
@@ -1,122 +1,103 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-datacenter",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-datacenter",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-datacenter/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -124,50 +105,84 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-datacenter",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-datacenter",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso",
+    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json
index 7557e696..a31d3c5d 100644
--- a/win2012r2-standard-cygwin.json
+++ b/win2012r2-standard-cygwin.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standard-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso",
+    "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json
index 10ad647e..71ad0bdc 100644
--- a/win2012r2-standard-ssh.json
+++ b/win2012r2-standard-ssh.json
@@ -1,120 +1,101 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standard-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -122,40 +103,66 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,15 +174,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso",
+    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-standard.json b/win2012r2-standard.json
index 1f6eebb7..48a95abe 100644
--- a/win2012r2-standard.json
+++ b/win2012r2-standard.json
@@ -1,123 +1,103 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,50 +105,84 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso",
+    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json
index 63b90be0..676bbd94 100644
--- a/win2012r2-standardcore-cygwin.json
+++ b/win2012r2-standardcore-cygwin.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standardcore-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standardcore-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standardcore-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standardcore-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standardcore",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso",
+    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json
index 06e7754a..e8ffd363 100644
--- a/win2012r2-standardcore-ssh.json
+++ b/win2012r2-standardcore-ssh.json
@@ -1,120 +1,101 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standardcore",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standardcore"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -122,40 +103,66 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standardcore"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -167,15 +174,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standardcore",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso",
+    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json
index 1f73f6ac..c81650bb 100644
--- a/win2012r2-standardcore.json
+++ b/win2012r2-standardcore.json
@@ -1,122 +1,103 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2012r2-standardcore",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2012_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2012r2-standardcore",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win2012r2-standardcore/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2012",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -124,50 +105,84 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2012r2-standardcore",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2012r2-standardcore",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso",
+    "iso_checksum": "865494e969704be1c4496d8614314361d025775e",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json
index 9877421d..a76a1be9 100644
--- a/win2016-standard-cygwin.json
+++ b/win2016-standard-cygwin.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2016-standard-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2016-standard-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/cygwin.sh",
-        "floppy/unzip.vbs",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,40 +109,68 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2016-standard-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/win2016-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2016-standard-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -173,15 +182,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2016-standard",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso",
+    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json
index 97ba77be..1efa40bd 100644
--- a/win2016-standard-ssh.json
+++ b/win2016-standard-ssh.json
@@ -1,123 +1,104 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2016-standard-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2016-standard-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -125,40 +106,67 @@
           "off"
         ]
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
       "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win2016-standard-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/win2016-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2016-standard-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -170,15 +178,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win2016-standard",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso",
+    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win2016-standard.json b/win2016-standard.json
index adefc3d5..847fbde9 100644
--- a/win2016-standard.json
+++ b/win2016-standard.json
@@ -1,126 +1,107 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8srv-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win2016-standard",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "4096",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows2016_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "4096"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win2016-standard",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win2016-standard/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-2016",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
       "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "4096"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "set",
           "{{.Name}}",
@@ -128,50 +109,85 @@
           "off"
         ]
       ],
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "floppy_files": [
+        "{{template_dir}}/floppy/win2016-standard/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/unzip.vbs",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
+      ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win2016-standard",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": true,
-      "output": "box/{{.Provider}}/win2016-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2016-standard.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win2016-standard",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso",
+    "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json
index 32bfeab1..0b7928b7 100644
--- a/win7x64-enterprise-cygwin.json
+++ b/win7x64-enterprise-cygwin.json
@@ -1,157 +1,163 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command` }}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command` }}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -163,15 +169,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x64-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json
index 6693b687..b236ec44 100644
--- a/win7x64-enterprise-ssh.json
+++ b/win7x64-enterprise-ssh.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x64-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json
index 1ac487a0..b441899b 100644
--- a/win7x64-enterprise.json
+++ b/win7x64-enterprise.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win7x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "hw_version": "7",
     "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+    "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json
index 0b902e8e..34a55733 100644
--- a/win7x64-pro-cygwin.json
+++ b/win7x64-pro-cygwin.json
@@ -1,157 +1,163 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-pro-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -163,15 +169,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x64-pro",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso",
+    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json
index 7f27ff59..0b777abc 100644
--- a/win7x64-pro-ssh.json
+++ b/win7x64-pro-ssh.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-pro-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x64-pro",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso",
+    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x64-pro.json b/win7x64-pro.json
index 18066e8c..2380ee4b 100644
--- a/win7x64-pro.json
+++ b/win7x64-pro.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x64-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x64-pro",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win7x64-pro",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-pro.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win7x64-pro",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso",
+    "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json
index fc388047..40f10b4e 100644
--- a/win7x86-enterprise-cygwin.json
+++ b/win7x86-enterprise-cygwin.json
@@ -1,157 +1,163 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -163,15 +169,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x86-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso",
+    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json
index 13f2f745..8ce7a3c5 100644
--- a/win7x86-enterprise-ssh.json
+++ b/win7x86-enterprise-ssh.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x86-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso",
+    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json
index a3888927..6a11ac4a 100644
--- a/win7x86-enterprise.json
+++ b/win7x86-enterprise.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win7x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso",
+    "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json
index 1897a979..fca587f2 100644
--- a/win7x86-pro-cygwin.json
+++ b/win7x86-pro-cygwin.json
@@ -1,157 +1,163 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-pro-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -163,15 +169,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x86-pro",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso",
+    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json
index 6963e3f4..08fc2437 100644
--- a/win7x86-pro-ssh.json
+++ b/win7x86-pro-ssh.json
@@ -1,154 +1,159 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/networkprompt.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-pro-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -160,15 +165,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win7x86-pro",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso",
+    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win7x86-pro.json b/win7x86-pro.json
index 70be242d..5da45dd4 100644
--- a/win7x86-pro.json
+++ b/win7x86-pro.json
@@ -1,163 +1,175 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows7",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win7x86-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows7",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win7x86-pro",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/networkprompt.bat",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win7x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-7",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/networkprompt.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win7x86-pro",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-pro.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win7x86-pro",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso",
+    "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json
index b8478839..ce880042 100644
--- a/win81x64-enterprise-cygwin.json
+++ b/win81x64-enterprise-cygwin.json
@@ -1,158 +1,164 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-enterprise-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -164,15 +170,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x64-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso",
+    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json
index 8c9ab1da..e26901d5 100644
--- a/win81x64-enterprise-ssh.json
+++ b/win81x64-enterprise-ssh.json
@@ -1,155 +1,160 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-enterprise-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -161,15 +166,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x64-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso",
+    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json
index 28faf9ea..30acaa11 100644
--- a/win81x64-enterprise.json
+++ b/win81x64-enterprise.json
@@ -1,167 +1,180 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-enterprise",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win81x64-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso",
+    "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json
index 1563af56..fdd0472f 100644
--- a/win81x64-pro-cygwin.json
+++ b/win81x64-pro-cygwin.json
@@ -1,158 +1,164 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-pro-cygwin"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-pro-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -164,15 +170,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x64-pro",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso",
+    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json
index 48964333..4f032837 100644
--- a/win81x64-pro-ssh.json
+++ b/win81x64-pro-ssh.json
@@ -1,155 +1,160 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "post_shutdown_delay": "30s",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-pro-ssh"
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-pro-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -161,15 +166,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x64-pro",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso",
+    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x64-pro.json b/win81x64-pro.json
index 26e29c70..6d257b86 100644
--- a/win81x64-pro.json
+++ b/win81x64-pro.json
@@ -1,167 +1,180 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8-64",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x64-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ],
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
-      "vm_name": "win81x64-pro",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win81x64-pro",
+      "communicator": "winrm",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-pro.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win81x64-pro",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso",
+    "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json
index 245fd831..6dcda1f4 100644
--- a/win81x86-enterprise-cygwin.json
+++ b/win81x86-enterprise-cygwin.json
@@ -1,152 +1,156 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-enterprise-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -158,15 +162,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x86-enterprise",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso",
+    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json
index 7adc8ddc..0306bd80 100644
--- a/win81x86-enterprise-ssh.json
+++ b/win81x86-enterprise-ssh.json
@@ -1,149 +1,152 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "headless": "{{ user `headless` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-enterprise-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -155,15 +158,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x86-enterprise",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso",
+    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json
index 594818e9..5d9cc262 100644
--- a/win81x86-enterprise.json
+++ b/win81x86-enterprise.json
@@ -1,161 +1,172 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-enterprise",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-enterprise",
+      "communicator": "winrm",
+      "cpus": "{{ user `cpus` }}",
+      "headless": "{{ user `headless` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win81x86-enterprise",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso",
+    "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json
index 75eefb1e..cdb02333 100644
--- a/win81x86-pro-cygwin.json
+++ b/win81x86-pro-cygwin.json
@@ -1,152 +1,156 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/cygwin.bat",
+        "{{template_dir}}/floppy/cygwin.sh",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "headless": "{{ user `headless` }}",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-pro-cygwin"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-pro-cygwin.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
       "remote_path": "C:/Windows/Temp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -158,15 +162,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x86-pro",
+    "vm_suffix": "-cygwin",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso",
+    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json
index c5f0b7b3..4aac5bc8 100644
--- a/win81x86-pro-ssh.json
+++ b/win81x86-pro-ssh.json
@@ -1,149 +1,152 @@
 {
   "builders": [
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      }
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/openssh.bat",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
+      "cpus": "{{ user `cpus` }}",
+      "headless": "{{ user `headless` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-pro-ssh"
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-pro-ssh.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro-ssh.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
       "remote_path": "/tmp/script.bat",
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "shell"
     },
@@ -155,15 +158,21 @@
     }
   ],
   "variables": {
+    "vm_name": "win81x86-pro",
+    "vm_suffix": "-ssh",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso",
+    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
 }
-
diff --git a/win81x86-pro.json b/win81x86-pro.json
index b0f847c7..1a4d7836 100644
--- a/win81x86-pro.json
+++ b/win81x86-pro.json
@@ -1,161 +1,172 @@
 {
   "builders": [
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "vmware-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "windows8",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
       "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win81x86-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
+      "version": "{{ user `hw_version` }}",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "disk_adapter_type": "lsisas1068",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "virtualbox-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_additions_mode": "attach",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win81x86-pro",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "hard_drive_interface": "sata",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     },
     {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
+      "type": "parallels-iso",
+      "iso_url": "{{ user `iso_url` }}",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
       "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win81x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "communicator": "winrm",
       "guest_os_type": "win-8.1",
+      "parallels_tools_flavor": "win",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
+      "winrm_password": "vagrant",
+      "winrm_timeout": "10000s"
+    },
+    {
+      "type": "hyperv-iso",
+      "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
+      "floppy_files": [
+        "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml",
+        "{{template_dir}}/floppy/00-run-all-scripts.cmd",
+        "{{template_dir}}/floppy/01-install-wget.cmd",
+        "{{template_dir}}/floppy/_download.cmd",
+        "{{template_dir}}/floppy/_packer_config.cmd",
+        "{{template_dir}}/floppy/fixnetwork.ps1",
+        "{{template_dir}}/floppy/install-winrm.cmd",
+        "{{template_dir}}/floppy/passwordchange.bat",
+        "{{template_dir}}/floppy/powerconfig.bat",
+        "{{template_dir}}/floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win81x86-pro",
+      "communicator": "winrm",
+      "cpus": "{{ user `cpus` }}",
+      "headless": "{{ user `headless` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{user `disk_size`}}",
+      "vm_name": "{{user `vm_name`}}",
+      "winrm_username": "vagrant",
       "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
+      "winrm_timeout": "10000s"
     }
   ],
   "post-processors": [
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-pro.tpl"
+      "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro.tpl"
     }
   ],
   "provisioners": [
     {
       "environment_vars": [
         "CM={{user `cm`}}",
+        "CM_OPTIONS={{user `cm_options`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
+        "{{template_dir}}/script/vagrant.bat",
+        "{{template_dir}}/script/cmtool.bat",
+        "{{template_dir}}/script/vmtool.bat",
+        "{{template_dir}}/script/clean.bat",
+        "{{template_dir}}/script/ultradefrag.bat",
+        "{{template_dir}}/script/uninstall-7zip.bat",
+        "{{template_dir}}/script/sdelete.bat"
       ],
       "type": "windows-shell"
     }
   ],
   "variables": {
+    "vm_name": "win81x86-pro",
+    "vm_suffix": "",
     "cm": "chef",
     "cm_version": "",
+    "cpus": "2",
+    "memory": "2048",
     "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "hw_version": "7",
     "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso",
+    "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254",
+    "guest_additions_url": "",
+    "box_directory": "box/",
     "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+    "headless": "false",
     "update": "true",
     "version": "0.1.0"
   }
diff --git a/win8x64-enterprise-cygwin.json b/win8x64-enterprise-cygwin.json
deleted file mode 100644
index 9451fbb5..00000000
--- a/win8x64-enterprise-cygwin.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-enterprise-cygwin"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-enterprise-cygwin"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-enterprise-cygwin.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
-      "remote_path": "C:/Windows/Temp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /cygdrive/c/Windows/Temp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4eadfe83e736621234c63e8465986f0af6aa3c82",
-    "iso_url": "iso/en_windows_8_enterprise_x64_dvd_917522.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x64-enterprise-ssh.json b/win8x64-enterprise-ssh.json
deleted file mode 100644
index 786487b1..00000000
--- a/win8x64-enterprise-ssh.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-enterprise-ssh"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-enterprise-ssh"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-enterprise-ssh.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-      "remote_path": "/tmp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /tmp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4eadfe83e736621234c63e8465986f0af6aa3c82",
-    "iso_url": "iso/en_windows_8_enterprise_x64_dvd_917522.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x64-enterprise.json b/win8x64-enterprise.json
deleted file mode 100644
index 7005359a..00000000
--- a/win8x64-enterprise.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  "builders": [
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-enterprise.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "4eadfe83e736621234c63e8465986f0af6aa3c82",
-    "iso_url": "iso/en_windows_8_enterprise_x64_dvd_917522.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/win8x64-pro-cygwin.json b/win8x64-pro-cygwin.json
deleted file mode 100644
index 7c2d4168..00000000
--- a/win8x64-pro-cygwin.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-pro-cygwin"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-pro-cygwin"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-pro-cygwin.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
-      "remote_path": "C:/Windows/Temp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /cygdrive/c/Windows/Temp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "1ce53ad5f60419cf04a715cf3233f247e48beec4",
-    "iso_url": "iso/en_windows_8_x64_dvd_915440.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x64-pro-ssh.json b/win8x64-pro-ssh.json
deleted file mode 100644
index 2b9a8c5a..00000000
--- a/win8x64-pro-ssh.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-pro-ssh"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/unzip.vbs",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-pro-ssh"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-pro-ssh.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-      "remote_path": "/tmp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /tmp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "1ce53ad5f60419cf04a715cf3233f247e48beec4",
-    "iso_url": "iso/en_windows_8_x64_dvd_915440.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x64-pro.json b/win8x64-pro.json
deleted file mode 100644
index cc6d6d52..00000000
--- a/win8x64-pro.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  "builders": [
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8-64",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x64-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8_64",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x64-pro",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/hotfix-KB2842230.bat",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/unzip.vbs",
-        "floppy/win8x64-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win8x64-pro",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-pro.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "1ce53ad5f60419cf04a715cf3233f247e48beec4",
-    "iso_url": "iso/en_windows_8_x64_dvd_915440.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/win8x86-enterprise-cygwin.json b/win8x86-enterprise-cygwin.json
deleted file mode 100644
index 789ed238..00000000
--- a/win8x86-enterprise-cygwin.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-enterprise-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-enterprise-cygwin"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-enterprise-cygwin"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-enterprise-cygwin.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
-      "remote_path": "C:/Windows/Temp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /cygdrive/c/Windows/Temp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fefce3e64fb9ec1cc7977165328890ccc9a10656",
-    "iso_url": "iso/en_windows_8_enterprise_x86_dvd_917587.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x86-enterprise-ssh.json b/win8x86-enterprise-ssh.json
deleted file mode 100644
index 512e68b2..00000000
--- a/win8x86-enterprise-ssh.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-enterprise-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-enterprise-ssh"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-enterprise-ssh"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-enterprise-ssh.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-      "remote_path": "/tmp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /tmp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fefce3e64fb9ec1cc7977165328890ccc9a10656",
-    "iso_url": "iso/en_windows_8_enterprise_x86_dvd_917587.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x86-enterprise.json b/win8x86-enterprise.json
deleted file mode 100644
index 860f92d3..00000000
--- a/win8x86-enterprise.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "builders": [
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-enterprise",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-enterprise/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-enterprise",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-enterprise.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "fefce3e64fb9ec1cc7977165328890ccc9a10656",
-    "iso_url": "iso/en_windows_8_enterprise_x86_dvd_917587.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/win8x86-pro-cygwin.json b/win8x86-pro-cygwin.json
deleted file mode 100644
index efefbafd..00000000
--- a/win8x86-pro-cygwin.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-pro-cygwin",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-pro-cygwin"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/cygwin.sh",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-pro-cygwin"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-pro-cygwin.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')",
-      "remote_path": "C:/Windows/Temp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /cygdrive/c/Windows/Temp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "22d680ec53336bee8a5b276a972ceba104787f62",
-    "iso_url": "iso/en_windows_8_x86_dvd_915417.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x86-pro-ssh.json b/win8x86-pro-ssh.json
deleted file mode 100644
index 9e32ac8f..00000000
--- a/win8x86-pro-ssh.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "builders": [
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-pro-ssh",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      }
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "post_shutdown_delay": "30s",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-pro-ssh"
-    },
-    {
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "ssh_password": "vagrant",
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-pro-ssh"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-pro-ssh.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-      "remote_path": "/tmp/script.bat",
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "shell"
-    },
-    {
-      "inline": [
-        "rm -f /tmp/script.bat"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "22d680ec53336bee8a5b276a972ceba104787f62",
-    "iso_url": "iso/en_windows_8_x86_dvd_915417.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
-
diff --git a/win8x86-pro.json b/win8x86-pro.json
deleted file mode 100644
index 65b1fc56..00000000
--- a/win8x86-pro.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "builders": [
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "windows8",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "tools_upload_flavor": "windows",
-      "type": "vmware-iso",
-      "vm_name": "win8x86-pro",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "2048",
-        "numvcpus": "2"
-      },
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_additions_mode": "attach",
-      "guest_os_type": "Windows8",
-      "hard_drive_interface": "sata",
-      "headless": "{{ user `headless` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "vm_name": "win8x86-pro",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    },
-    {
-      "communicator": "winrm",
-      "disk_size": "{{user `disk_size`}}",
-      "floppy_files": [
-        "floppy/00-run-all-scripts.cmd",
-        "floppy/01-install-wget.cmd",
-        "floppy/_download.cmd",
-        "floppy/_packer_config.cmd",
-        "floppy/fixnetwork.ps1",
-        "floppy/install-winrm.cmd",
-        "floppy/passwordchange.bat",
-        "floppy/powerconfig.bat",
-        "floppy/win8x86-pro/Autounattend.xml",
-        "floppy/zz-start-transports.cmd"
-      ],
-      "guest_os_type": "win-8",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{ user `iso_url` }}",
-      "parallels_tools_flavor": "win",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "2048"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "type": "parallels-iso",
-      "vm_name": "win8x86-pro",
-      "winrm_password": "vagrant",
-      "winrm_timeout": "10000s",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "compression_level": 1,
-      "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-pro.tpl"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "CM={{user `cm`}}",
-        "CM_VERSION={{user `cm_version`}}",
-        "UPDATE={{user `update`}}"
-      ],
-      "scripts": [
-        "script/vagrant.bat",
-        "script/cmtool.bat",
-        "script/vmtool.bat",
-        "script/clean.bat",
-        "script/ultradefrag.bat",
-        "script/uninstall-7zip.bat",
-        "script/sdelete.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "cm": "chef",
-    "cm_version": "",
-    "disk_size": "40960",
-    "headless": "false",
-    "iso_checksum": "22d680ec53336bee8a5b276a972ceba104787f62",
-    "iso_url": "iso/en_windows_8_x86_dvd_915417.iso",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "update": "true",
-    "version": "0.1.0"
-  }
-}
diff --git a/wip/win2008r2-standardcore-cygwin.json b/wip/win2008r2-standardcore-cygwin.json
index 5408a439..dfc4bb5f 100644
--- a/wip/win2008r2-standardcore-cygwin.json
+++ b/wip/win2008r2-standardcore-cygwin.json
@@ -1,79 +1,78 @@
 {
   "variables": {
+    "cpus": "1",
+    "memory": "768",
+    "disk_size": "40960",
+    "guest_additions_url": "",
     "version": "0.1.0",
     "cm": "chef",
     "cm_version": "",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
     "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
-    "update": true
+    "update": "true"
   },
   "builders": [
     {
-      "vm_name": "win2008r2-standardcore-cygwin",
       "type": "vmware-iso",
-      "guest_os_type": "windows7srv-64",
       "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "floppy_files": [
         "floppy/win2008r2-standardcore/Autounattend.xml",
+        ".windows/provisions/wget.exe",
         "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
+        "floppy/01-install-powershell.cmd",
         "floppy/01-install-wget.cmd",
         "floppy/_download.cmd",
         "floppy/_packer_config.cmd",
+        "floppy/cygwin.bat",
         "floppy/cygwin.sh",
+        "floppy/install-winrm.cmd",
         "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
+        "floppy/powerconfig.bat",
         "floppy/zz-start-transports.cmd"
-        "floppy/01-install-powershell.cmd",
-        ".windows/provisions/wget.exe"
       ],
-      "tools_upload_flavor": "windows",
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-      "disk_size": "40960",
-      "vmx_data": {
-        "memsize": "768",
-        "numvcpus": "1",
-        "cpuid.coresPerSocket": "1"
-      }
+      "guest_os_type": "windows7srv-64",
+      "tools_upload_flavor": "windows",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{ user `disk_size` }}",
+      "vm_name": "win2008r2-standardcore-cygwin",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "vm_name": "win2008r2-standardcore-cygwin",
       "type": "virtualbox-iso",
-      "guest_os_type": "Windows2008_64",
       "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "disk_size": "40960",
       "floppy_files": [
         "floppy/win2008r2-standardcore/Autounattend.xml",
+        ".windows/provisions/wget.exe",
         "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
+        "floppy/01-install-powershell.cmd",
         "floppy/01-install-wget.cmd",
         "floppy/_download.cmd",
         "floppy/_packer_config.cmd",
+        "floppy/cygwin.bat",
         "floppy/cygwin.sh",
+        "floppy/install-winrm.cmd",
         "floppy/passwordchange.bat",
-        "floppy/cygwin.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/01-install-powershell.cmd",
-        ".windows/provisions/wget.exe"
+        "floppy/powerconfig.bat",
+        "floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-      "vboxmanage": [
-        ["modifyvm", "{{.Name}}", "--memory", "768"],
-        ["modifyvm", "{{.Name}}", "--cpus", "1"]
-      ]
+      "guest_os_type": "Windows2008_64",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{ user `disk_size` }}",
+      "vm_name": "win2008r2-standardcore-cygwin",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "provisioners": [
@@ -98,14 +97,18 @@
     },
     {
       "type": "shell",
-      "inline": ["rm -f /tmp/script.bat"]
+      "inline": [
+        "rm -f /tmp/script.bat"
+      ]
     }
   ],
-  "post-processors": [{
-    "type": "vagrant",
-    "keep_input_artifact": false,
-    "compression_level": 1,
-    "vagrantfile_template": "tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl",
-    "output": "box/{{.Provider}}/win2008r2-standardcore-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
-  }]
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "compression_level": 1,
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standardcore-cygwin.tpl",
+      "output": "box/{{.Provider}}/win2008r2-standardcore-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
+    }
+  ]
 }
diff --git a/wip/win2008r2-standardcore.json b/wip/win2008r2-standardcore.json
index f33294a6..8963d304 100644
--- a/wip/win2008r2-standardcore.json
+++ b/wip/win2008r2-standardcore.json
@@ -1,77 +1,76 @@
 {
   "variables": {
+    "cpus": "1",
+    "memory": "768",
+    "disk_size": "40960",
+    "guest_additions_url": "",
     "version": "0.1.0",
     "cm": "chef",
     "cm_version": "",
     "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso",
     "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57",
-    "update": true
+    "update": "true"
   },
   "builders": [
     {
-      "vm_name": "win2008r2-standardcore",
       "type": "vmware-iso",
-      "guest_os_type": "windows7srv-64",
       "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "floppy_files": [
         "floppy/win2008r2-standardcore/Autounattend.xml",
+        ".windows/provisions/wget.exe",
         "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
+        "floppy/01-install-powershell.cmd",
         "floppy/01-install-wget.cmd",
         "floppy/_download.cmd",
         "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
+        "floppy/install-winrm.cmd",
         "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/01-install-powershell.cmd",
-        ".windows/provisions/wget.exe"
+        "floppy/passwordchange.bat",
+        "floppy/powerconfig.bat",
+        "floppy/zz-start-transports.cmd"
       ],
-      "tools_upload_flavor": "windows",
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-      "disk_size": "40960",
-      "vmx_data": {
-        "memsize": "768",
-        "numvcpus": "1",
-        "cpuid.coresPerSocket": "1"
-      }
+      "guest_os_type": "windows7srv-64",
+      "tools_upload_flavor": "windows",
+      "cpus": "{{ user `cpus` }}",
+      "cores": 1,
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{ user `disk_size` }}",
+      "vm_name": "win2008r2-standardcore",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     },
     {
-      "vm_name": "win2008r2-standardcore",
       "type": "virtualbox-iso",
-      "guest_os_type": "Windows2008_64",
       "iso_url": "{{ user `iso_url` }}",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
       "floppy_files": [
         "floppy/win2008r2-standardcore/Autounattend.xml",
+        ".windows/provisions/wget.exe",
         "floppy/00-run-all-scripts.cmd",
-        "floppy/install-winrm.cmd",
-        "floppy/powerconfig.bat",
+        "floppy/01-install-powershell.cmd",
         "floppy/01-install-wget.cmd",
         "floppy/_download.cmd",
         "floppy/_packer_config.cmd",
-        "floppy/passwordchange.bat",
+        "floppy/install-winrm.cmd",
         "floppy/openssh.bat",
-        "floppy/zz-start-transports.cmd",
-        "floppy/oracle-cert.cer",
-        "floppy/01-install-powershell.cmd",
-        ".windows/provisions/wget.exe"
+        "floppy/passwordchange.bat",
+        "floppy/powerconfig.bat",
+        "floppy/zz-start-transports.cmd"
       ],
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
-      "disk_size": "40960",
-      "vboxmanage": [
-        ["modifyvm", "{{.Name}}", "--memory", "768"],
-        ["modifyvm", "{{.Name}}", "--cpus", "1"]
-      ]
+      "guest_os_type": "Windows2008_64",
+      "cpus": "{{ user `cpus` }}",
+      "memory": "{{ user `memory` }}",
+      "disk_size": "{{ user `disk_size` }}",
+      "vm_name": "win2008r2-standardcore",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_timeout": "10000s"
     }
   ],
   "provisioners": [
@@ -96,14 +95,18 @@
     },
     {
       "type": "shell",
-      "inline": ["rm -f /tmp/script.bat"]
+      "inline": [
+        "rm -f /tmp/script.bat"
+      ]
     }
   ],
-  "post-processors": [{
-    "type": "vagrant",
-    "keep_input_artifact": false,
-    "compression_level": 1,
-    "vagrantfile_template": "tpl/vagrantfile-win2008r2-standardcore.tpl",
-    "output": "box/{{.Provider}}/win2008r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
-  }]
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "compression_level": 1,
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standardcore.tpl",
+      "output": "box/{{.Provider}}/win2008r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
+    }
+  ]
 }
diff --git a/wsim/win8/x64/install_Windows 8 Enterprise.clg b/wsim/win8/x64/install_Windows 8 Enterprise.clg
deleted file mode 100644
index bfc04cd7..00000000
Binary files a/wsim/win8/x64/install_Windows 8 Enterprise.clg and /dev/null differ
diff --git a/wsim/win8/x64/install_Windows 8 Pro.clg b/wsim/win8/x64/install_Windows 8 Pro.clg
deleted file mode 100644
index 2de6e023..00000000
Binary files a/wsim/win8/x64/install_Windows 8 Pro.clg and /dev/null differ
diff --git a/wsim/win8/x86/install_Windows 8 Enterprise.clg b/wsim/win8/x86/install_Windows 8 Enterprise.clg
deleted file mode 100644
index a6cdb7a2..00000000
Binary files a/wsim/win8/x86/install_Windows 8 Enterprise.clg and /dev/null differ
diff --git a/wsim/win8/x86/install_Windows 8 Pro.clg b/wsim/win8/x86/install_Windows 8 Pro.clg
deleted file mode 100644
index 73860685..00000000
Binary files a/wsim/win8/x86/install_Windows 8 Pro.clg and /dev/null differ
diff --git a/wsim/win8/x86/install_Windows 8.clg b/wsim/win8/x86/install_Windows 8.clg
deleted file mode 100644
index 8cb1f7df..00000000
Binary files a/wsim/win8/x86/install_Windows 8.clg and /dev/null differ