diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index bdfa4c1..6d0e1fc 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -7,7 +7,7 @@
     "ubuntu_baseurl": "https://mirror.mirantis.com/proposed/ubuntu/",
     "saltstack_repo": "deb [arch=amd64] https://mirror.mirantis.com/proposed/saltstack-2016.3/xenial/ xenial main",
     "do_api_token": "{{ env `DO_API_TOKEN` }}",
-    "image_name": "ubuntu-16-04-x64",
+    "image_name": "{{ env `IMAGE_NAME` }}",
     "os_username": "{{ env `OS_USERNAME` }}",
     "os_password": "{{ env `OS_PASSWORD` }}",
     "os_image": "7451fac0-0ce5-4d30-ae36-cd9a90e7948e",
@@ -110,7 +110,7 @@
     {
       "type": "vagrant",
       "keep_input_artifact": true,
-      "output": "images/{{ user `distro` }}-{{.Provider}}-{{ isotime \"200601021504\" }}.box",
+      "output": "images/{{ user `image_name` }}-{{.Provider}}-{{ isotime \"200601021504\" }}.box",
       "except": [
         "digitalocean",
         "docker"
@@ -126,7 +126,7 @@
     },
     {
       "type": "docker-save",
-      "path": "images/{{ user `distro` }}-docker-{{ isotime \"200601021504\" }}.tar",
+      "path": "images/{{ user `image_name` }}-docker-{{ isotime \"200601021504\" }}.tar",
       "only": [
         "docker"
       ]
@@ -239,7 +239,7 @@
       "boot_wait": "5s",
       "disk_size": "{{ user `disk_size`}}",
       "disk_type_id": 4,
-      "vmdk_name": "{{ user `distro`}}",
+      "vmdk_name": "{{ user `image_name`}}",
       "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime \"200601021504\"  }}",
       "guest_os_type": "linux",
       "http_directory": "http",
@@ -265,8 +265,8 @@
     {
       "type": "digitalocean",
       "api_token": "{{user `do_api_token`}}",
-      "image": "{{user `distro`}}",
-      "snapshot_name": "{{ user `distro` }}-{{ isotime \"200601021504\"  }}",
+      "image": "{{user `image_name`}}",
+      "snapshot_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "region": "ams2",
       "size": "1gb"
     },