diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97c4976..3514584a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
+## v1.19 (May 17th, 2014)
+
+* Enable Microsoft Updates by default (#60)
+* Remove disable Windows Updates script from Windows 7 and 8.1; you can run this as a provioner step, and use Autounattend sections to achieve the same outcome
+
 ## v1.18 (May 16th, 2014)
+
 * Require Vagrant 1.6.2 (#57)
 * Remove WinRM port forward, as it's done automatically in Vagrant 1.6.2+ (#57)
 * Update chef-client source to getchef.com (#63)
diff --git a/answer_files/2008_r2/Autounattend.xml b/answer_files/2008_r2/Autounattend.xml
index 07a1954d..efef41ea 100644
--- a/answer_files/2008_r2/Autounattend.xml
+++ b/answer_files/2008_r2/Autounattend.xml
@@ -237,6 +237,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
                     <Description>Install OpenSSH</Description>
diff --git a/answer_files/2008_r2_core/Autounattend.xml b/answer_files/2008_r2_core/Autounattend.xml
index f764f892..f77ec70c 100644
--- a/answer_files/2008_r2_core/Autounattend.xml
+++ b/answer_files/2008_r2_core/Autounattend.xml
@@ -273,6 +273,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
                     <Description>Install OpenSSH</Description>
diff --git a/answer_files/2012/Autounattend.xml b/answer_files/2012/Autounattend.xml
index 8f27faf5..660b485e 100644
--- a/answer_files/2012/Autounattend.xml
+++ b/answer_files/2012/Autounattend.xml
@@ -242,6 +242,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
                     <Description>Install OpenSSH</Description>
diff --git a/answer_files/2012_r2/Autounattend.xml b/answer_files/2012_r2/Autounattend.xml
index 55955a9c..e82a3017 100644
--- a/answer_files/2012_r2/Autounattend.xml
+++ b/answer_files/2012_r2/Autounattend.xml
@@ -239,6 +239,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
                     <Description>Install OpenSSH</Description>
diff --git a/answer_files/2012_r2_core/Autounattend.xml b/answer_files/2012_r2_core/Autounattend.xml
index df30664c..74924543 100644
--- a/answer_files/2012_r2_core/Autounattend.xml
+++ b/answer_files/2012_r2_core/Autounattend.xml
@@ -239,6 +239,11 @@
                 -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
+                    <Order>98</Order>
+                    <Description>Enable Microsoft Updates</Description>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
                     <Description>Install OpenSSH</Description>
diff --git a/answer_files/7/Autounattend.xml b/answer_files/7/Autounattend.xml
index e281d5f9..1b179610 100644
--- a/answer_files/7/Autounattend.xml
+++ b/answer_files/7/Autounattend.xml
@@ -239,10 +239,9 @@
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
                 <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\dis-updates.ps1</CommandLine>
-                    <Description>Disable Windows Updates</Description>
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>98</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
+                    <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
diff --git a/answer_files/81/Autounattend.xml b/answer_files/81/Autounattend.xml
index 5a35f096..a511c16d 100644
--- a/answer_files/81/Autounattend.xml
+++ b/answer_files/81/Autounattend.xml
@@ -236,10 +236,9 @@
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
                 <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\dis-updates.ps1</CommandLine>
-                    <Description>Disable Windows Updates</Description>
+                    <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>98</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
+                    <Description>Enable Microsoft Updates</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1</CommandLine>
diff --git a/scripts/microsoft-updates.bat b/scripts/microsoft-updates.bat
new file mode 100644
index 00000000..2cb8fa02
--- /dev/null
+++ b/scripts/microsoft-updates.bat
@@ -0,0 +1,12 @@
+net stop wuauserv
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v EnableFeaturedSoftware /t REG_DWORD /d 1 /f
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v IncludeRecommendedUpdates /t REG_DWORD /d 1 /f
+
+echo Set ServiceManager = CreateObject("Microsoft.Update.ServiceManager") > A:\temp.vbs
+echo Set NewUpdateService = ServiceManager.AddService2("7971f918-a847-4430-9279-4a52d1efe18d",7,"") >> A:\temp.vbs
+
+cscript A:\temp.vbs
+
+net start wuauserv
\ No newline at end of file
diff --git a/windows_2008_r2.json b/windows_2008_r2.json
index 5478d54d..e61ce40a 100644
--- a/windows_2008_r2.json
+++ b/windows_2008_r2.json
@@ -1,81 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "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_type": "md5",
-            "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows7srv-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/2008_r2/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "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_type": "md5",
-            "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2008_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2008_r2/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2008_r2_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "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_type": "md5",
+      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows7srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/2008_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "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_type": "md5",
+      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2008_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2008_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2008_r2_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
+    }
+  ]
 }
diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
index 8f959e05..b842e9ed 100644
--- a/windows_2008_r2_core.json
+++ b/windows_2008_r2_core.json
@@ -1,57 +1,73 @@
 {
-  "builders": [{
-    "type": "vmware-iso",
-    "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_type": "md5",
-    "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-    "headless": true,
-    "boot_wait": "2m",
-    "ssh_username": "vagrant",
-    "ssh_password": "vagrant",
-    "ssh_wait_timeout": "2h",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "guest_os_type": "windows7srv-64",
-	"tools_upload_flavor": "windows",
-    "disk_size": 61440,
-    "vnc_port_min": 5900,
-    "vnc_port_max": 5980,
-    "floppy_files": [
-      "./answer_files/2008_r2_core/Autounattend.xml",
-      "./scripts/win-updates.ps1",
-      "./scripts/openssh.ps1"
-    ],
-    "vmx_data": {
-      "RemoteDisplay.vnc.enabled": "false",
-      "RemoteDisplay.vnc.port": "5900",
-      "memsize": "2048",
-      "numvcpus": "2",
-	  "scsi0.virtualDev": "lsisas1068"
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "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_type": "md5",
+      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows7srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/2008_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "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_type": "md5",
+      "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2008_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2008_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
     }
-  }, {
-    "type": "virtualbox-iso",
-    "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_type": "md5",
-    "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
-    "headless": true,
-    "boot_wait": "2m",
-    "ssh_username": "vagrant",
-    "ssh_password": "vagrant",
-    "ssh_wait_timeout": "2h",
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-    "guest_os_type": "Windows2008_64",
-    "disk_size": 61440,
-    "floppy_files": [
-      "./answer_files/2008_r2_core/Autounattend.xml",
-      "./scripts/win-updates.ps1",
-      "./scripts/openssh.ps1",
-      "./scripts/oracle-cert.cer"
-    ],
-    "vboxmanage": [
-      ["modifyvm", "{{.Name}}", "--memory", "2048"],
-      ["modifyvm", "{{.Name}}", "--cpus", "2"]
-    ]
-  }],
-  "provisioners": [{
+  ],
+  "provisioners": [
+    {
       "type": "shell",
       "remote_path": "/tmp/script.bat",
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
@@ -60,14 +76,21 @@
         "./scripts/chef.bat",
         "./scripts/vagrant-ssh.bat",
         "./scripts/compact.bat"
-     ]
-    }, {
-      "type": "shell", "inline": ["rm -rf /tmp/*"]
-    }],
-  "post-processors": [{
-    "type": "vagrant",
-    "keep_input_artifact": false,
-    "output": "windows_2008_r2_core_{{.Provider}}.box",
-    "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
-  }]
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2008_r2_core_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2008_r2.template"
+    }
+  ]
 }
diff --git a/windows_2012.json b/windows_2012.json
index 2ddd265d..ec718128 100644
--- a/windows_2012.json
+++ b/windows_2012.json
@@ -1,80 +1,95 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows8srv-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/2012/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows8srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/2012/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012.template"
+    }
+  ]
 }
diff --git a/windows_2012_r2.json b/windows_2012_r2.json
index 20229b98..c263a539 100644
--- a/windows_2012_r2.json
+++ b/windows_2012_r2.json
@@ -1,81 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows8srv-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/2012_r2/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012_r2/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_r2_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows8srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/2012_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012_r2/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_r2_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
+    }
+  ]
 }
diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json
index e42d6201..e0cf7dac 100644
--- a/windows_2012_r2_core.json
+++ b/windows_2012_r2_core.json
@@ -1,81 +1,96 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows8srv-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/2012_r2_core/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/2012_r2_core/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat",
-                "./scripts/compact.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_2012_r2_core_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows8srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/2012_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/2012_r2_core/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_2012_r2_core_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_2012_r2.template"
+    }
+  ]
 }
