diff --git a/cloud-init-base.yaml b/cloud-init-base.yaml
index 0f3662c..3833e2f 100644
--- a/cloud-init-base.yaml
+++ b/cloud-init-base.yaml
@@ -1,10 +1,13 @@
+hostname: fenix-vm
+preserve_hostname: false
+
 locale: "pt_PT.UTF-8"
 keyboard:
     layout: "pt"
     variant: "nodeadkeys"
 
 users:  
-  - name: default
+  - name: admin
     groups: [sudo]
     shell: /bin/bash
     sudo: ALL=(ALL) NOPASSWD:ALL
diff --git a/cloud-init-vm.yaml.tftpl b/cloud-init-vm.yaml.tftpl
index 4035316..7988063 100644
--- a/cloud-init-vm.yaml.tftpl
+++ b/cloud-init-vm.yaml.tftpl
@@ -21,9 +21,9 @@ users:
 %{ endfor ~}
 
 chpasswd:
-  list: 
+  list: ${"|"}
 %{ for u in each.value.extra_users ~}
-    - ${u.name}:${u.password}
+    ${u.name}:${u.password}
 %{ endfor ~}
   expire: false
 %{ endif ~}