diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 3ac2970..7b87e75 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -1,7 +1,7 @@
 {
   "variables": {
     "user": "root",
-    "password": "ho5uo7Uome5d",
+    "password": "r00tme",
     "disk_size": "5000",
     "images_cache": "{{ env `PACKER_IMAGES_CACHE` }}",
     "ubuntu_baseurl": "{{ env `UBUNTU_BASEURL` }}",
@@ -156,8 +156,8 @@
         " passwd/root-password={{ user `password` }} ",
         " passwd/root-password-again={{ user `password` }} ",
         " locale=en_US<wait>",
-        " netcfg/get_hostname=ubuntu-1604<wait>",
-        " netcfg/get_domain=cloudlab.cz<wait>",
+        " netcfg/get_hostname=ubuntu<wait>",
+        " netcfg/get_domain=local<wait>",
         " noapic<wait>",
         " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
         " -- <wait>",
@@ -231,8 +231,8 @@
         " passwd/root-password={{user `password`}} ",
         " passwd/root-password-again={{user `password`}} ",
         " locale=en_US<wait>",
-        " netcfg/get_hostname=ubuntu-1604<wait>",
-        " netcfg/get_domain=changeme<wait>",
+        " netcfg/get_hostname=ubuntu<wait>",
+        " netcfg/get_domain=local<wait>",
         " noapic<wait>",
         " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg<wait>",
         " -- <wait>",
@@ -282,6 +282,7 @@
       ],
       "vm_name": "{{ user `image_name` }}",
       "output_directory": "images/{{ user `image_name`}}",
+      "boot_key_interval": "50ms",
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
       "iso_checksum": "24636fd103a2a43c95659f1c3c63718e",
@@ -294,7 +295,9 @@
       "ssh_password": "{{user `password`}}",
       "shutdown_command": "sync; sudo /sbin/shutdown -hP now",
       "boot_wait": "2s",
-      "ssh_wait_timeout": "700s",
+      "ssh_wait_timeout": "15m",
+      "ssh_host_port_min": 7050,
+      "ssh_host_port_max": 7060,
       "boot_command": [
         "<enter><wait><f6><esc>",
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
@@ -318,8 +321,6 @@
         " kbd-chooser/method=us<wait>",
         " keyboard-configuration/layout=USA<wait>",
         " keyboard-configuration/variant=USA<wait>",
-        " passwd/root-password={{ user `password` }} ",
-        " passwd/root-password-again={{ user `password` }} ",
         " locale=en_US<wait>",
         " netcfg/get_hostname=ubuntu<wait>",
         " netcfg/get_domain=local<wait>",