diff --git a/centos-7/template.json b/centos-7/template.json
index 6c0c04f..a742b68 100644
--- a/centos-7/template.json
+++ b/centos-7/template.json
@@ -61,7 +61,7 @@
     {
       "type": "vagrant",
       "keep_input_artifact": true,
-      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ timestamp }}.box",
+      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ isotime "20060102030405" }}.box",
       "except": [ "docker" ]
     },
     {
@@ -72,7 +72,7 @@
     },
     {
       "type": "docker-save",
-      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "path": "images/{{ user `distro` }}-docker-{{ isotime "20060102030405" }}.tar",
       "only": ["docker"]
     }
   ],
@@ -84,7 +84,7 @@
       ],
       "boot_wait": "10s",
       "disk_size": 5020,
-      "output_directory": "images/{{ user `distro` }}-vbox-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vbox-{{ isotime "20060102030405"  }}",
       "guest_os_type": "RedHat_64",
       "http_directory": "http",
       "iso_checksum": "88c0437f0a14c6e2c94426df9d43cd67",
@@ -107,8 +107,8 @@
       "qemuargs": [
         [ "-m", "1024M" ]
       ],
-      "vm_name": "{{ user `distro` }}-{{ timestamp  }}",
-      "output_directory": "images/{{ user `distro` }}-qemu-{{ timestamp  }}",
+      "vm_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
+      "output_directory": "images/{{ user `distro` }}-qemu-{{ isotime "20060102030405"  }}",
       "format": "qcow2",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
@@ -138,7 +138,7 @@
       ],
       "boot_wait": "10s",
       "disk_size": 40520,
-      "output_directory": "images/{{ user `distro` }}-vmware-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime "20060102030405"  }}",
       "guest_os_type": "centos-64",
       "http_directory": "http",
       "iso_checksum": "154ba47b7a37e52e0100310c3aeb8f9d9daf4806",
diff --git a/debian-8/template.json b/debian-8/template.json
index f6473f8..664f1bb 100644
--- a/debian-8/template.json
+++ b/debian-8/template.json
@@ -76,7 +76,7 @@
     {
       "type": "vagrant",
       "keep_input_artifact": true,
-      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ timestamp }}.box",
+      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ isotime "20060102030405" }}.box",
       "except": [ "digitalocean", "docker" ]
     },
     {
@@ -87,7 +87,7 @@
     },
     {
       "type": "docker-save",
-      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "path": "images/{{ user `distro` }}-docker-{{ isotime "20060102030405" }}.tar",
       "only": ["docker"]
     }
   ],
@@ -118,7 +118,7 @@
       ],
       "boot_wait": "5s",
       "disk_size": "{{ user `disk_size`}}",
-      "output_directory": "images/{{ user `distro` }}-vbox-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vbox-{{ isotime "20060102030405"  }}",
       "guest_os_type": "Debian_64",
       "http_directory": "http",
       "iso_checksum": "a9b490b4215d1e72e876b031dafa7184",
@@ -166,7 +166,7 @@
       "disk_size": "{{ user `disk_size`}}",
       "disk_type_id": 4,
       "vmdk_name": "{{ user `distro`}}",
-      "output_directory": "images/{{ user `distro` }}-vmware-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime "20060102030405"  }}",
       "guest_os_type": "linux",
       "http_directory": "http",
       "iso_checksum": "a9b490b4215d1e72e876b031dafa7184",
@@ -188,8 +188,8 @@
       "qemuargs": [
         [ "-m", "1024M" ]
       ],
-      "vm_name": "{{ user `distro` }}-{{ timestamp  }}",
-      "output_directory": "images/{{ user `distro` }}-qemu-{{ timestamp  }}",
+      "vm_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
+      "output_directory": "images/{{ user `distro` }}-qemu-{{ isotime "20060102030405"  }}",
       "format": "qcow2",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
@@ -235,7 +235,7 @@
       "type": "digitalocean",
       "api_token": "{{user `do_api_token`}}",
       "image": "{{user `distro`}}",
