diff --git a/templates/bionic64.json b/templates/bionic64.json
index 8b5b9cd..a708f04 100644
--- a/templates/bionic64.json
+++ b/templates/bionic64.json
@@ -130,12 +130,18 @@
         ],
         "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
     }],
-    "post-processors": [{
+    "post-processors": [[{
         "type": "vagrant",
         "keep_input_artifact": false,
         "output": "build/{{user `box_name`}}.box",
         "compression_level": 6,
         "include": "{{user `metadata`}}",
         "vagrantfile_template": "{{user `vagrantfile`}}"
-    }]
-}
\ No newline at end of file
+    },
+    {
+        "type":"vagrant-cloud",
+        "access_token":"{{user `account_key`}}",
+        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
+        "version":"{{user `box_version`}}"
+    }]]
+}
diff --git a/templates/focal64.json b/templates/focal64.json
index c5dc40b..c13f17d 100644
--- a/templates/focal64.json
+++ b/templates/focal64.json
@@ -129,12 +129,18 @@
         ],
         "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
     }],
-    "post-processors": [{
+    "post-processors": [[{
         "type": "vagrant",
         "keep_input_artifact": false,
         "output": "build/{{user `box_name`}}.box",
         "compression_level": 6,
         "include": "{{user `metadata`}}",
         "vagrantfile_template": "{{user `vagrantfile`}}"
-    }]
-}
\ No newline at end of file
+    },
+    {
+        "type":"vagrant-cloud",
+        "access_token":"{{user `account_key`}}",
+        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
+        "version":"{{user `box_version`}}"
+    }]]
+}
diff --git a/templates/kali-cloud.json b/templates/kali-cloud.json
deleted file mode 100644
index 96448d1..0000000
--- a/templates/kali-cloud.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "variables": {
-        "box_name" : "vagrant-kali-rolling-amd64",
-        "box_desc" : "Kali Rolling x64 Desktop",
-        "disk_size": "40960",
-        "root_username": "vagrant",
-        "root_password": "vagrant"
-    },
-    "description": "{{user `box_desc`}}",
-    "builders":[{
-        "type": "vmware-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vmx_data": {
-            "memsize": 2048,
-            "numvcpus": 2,
-            "usb.present": "True",
-            "usb.pcislotnumber": "34"
-        },
-        "ssh_username": "{{user `root_username`}}",
-        "ssh_password": "{{user `root_password`}}",
-        "ssh_timeout": "1000000s",
-        "http_directory": "include/preseed",
-        "boot_command": [
-            "<esc><wait5>",
-            "install",
-            " auto",
-            " url=http://{{ .HTTPIP}}:{{ .HTTPPort }}/kali-preseed.cfg",
-            " debian-installer=en_US",
-            " locale=en_US",
-            " keymap=us",
-            " hostname={{user `box_name`}}",
-            " domain=",
-            "<enter>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    },{
-        "type": "virtualbox-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vboxmanage": [
-            ["modifyvm", "{{user `box_name`}}", "--memory", "2048"],
-            ["modifyvm", "{{user `box_name`}}", "--cpus", "2"],
-            ["modifyvm", "{{user `box_name`}}", "--draganddrop", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--clipboard", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--usb", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbehci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbxhci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--audio", "none"]
-        ],
-        "ssh_username": "{{user `root_username`}}",
-        "ssh_password": "{{user `root_password`}}",
-        "ssh_timeout": "1000000s",
-        "guest_os_type": "Debian_64",
-        "http_directory": "include/preseed",
-        "boot_command": [
-            "<esc><wait5>",
-            "install",
-            " auto",
-            " url=http://{{ .HTTPIP}}:{{ .HTTPPort }}/kali-preseed.cfg",
-            " debian-installer=en_US",
-            " locale=en_US",
-            " keymap=us",
-            " hostname={{user `box_name`}}",
-            " domain=",
-            "<enter>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    }],
-    "provisioners": [{
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt_reboot.sh"
-        ],
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt.sh",
-            "scripts/common/linux/vagrant.sh"
-        ],
-        "pause_before": "3m",
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["vmware-iso"],
-        "scripts": [
-            "scripts/common/linux/vmtools.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["virtualbox-iso"],
-        "scripts": [
-            "scripts/common/linux/vbguest.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/cleanup.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    }],
-    "post-processors": [[{
-        "type": "vagrant",
-        "keep_input_artifact": false,
-        "output": "build/{{user `box_name`}}.box",
-        "compression_level": 6,
-        "include": "{{user `metadata`}}",
-        "vagrantfile_template": "{{user `vagrantfile`}}"
-    },
-    {
-        "type":"vagrant-cloud",
-        "access_token":"{{user `account_key`}}",
-        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
-        "version":"{{user `box_version`}}"
-    }]]
-}
\ No newline at end of file
diff --git a/templates/kali.json b/templates/kali.json
index 173c7b2..b147233 100644
--- a/templates/kali.json
+++ b/templates/kali.json
@@ -112,12 +112,18 @@
         ],
         "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
     }],
-    "post-processors": [{
+    "post-processors": [[{
         "type": "vagrant",
         "keep_input_artifact": false,
         "output": "build/{{user `box_name`}}.box",
         "compression_level": 6,
         "include": "{{user `metadata`}}",
         "vagrantfile_template": "{{user `vagrantfile`}}"
-    }]
-}
\ No newline at end of file
+    },
+    {
+        "type":"vagrant-cloud",
+        "access_token":"{{user `account_key`}}",
+        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
+        "version":"{{user `box_version`}}"
+    }]]
+}
diff --git a/templates/trusty64-cloud.json b/templates/trusty64-cloud.json
deleted file mode 100644
index 9fb7717..0000000
--- a/templates/trusty64-cloud.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "variables": {
-        "box_name" : "vagrant-trusty64",
-        "box_desc" : "Ubuntu 14.04.05 LTS GNOME Desktop AMD64",
-        "disk_size": "40960",
-        "root_username": "vagrant",
-        "root_password": "vagrant"
-    },
-    "description": "{{user `box_desc`}}",
-    "_comment": "A server iso is used to allow for an unattended install",
-    "builders":[{
-        "type": "vmware-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vmx_data": {
-            "memsize": 2048,
-            "numvcpus": 2,
-            "usb.present": "True",
-            "usb.pcislotnumber": "34"
-        },
-        "ssh_username": "{{user `root_username`}}",
-        "ssh_password": "{{user `root_password`}}",
-        "ssh_timeout": "1000000s",
-        "http_directory": "include/preseed",
-        "boot_wait": "30s",
-        "boot_command": [
-            "<esc><esc><enter><wait>",
-            "/install/vmlinuz noapic preseed/url=http://{{ .HTTPIP}}:{{ .HTTPPort }}/trusty-preseed.cfg <wait>",
-            "debian-installer=en_US auto locale=en_US kbd-chooser/method=us <wait>",
-            "hostname={{user `box_name`}} <wait>",
-            "fb=false debconf/frontend=noninteractive <wait>",
-            "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=us keyboard-configuration/variant=us console-setup/ask_detect=false <wait>",
-            "initrd=/install/initrd.gz -- <enter><wait>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    },{
-        "type": "virtualbox-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vboxmanage": [
-            ["modifyvm", "{{user `box_name`}}", "--memory", "2048"],
-            ["modifyvm", "{{user `box_name`}}", "--cpus", "2"],
-            ["modifyvm", "{{user `box_name`}}", "--draganddrop", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--clipboard", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--usb", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbehci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbxhci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--audio", "none"]
-        ],
-        "ssh_username": "{{user `root_username`}}",
-        "ssh_password": "{{user `root_password`}}",
-        "ssh_timeout": "1000000s",
-        "guest_os_type": "Debian_64",
-        "http_directory": "include/preseed",
-        "boot_wait": "30s",
-        "boot_command": [
-            "<esc><esc><enter><wait>",
-            "/install/vmlinuz noapic preseed/url=http://{{ .HTTPIP}}:{{ .HTTPPort }}/trusty-preseed.cfg <wait>",
-            "debian-installer=en_US auto locale=en_US kbd-chooser/method=us <wait>",
-            "hostname={{user `box_name`}} <wait>",
-            "fb=false debconf/frontend=noninteractive <wait>",
-            "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=us keyboard-configuration/variant=us console-setup/ask_detect=false <wait>",
-            "initrd=/install/initrd.gz -- <enter><wait>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    }],
-    "provisioners": [{
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt_reboot.sh"
-        ],
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt.sh",
-            "scripts/common/linux/vagrant.sh"
-        ],
-        "pause_before": "3m",
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["vmware-iso"],
-        "scripts": [
-            "scripts/common/linux/vmtools.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["virtualbox-iso"],
-        "scripts": [
-            "scripts/common/linux/vbguest.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/cleanup.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    }],
-    "post-processors": [[{
-        "type": "vagrant",
-        "keep_input_artifact": false,
-        "output": "build/{{user `box_name`}}.box",
-        "compression_level": 6,
-        "include": "{{user `metadata`}}",
-        "vagrantfile_template": "{{user `vagrantfile`}}"
-    },
-    {
-        "type":"vagrant-cloud",
-        "version":"{{user `box_desc`}}",
-        "access_token":"{{user `account_key`}}",
-        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
-        "version":"{{user `box_version`}}"
-    }]]
-}
\ No newline at end of file
diff --git a/templates/trusty64.json b/templates/trusty64.json
index a3f94ac..2c34f67 100644
--- a/templates/trusty64.json
+++ b/templates/trusty64.json
@@ -1,6 +1,6 @@
 {
     "variables": {
-        "box_name" : "vagrant-trusty64",
+        "box_name" : "vagrant-trusty64-test",
         "box_desc" : "Ubuntu 14.04.05 LTS Desktop AMD64",
         "disk_size": "40960",
         "root_username": "vagrant",
@@ -107,12 +107,18 @@
         ],
         "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
     }],
-    "post-processors": [{
+    "post-processors": [[{
         "type": "vagrant",
         "keep_input_artifact": false,
         "output": "build/{{user `box_name`}}.box",
         "compression_level": 6,
         "include": "{{user `metadata`}}",
         "vagrantfile_template": "{{user `vagrantfile`}}"
-    }]
-}
\ No newline at end of file
+    },
+    {
+        "type":"vagrant-cloud",
+        "access_token":"{{user `account_key`}}",
+        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
+        "version":"{{user `box_version`}}"
+    }]]
+}
diff --git a/templates/xenial64-cloud.json b/templates/xenial64-cloud.json
deleted file mode 100644
index c95d8ea..0000000
--- a/templates/xenial64-cloud.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "variables": {
-        "box_name" : "vagrant-xenial64",
-        "box_desc" : "Ubuntu 16.04 GNOME Desktop AMD64",
-        "disk_size": "40960",
-        "username": "vagrant",
-        "password": "vagrant"
-    },
-    "description": "{{user `box_desc`}}",
-    "_comment": "A server iso is used to allow for an unattended install",
-    "builders":[{
-        "type": "vmware-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vmx_data": {
-            "memsize": 2048,
-            "numvcpus": 2
-        },
-        "ssh_username": "{{user `username`}}",
-        "ssh_password": "{{user `password`}}",
-        "ssh_timeout": "1000000s",
-        "http_directory": "include/preseed",
-        "boot_command": [
-            "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "/install/vmlinuz<wait>",
-            " auto<wait>",
-            " console-setup/ask_detect=false<wait>",
-            " console-setup/layoutcode=us<wait>",
-            " console-setup/modelcode=pc105<wait>",
-            " debconf/frontend=noninteractive<wait>",
-            " debian-installer=en_US<wait>",
-            " fb=false<wait>",
-            " initrd=/install/initrd.gz<wait>",
-            " kbd-chooser/method=us<wait>",
-            " keyboard-configuration/layout=USA<wait>",
-            " keyboard-configuration/variant=USA<wait>",
-            " locale=en_US<wait>",
-            " netcfg/get_hostname={{user `box_name`}}<wait>",
-            " grub-installer/bootdev=/dev/sda<wait>",
-            " noapic<wait>",
-            " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/xenial-preseed.cfg<wait>",
-            " -- <wait>",
-            "<enter><wait>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    },{
-        "type": "virtualbox-iso",
-        "iso_url": "{{user `iso_url`}}",
-        "iso_checksum": "{{user `iso_checksum`}}",
-        "vm_name": "{{user `box_name`}}",
-        "vboxmanage": [
-            ["modifyvm", "{{user `box_name`}}", "--memory", "2048"],
-            ["modifyvm", "{{user `box_name`}}", "--cpus", "2"],
-            ["modifyvm", "{{user `box_name`}}", "--draganddrop", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--clipboard", "bidirectional"],
-            ["modifyvm", "{{user `box_name`}}", "--usb", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbehci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--usbxhci", "on"],
-            ["modifyvm", "{{user `box_name`}}", "--audio", "none"]
-        ],
-        "ssh_username": "{{user `username`}}",
-        "ssh_password": "{{user `password`}}",
-        "ssh_timeout": "1000000s",
-        "guest_os_type": "Debian_64",
-        "http_directory": "include/preseed",
-        "boot_wait": "30s",
-        "boot_command": [
-            "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
-            "/install/vmlinuz<wait>",
-            " auto<wait>",
-            " console-setup/ask_detect=false<wait>",
-            " console-setup/layoutcode=us<wait>",
-            " console-setup/modelcode=pc105<wait>",
-            " debconf/frontend=noninteractive<wait>",
-            " debian-installer=en_US<wait>",
-            " fb=false<wait>",
-            " initrd=/install/initrd.gz<wait>",
-            " kbd-chooser/method=us<wait>",
-            " keyboard-configuration/layout=USA<wait>",
-            " keyboard-configuration/variant=USA<wait>",
-            " locale=en_US<wait>",
-            " netcfg/get_hostname={{user `box_name`}}<wait>",
-            " grub-installer/bootdev=/dev/sda<wait>",
-            " noapic<wait>",
-            " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/xenial-preseed.cfg<wait>",
-            " -- <wait>",
-            "<enter><wait>"
-        ],
-        "shutdown_command": "echo {{user `root_password`}} | sudo -S shutdown -P now"
-    }],
-    "provisioners": [{
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt_reboot.sh"
-        ],
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/apt.sh",
-            "scripts/common/linux/vagrant.sh"
-        ],
-        "pause_before": "3m",
-        "expect_disconnect": true,
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["vmware-iso"],
-        "scripts": [
-            "scripts/common/linux/vmtools.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "only": ["virtualbox-iso"],
-        "scripts": [
-            "scripts/common/linux/vbguest.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    },
-    {
-        "type": "shell",
-        "scripts": [
-            "scripts/common/linux/cleanup.sh"
-        ],
-        "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
-    }],
-    "post-processors": [[{
-        "type": "vagrant",
-        "keep_input_artifact": false,
-        "output": "build/{{user `box_name`}}.box",
-        "compression_level": 6,
-        "include": "{{user `metadata`}}",
-        "vagrantfile_template": "{{user `vagrantfile`}}"
-    },
-    {
-        "type":"vagrant-cloud",
-        "version":"{{user `box_desc`}}",
-        "access_token":"{{user `account_key`}}",
-        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
-        "version":"{{user `box_version`}}"
-    }]]
-}
\ No newline at end of file
diff --git a/templates/xenial64.json b/templates/xenial64.json
index 7261818..ca77d48 100644
--- a/templates/xenial64.json
+++ b/templates/xenial64.json
@@ -137,12 +137,18 @@
         ],
         "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'"
     }],
-    "post-processors": [{
+    "post-processors": [[{
         "type": "vagrant",
         "keep_input_artifact": false,
         "output": "build/{{user `box_name`}}.box",
         "compression_level": 6,
         "include": "{{user `metadata`}}",
         "vagrantfile_template": "{{user `vagrantfile`}}"
-    }]
-}
\ No newline at end of file
+    },
+    {
+        "type":"vagrant-cloud",
+        "access_token":"{{user `account_key`}}",
+        "box_tag":"{{user `account_name`}}/{{user `box_name`}}",
+        "version":"{{user `box_version`}}"
+    }]]
+}