diff --git a/tasks/dotfiles_desktop.yml b/tasks/dotfiles_desktop.yml
index 5ae55a5..0f97ae2 100644
--- a/tasks/dotfiles_desktop.yml
+++ b/tasks/dotfiles_desktop.yml
@@ -15,18 +15,19 @@
   with_items: "{{ me }}"
 
 - name: Install tmuxinator (Archlinux)
-  aur:
+  # aur:
+  #   name: tmuxinator
+  #   use: makepkg
+  #   skip_installed: true
+  # become: yes
+  # become_user: aur_builder
+  # when: ansible_distribution != 'Debian'
+  gem:
     name: tmuxinator
-    use: makepkg
-    skip_installed: true
+    state: latest
   become: yes
-  become_user: aur_builder
-  when: ansible_distribution != 'Debian'
-
-  #   gem:
-  #     name: tmuxinator
-  #     state: latest
-  #   when: not minimal and not server
+  become_user: "{{ me }}"
+  when: not minimal and not server
 
 - name: Copy .tmuxinator/
   copy:
@@ -43,7 +44,7 @@
     state: present
   when: ansible_distribution != 'Debian'
 
-- name: mocp configfiles
+- name: mocp configfile
   copy:
     src: files/dotfiles/moc/
     dest: /home/{{ item.username }}/.moc/
diff --git a/tasks/users.yml b/tasks/users.yml
index 1bd1246..d373e2d 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -7,22 +7,19 @@
   user:
     name: "{{ item.username }}"
     password: "{{ item.password }}"
+    group: "{{ item.group }}"
     uid: "{{ item.uid }}"
     shell: "{{ prompt_place['stdout'] }}"
     state: present
   with_items: "{{ deploy_users }}"
-  tags:
-    - first_deployement
 
 - name: Add me
   user:
     name: "{{ item.username }}"
     password: "{{ item.password }}"
+    group: "{{ item.group }}"
     uid: "{{ item.uid }}"
     shell: "{{ prompt_place['stdout'] }}"
     state: present
   with_items: "{{ me }}"
   when: not minimal or not server
-  tags:
-    - first_deployement
-
diff --git a/vars/common.yml b/vars/common.yml
index b33358a..ac2be94 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -4,11 +4,14 @@ me:
   - username: 'lafrite'
     password: '$6$OnPrZgotbSWZlh0T$VSyF8lUhD/N881d1GsggE7jDFt0uAzls2r.pqgDV6XQKbTqZWfv0X4QWd/3wivUDyzaSjP4LQWVfne7KYR6Vv1'
     uid: '1000'
+    group: users
 
 deploy_users:
   - username: 'waha'
     password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1'
     uid: '999'
+    group: wheel
+    groups: sudo, adm
 
 prompt: 'fish'