-      "snapshot_name": "{{ user `distro` }}-{{ timestamp  }}",
+      "snapshot_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
       "region" : "ams2",
       "size" : "1gb"
     }
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index 485a39a..a09df69 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -76,7 +76,7 @@
     {
       "type": "vagrant",
       "keep_input_artifact": true,
-      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ timestamp }}.box",
+      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ isotime "20060102030405" }}.box",
       "except": [ "digitalocean", "docker" ]
     },
     {
@@ -87,7 +87,7 @@
     },
     {
       "type": "docker-save",
-      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "path": "images/{{ user `distro` }}-docker-{{ isotime "20060102030405" }}.tar",
       "only": ["docker"]
     }
   ],
@@ -122,7 +122,7 @@
       ],
       "boot_wait": "5s",
       "disk_size": "{{ user `disk_size`}}",
-      "output_directory": "images/{{ user `distro` }}-vbox-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vbox-{{ isotime "20060102030405"  }}",
       "guest_os_type": "Ubuntu_64",
       "http_directory": "http",
       "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
@@ -174,7 +174,7 @@
       "disk_size": "{{ user `disk_size`}}",
       "disk_type_id": 4,
       "vmdk_name": "{{ user `distro`}}",
-      "output_directory": "images/{{ user `distro` }}-vmware-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime "20060102030405"  }}",
       "guest_os_type": "linux",
       "http_directory": "http",
       "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
@@ -196,8 +196,8 @@
       "qemuargs": [
         [ "-m", "1024M" ]
       ],
-      "vm_name": "{{ user `distro` }}-{{ timestamp  }}",
-      "output_directory": "images/{{ user `distro` }}-qemu-{{ timestamp  }}",
+      "vm_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
+      "output_directory": "images/{{ user `distro` }}-qemu-{{ isotime "20060102030405"  }}",
       "format": "qcow2",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
@@ -247,7 +247,7 @@
       "type": "digitalocean",
       "api_token": "{{user `do_api_token`}}",
       "image": "{{user `distro`}}",
-      "snapshot_name": "{{ user `distro` }}-{{ timestamp  }}",
+      "snapshot_name": "{{ user `distro` }}-{{ isotime "20060102030405" }}",
       "region" : "ams2",
       "size" : "1gb"
     }
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 2faeb1a..b476972 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -76,7 +76,7 @@
     {
       "type": "vagrant",
       "keep_input_artifact": true,
-      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ timestamp }}.box",
+      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ isotime "20060102030405" }}.box",
       "except": [ "digitalocean", "docker" ]
     },
     {
@@ -87,7 +87,7 @@
     },
     {
       "type": "docker-save",
-      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "path": "images/{{ user `distro` }}-docker-{{ isotime "20060102030405" }}.tar",
       "only": ["docker"]
     }
   ],
@@ -122,7 +122,7 @@
       ],
       "boot_wait": "5s",
       "disk_size": "{{ user `disk_size`}}",
-      "output_directory": "images/{{ user `distro` }}-vbox-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vbox-{{ isotime "20060102030405"  }}",
       "guest_os_type": "Ubuntu_64",
       "http_directory": "http",
       "iso_checksum": "23e97cd5d4145d4105fbf29878534049",
@@ -174,7 +174,7 @@
       "disk_size": "{{ user `disk_size`}}",
       "disk_type_id": 4,
       "vmdk_name": "{{ user `distro`}}",
-      "output_directory": "images/{{ user `distro` }}-vmware-{{ timestamp  }}",
+      "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime "20060102030405"  }}",
       "guest_os_type": "linux",
       "http_directory": "http",
       "iso_checksum": "23e97cd5d4145d4105fbf29878534049",
@@ -196,8 +196,8 @@
       "qemuargs": [
         [ "-m", "1024M" ]
       ],
-      "vm_name": "{{ user `distro` }}-{{ timestamp  }}",
-      "output_directory": "images/{{ user `distro` }}-qemu-{{ timestamp  }}",
+      "vm_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
+      "output_directory": "images/{{ user `distro` }}-qemu-{{ isotime "20060102030405"  }}",
       "format": "qcow2",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
@@ -255,7 +255,7 @@
       "type": "digitalocean",
       "api_token": "{{user `do_api_token`}}",
       "image": "{{user `distro`}}",
-      "snapshot_name": "{{ user `distro` }}-{{ timestamp  }}",
+      "snapshot_name": "{{ user `distro` }}-{{ isotime "20060102030405"  }}",
       "region" : "ams2",
       "size" : "1gb"
     }