diff --git a/templates/cloudinit_userdata.yaml.j2 b/templates/cloudinit_userdata.yaml.j2
index 4950d3a..43bdb99 100644
--- a/templates/cloudinit_userdata.yaml.j2
+++ b/templates/cloudinit_userdata.yaml.j2
@@ -3,7 +3,7 @@
 users:
   - name: {{ ci_user }}
     sudo: ALL=(ALL) NOPASSWD:ALL
-    groups: users, admin, sudo
+    groups: sudo
     shell: /bin/bash
     lock_passwd: false
     passwd: {{ ci_password | password_hash('sha512') }}
diff --git a/templates/cloudinit_vendor.yaml.j2 b/templates/cloudinit_vendor.yaml.j2
index a4232c2..6ef1373 100644
--- a/templates/cloudinit_vendor.yaml.j2
+++ b/templates/cloudinit_vendor.yaml.j2
@@ -5,7 +5,8 @@ packages:
 {% endfor %}
 
 {% if dns %}
-manage_resolve_conf: true
+manage_resolv_conf: true
+
 resolv_conf:
   nameservers:
   {% for ns in dns %}