diff --git a/Choux.yml b/Choux.yml
index bea571f..d5c06a8 100644
--- a/Choux.yml
+++ b/Choux.yml
@@ -10,7 +10,7 @@
   tasks:
     # - include: tasks/test.yml
     - include: tasks/arch_CLI_packages.yml
-    - include: tasks/zsh.yml
+    - include: tasks/prompt.yml
     - include: tasks/users.yml
     - include: tasks/sudo.yml
     - include: tasks/ssh.yml
diff --git a/tasks/users.yml b/tasks/users.yml
index 895ad31..7252bae 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -9,6 +9,7 @@
     password: "{{ item.password }}"
     uid: "{{ item.uid }}"
     shell: "{{ prompt_place['stdout'] }}"
+    state: present
   with_items: "{{ deploy_users }}"
   tags:
     - first_deployement
@@ -18,7 +19,8 @@
     name: "{{ item.username }}"
     password: "{{ item.password }}"
     uid: "{{ item.uid }}"
-    shell: "{{ prompt_place['stdout'] }}"
+    # shell: "{{ prompt_place['stdout'] }}"
+    state: present
   with_items: "{{ me }}"
   when: not minimal or not server
   tags:
diff --git a/tasks/zsh.yml b/tasks/zsh.yml
index fa3864c..5b6c583 100644
--- a/tasks/zsh.yml
+++ b/tasks/zsh.yml
@@ -12,6 +12,11 @@
 #     force: yes
 #     backup: yes
 
+- name: Install base CLI packages
+  pacman:
+    name: zsh
+    state: present
+
 - name: Set shell for root to zsh
   user:
     name: root
diff --git a/vars/Choux.yml b/vars/Choux.yml
index 0179512..e410bff 100644
--- a/vars/Choux.yml
+++ b/vars/Choux.yml
@@ -1,4 +1,5 @@
 ---
+prompt: fish
 
 deploy_public_key: id_ed25519_home.pub