diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml
index ee41ed1..3cb09e0 100644
--- a/roles/shell/tasks/main.yml
+++ b/roles/shell/tasks/main.yml
@@ -3,6 +3,8 @@
 - name: Setup alias
   ansible.builtin.include_tasks: setup_alias.yml
 
+- name: Setup completion
+  ansible.builtin.include_tasks: setup_completion_{{ ansible_distribution }}.yml
 
 - name: Check if starship already installed
   ansible.builtin.command: which starship
diff --git a/roles/shell/tasks/setup_completion_MacOSX.yml b/roles/shell/tasks/setup_completion_MacOSX.yml
new file mode 100644
index 0000000..ba121ff
--- /dev/null
+++ b/roles/shell/tasks/setup_completion_MacOSX.yml
@@ -0,0 +1,5 @@
+---
+
+- name: Install zsh-completion
+  community.general.homebrew:
+    name: zsh-completions
diff --git a/roles/shell/tasks/setup_completion_Ubuntu.yml b/roles/shell/tasks/setup_completion_Ubuntu.yml
new file mode 100644
index 0000000..63eab3d
--- /dev/null
+++ b/roles/shell/tasks/setup_completion_Ubuntu.yml
@@ -0,0 +1,7 @@
+---
+
+# bash-completion is installed by default
+- name: Install bash-completion
+  become: yes
+  ansible.builtin.apt:
+    name: bash-completion