diff --git a/cloud-init-vm.yaml.tftpl b/cloud-init-vm.yaml.tftpl
index e0a25a9..346d10e 100644
--- a/cloud-init-vm.yaml.tftpl
+++ b/cloud-init-vm.yaml.tftpl
@@ -3,23 +3,28 @@ package_update: true
 %{ if length(each.value.extra_packages) > 0 }
 packages:
 %{ for pkg in each.value.extra_packages }
-  - ${pkg}
+${" "}- ${pkg}
 %{ endfor }
 %{ endif }
 
 %{ if length(each.value.extra_users) > 0 }
 users:
 %{ for u in each.value.extra_users }
-  - name: ${u.name}
-    groups: [${join(", ", u.groups)}]
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
+${" "}- name: ${u.name}
+${" "}${" "}groups: 
+%{ if length(u.groups) > 0 }
+%{ for g in u.groups }
+${" "}${" "}${" "}- ${g}
+%{ endfor }
+%{ endif }
+${" "}${" "}shell: /bin/bash
+${" "}${" "}sudo: ALL=(ALL) NOPASSWD:ALL
 %{ endfor }
 
 chpasswd:
   list: 
 %{ for u in each.value.extra_users }
-    ${u.name}:${u.password}
+${" "}${" "}- ${u.name}:${u.password}
 %{ endfor }
   expire: false
 %{ endif }