diff --git a/packer/windows_10_x86/Autounattend.xml b/packer/wintriallab-win10-32/Autounattend.xml
similarity index 100%
rename from packer/windows_10_x86/Autounattend.xml
rename to packer/wintriallab-win10-32/Autounattend.xml
diff --git a/packer/windows_10_x86/windows_10_x86.packerfile.json b/packer/wintriallab-win10-32/wintriallab-win10-32_packerfile.json
similarity index 79%
rename from packer/windows_10_x86/windows_10_x86.packerfile.json
rename to packer/wintriallab-win10-32/wintriallab-win10-32_packerfile.json
index d7fb474..40190d3 100644
--- a/packer/windows_10_x86/windows_10_x86.packerfile.json
+++ b/packer/wintriallab-win10-32/wintriallab-win10-32_packerfile.json
@@ -2,10 +2,8 @@
   "variables": {
     "caryatidpath": "",
     "output_directory": "packer-output",
-    "boxname": "wintriallab_win10_32",
+    "boxname": "wintriallab-win10-32",
     "version": "1.0.{{isotime \"20060102150405\"}}",
-    "filename": "{{user `boxname`}}_{{user `version`}}_{{.Provider}}.box",
-    "output_path": "{{user `output_directory`}}/{{user `filename`}}",
     "description": "Windows Trial Lab: Windows 10 x86",
     "caryatid_destination": ""
   },
@@ -54,12 +52,8 @@
     {
       "type": "vagrant",
       "keep_input_artifact": false,
-      "output": "{{user `output_path`}}",
-      "vagrantfile_template": "vagrantfile-windows_10_x86.template"
-    },
-    {
-      "type": "shell-local",
-      "inline": ["{{user `caryatidpath`}} {{user `boxname`}} {{user `description`}} {{user `version`}} {{.Provider}} {{user `output_path`}} file {{user `destinationdir`}}"]
+      "output": "{{user `output_directory`}}/{{user `boxname`}}_{{user `version`}}_{{.Provider}}.box",
+      "vagrantfile_template": "{{user `boxname`}}_vagrantfile.template"
     }
   ]
 }
diff --git a/packer/windows_10_x86/vagrantfile-windows_10_x86.template b/packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template
similarity index 100%
rename from packer/windows_10_x86/vagrantfile-windows_10_x86.template
rename to packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template