diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index e36e506..40d49e0 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -154,8 +154,8 @@
         " 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`}} ",
+        " 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>",
@@ -172,8 +172,8 @@
       "iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
       "iso_checksum_type": "md5",
       "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.3-server-amd64.iso",
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
+      "ssh_username": "{{ user `user` }}",
+      "ssh_password": "{{ user `password` }}",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
@@ -277,7 +277,7 @@
       "type": "qemu",
       "qemuargs": [
         [ "-m", "1024M" ],
-        [ "-fda", "config-drive/cloudata.iso" ]
+        [ "-cdrom", "config-drive/cloudata.iso" ]
       ],
       "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\"  }}",
@@ -291,8 +291,8 @@
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
       "headless": true,
-      "ssh_username": "{{user `user`}}",
-      "ssh_password": "{{user `password`}}",
+      "ssh_username": "{{ user `user` }}",
+      "ssh_password": "{{ user `password` }}",
       "ssh_host_port_min": 7000,
       "ssh_host_port_max": 7050,
       "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",