diff --git a/Poivre.yml b/Poivre.yml
index 5d3662e..12d8265 100644
--- a/Poivre.yml
+++ b/Poivre.yml
@@ -9,12 +9,12 @@
 
   tasks:
     - include: tasks/ansible.yml
-    - include: tasks/arch_aur.yml
     - include: tasks/arch_CLI_packages.yml
+    - include: tasks/sudo.yml
+    - include: tasks/arch_aur.yml
     - include: tasks/dd_backup.yml
     - include: tasks/prompt.yml
     - include: tasks/users.yml
-    - include: tasks/sudo.yml
     - include: tasks/ssh.yml
     - include: tasks/arch_programming.yml
     - include: tasks/arch_gnome.yml
diff --git a/tasks/arch_CLI_packages.yml b/tasks/arch_CLI_packages.yml
index 5e17e16..74fb7fb 100644
--- a/tasks/arch_CLI_packages.yml
+++ b/tasks/arch_CLI_packages.yml
@@ -77,27 +77,3 @@
     regexp: '^#Color$'
     line: 'Color'  
     backrefs: yes
-
-- name: Install mkpasswd
-  aur:
-    name: mkpasswd
-    use: makepkg
-    skip_installed: true
-  become: yes
-  become_user: aur_builder
-
-  # - name: Init Samba (empty config)
-  #   file:
-  #     path: /etc/samba/smb.conf
-  #     state: file
-
-  # - name: Install Tmuxinator
-  #   aur:
-  #     name: "{{ item }}"
-  #     use: yay
-  #     skip_installed: true
-  #   with_items:
-  #     - tmuxinator
-  #   become: yes
-  #   become_user: aur_builder
-
diff --git a/tasks/arch_aur.yml b/tasks/arch_aur.yml
index fb383d3..c7dc789 100644
--- a/tasks/arch_aur.yml
+++ b/tasks/arch_aur.yml
@@ -33,3 +33,12 @@
     skip_installed: true
   become: yes
   become_user: aur_builder
+
+- name: Install mkpasswd
+  aur:
+    name: mkpasswd
+    use: makepkg
+    skip_installed: true
+  become: yes
+  become_user: aur_builder
+