diff --git a/ubuntu-16.04/config-drive/meta-data b/ubuntu-16.04/config-drive/meta-data
new file mode 100644
index 0000000..c7ba190
--- /dev/null
+++ b/ubuntu-16.04/config-drive/meta-data
@@ -0,0 +1 @@
+hostname: ubuntu
diff --git a/ubuntu-16.04/config-drive/user-data.yaml b/ubuntu-16.04/config-drive/user-data
similarity index 91%
rename from ubuntu-16.04/config-drive/user-data.yaml
rename to ubuntu-16.04/config-drive/user-data
index 110d9ad..2e536cc 100644
--- a/ubuntu-16.04/config-drive/user-data.yaml
+++ b/ubuntu-16.04/config-drive/user-data
@@ -4,8 +4,8 @@
 disable_root: false
 chpasswd:
   list: |
-    root:ho5uo7Uome5d
-#    cloud-user:ho5uo7Uome5d
+    root:r00tme
+#    cloud-user:r00tme
   expire: False
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
 runcmd:
diff --git a/ubuntu-16.04/run.example.sh b/ubuntu-16.04/run.example.sh
index fefb086..2ed17e0 100644
--- a/ubuntu-16.04/run.example.sh
+++ b/ubuntu-16.04/run.example.sh
@@ -22,7 +22,9 @@
 
 export PACKER_LOG=1
 # For qemu test-build:
-cloud-localds  --hostname ubuntu --dsmode local config-drive/cloudata.iso  config-drive/user-data.yaml
+[ -f config-drive/cloudata.iso ] && rm -v config-drive/cloudata.iso
+mkisofs -o config-drive/cloudata.iso -V cidata -r -J --quiet config-drive
+# For qemu test-build:
 packer build -only=qemu -parallel=false -on-error=ask template.json
 #rm -rf ~/.packer.d/