diff --git a/windows_2016.json b/windows_2016.json
index 6fe831b885f4e513931a6af98f0a6f3886ada4f8..1e5636d0a27c6fb14cf474ed2906ef4deba4813f 100644
--- a/windows_2016.json
+++ b/windows_2016.json
@@ -112,10 +112,26 @@
   ],
   "post-processors": [
     {
-      "keep_input_artifact": false,
+      "keep_input_artifact": true,
       "output": "windows_2016_{{.Provider}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "vagrantfile-windows_2016.template"
+      "vagrantfile_template": "vagrantfile-windows_2016.template",
+      "only": ["virtualbox-iso"]
+    },
+    {
+        "keep_input_artifact": true,
+        "type" : "vsphere",
+        "cluster" : "{{user `vsphere_cluster`}}",
+        "datacenter" : "{{user `vsphere_datacenter`}}",
+        "datastore" : "{{user `vsphere_datastore`}}",
+        "host" : "{{user `vsphere_host`}}",
+        "password" : "{{user `vsphere_password`}}",
+        "username" : "{{user `vsphere_username`}}",
+        "vm_name" : "{{user `vsphere_vm_name`}}",
+        "vm_network" : "{{user `vsphere_vm_network`}}",
+        "insecure" : "{{user `vsphere_insecure`}}",
+        "disk_mode" : "{{user `vsphere_disk_mode`}}",
+        "only": ["vmware-iso"]
     }
   ],
   "provisioners": [
@@ -153,14 +169,14 @@
   "variables": {
     "autounattend": "./answer_files/2016/Autounattend.xml",
     "disk_size": "61440",
-    "disk_type_id": "1",
-    "headless": "true",
+    "disk_type_id": "0",
+    "headless": "false",
     "hyperv_switchname": "{{env `hyperv_switchname`}}",
     "iso_checksum": "70721288BBCDFE3239D8F8C0FAE55F1F",
     "iso_checksum_type": "md5",
     "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",
-    "restart_timeout": "5m",
-    "winrm_timeout": "22h"
+    "restart_timeout": "15m",
+    "winrm_timeout": "6h"
   }
 }