diff --git a/windows_7.json b/windows_7.json
index b64236cd..072df8ac 100644
--- a/windows_7.json
+++ b/windows_7.json
@@ -1,82 +1,95 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "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_type": "md5",
-            "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "4h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows7-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/7/Autounattend.xml",
-                "./scripts/dis-updates.ps1",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "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_type": "md5",
-            "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
-            "headless": false,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "4h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows7_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/7/Autounattend.xml",
-                "./scripts/dis-updates.ps1",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_7_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_7.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "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_type": "md5",
+      "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "4h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows7-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/7/Autounattend.xml",
+        "./scripts/dis-updates.ps1",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "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_type": "md5",
+      "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
+      "headless": false,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "4h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows7_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/7/Autounattend.xml",
+        "./scripts/dis-updates.ps1",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_7_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_7.template"
+    }
+  ]
 }
diff --git a/windows_81.json b/windows_81.json
index 8e281664..f3086f3c 100644
--- a/windows_81.json
+++ b/windows_81.json
@@ -1,80 +1,93 @@
 {
-    "builders": [
-        {
-            "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "windows8srv-64",
-            "tools_upload_flavor": "windows",
-            "disk_size": 61440,
-            "vnc_port_min": 5900,
-            "vnc_port_max": 5980,
-            "floppy_files": [
-                "./answer_files/81/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1"
-            ],
-            "vmx_data": {
-                "RemoteDisplay.vnc.enabled": "false",
-                "RemoteDisplay.vnc.port": "5900",
-                "memsize": "2048",
-                "numvcpus": "2",
-                "scsi0.virtualDev": "lsisas1068"
-            }
-        },
-        {
-            "type": "virtualbox-iso",
-            "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
-            "iso_checksum_type": "md5",
-            "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
-            "headless": true,
-            "boot_wait": "2m",
-            "ssh_username": "vagrant",
-            "ssh_password": "vagrant",
-            "ssh_wait_timeout": "2h",
-            "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-            "guest_os_type": "Windows2012_64",
-            "disk_size": 61440,
-            "floppy_files": [
-                "./answer_files/81/Autounattend.xml",
-                "./scripts/win-updates.ps1",
-                "./scripts/openssh.ps1",
-                "./scripts/oracle-cert.cer"
-            ],
-            "vboxmanage": [
-                ["modifyvm", "{{.Name}}", "--memory", "2048"],
-                ["modifyvm", "{{.Name}}", "--cpus", "2"]
-            ]
-        }
-    ],
-    "provisioners": [
-        {
-            "type": "shell",
-            "remote_path": "/tmp/script.bat",
-            "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
-            "scripts": [
-                "./scripts/vm-guest-tools.bat",
-                "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
-            ]
-        },
-        {
-            "type": "shell", "inline": ["rm -rf /tmp/*"]
-        }
-    ],
-    "post-processors": [
-        {
-            "type": "vagrant",
-            "keep_input_artifact": false,
-            "output": "windows_81_{{.Provider}}.box",
-            "vagrantfile_template": "vagrantfile-windows_81.template"
-        }
-    ]
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "windows8srv-64",
+      "tools_upload_flavor": "windows",
+      "disk_size": 61440,
+      "vnc_port_min": 5900,
+      "vnc_port_max": 5980,
+      "floppy_files": [
+        "./answer_files/81/Autounattend.xml",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1"
+      ],
+      "vmx_data": {
+        "RemoteDisplay.vnc.enabled": "false",
+        "RemoteDisplay.vnc.port": "5900",
+        "memsize": "2048",
+        "numvcpus": "2",
+        "scsi0.virtualDev": "lsisas1068"
+      }
+    },
+    {
+      "type": "virtualbox-iso",
+      "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
+      "iso_checksum_type": "md5",
+      "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
+      "headless": true,
+      "boot_wait": "2m",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_wait_timeout": "2h",
+      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+      "guest_os_type": "Windows2012_64",
+      "disk_size": 61440,
+      "floppy_files": [
+        "./answer_files/81/Autounattend.xml",
+        "./scripts/win-updates.ps1",
+        "./scripts/openssh.ps1",
+        "./scripts/oracle-cert.cer"
+      ],
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "2048"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "2"
+        ]
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "remote_path": "/tmp/script.bat",
+      "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "scripts": [
+        "./scripts/vm-guest-tools.bat",
+        "./scripts/chef.bat",
+        "./scripts/vagrant-ssh.bat"
+      ]
+    },
+    {
+      "type": "shell",
+      "inline": [
+        "rm -rf /tmp/*"
+      ]
+    }
+  ],
+  "post-processors": [
+    {
+      "type": "vagrant",
+      "keep_input_artifact": false,
+      "output": "windows_81_{{.Provider}}.box",
+      "vagrantfile_template": "vagrantfile-windows_81.template"
+    }
+  ]
 }