diff --git a/tasks/users.yml b/tasks/users.yml
index 4f0ea1a..838a012 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -4,7 +4,7 @@
     name: wheel
     state: present
 
-- name: users -- Add deploy users
+- name: create users
   user:
     name: "{{ item.username }}"
     password: "{{ item.password | password_hash('sha512')}}"
@@ -13,17 +13,6 @@
     uid: "{{ item.uid }}"
     shell: "{{ prompt_place['stdout'] }}"
     state: present
-  with_items: "{{ deploy_users }}"
+  with_items: "{{ users }}"
   when: create_user
 
-- name: users -- Add me
-  user:
-    name: "{{ item.username }}"
-    password: "{{ item.password | password_hash('sha512')}}"
-    group: "{{ item.group }}"
-    groups: "{{ item.groups }}"
-    uid: "{{ item.uid }}"
-    shell: "{{ prompt_place['stdout'] }}"
-    state: present
-  with_items: "{{ me }}"
-  when: create_user
diff --git a/vars/Combava.yml b/vars/Combava.yml
index dc61227..4987a94 100644
--- a/vars/Combava.yml
+++ b/vars/Combava.yml
@@ -1,4 +1,5 @@
 ---
+users: [me, admin]
 prompt: fish
 editor: nvim
 
diff --git a/vars/server.yml b/vars/server.yml
index 4b2364b..99feaf4 100644
--- a/vars/server.yml
+++ b/vars/server.yml
@@ -1,5 +1,5 @@
 ---
-me: "{{ deploy_users }}"
+users: [admin, content]
 
 minimal: true
 server: true