diff --git a/centos-7/template.json b/centos-7/template.json
index 47cf5de..829405f 100644
--- a/centos-7/template.json
+++ b/centos-7/template.json
@@ -49,6 +49,17 @@
       "type": "vagrant",
       "keep_input_artifact": true,
       "output": "images/{{ user `distro` }}-{{.Provider}}-{{ timestamp }}.box"
+    },
+    {
+      "type": "docker-tag",
+      "repository": "cloudlab/centos",
+      "tag": "7",
+      "only": ["docker"]
+    },
+    {
+      "type": "docker-save",
+      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "only": ["docker"]
     }
   ],
   "builders": [
@@ -59,6 +70,7 @@
       ],
       "boot_wait": "10s",
       "disk_size": 5020,
+      "output_directory": "images/{{ user `distro` }}-vbox-{{ timestamp  }}",
       "guest_os_type": "RedHat_64",
       "http_directory": "http",
       "iso_checksum": "88c0437f0a14c6e2c94426df9d43cd67",
@@ -79,7 +91,7 @@
     {
       "type": "qemu",
       "vm_name": "{{ user `distro` }}-{{ timestamp  }}",
-      "output_directory": "images/{{ user `distro` }}-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-qemu-{{ timestamp  }}",
       "format": "qcow2",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
@@ -98,12 +110,18 @@
      ]
     },
     {
+      "type": "docker",
+      "image": "centos:7",
+      "commit": true
+    },
+    {
       "type": "vmware-iso",
       "boot_command": [
         "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 40520,
+      "output_directory": "images/{{ user `distro` }}-vmware-{{ timestamp  }}",
       "guest_os_type": "centos-64",
       "http_directory": "http",
       "iso_checksum": "154ba47b7a37e52e0100310c3aeb8f9d9daf4806",