diff --git a/playbooks/roles/shell/tasks/emacs.yml b/playbooks/roles/shell/tasks/emacs.yml
index 1a28aaa..e472f46 100644
--- a/playbooks/roles/shell/tasks/emacs.yml
+++ b/playbooks/roles/shell/tasks/emacs.yml
@@ -1,5 +1,8 @@
 ---
 - name: Install Doom Emacs
   block:
-    - shell: git clone --depth 1 https://github.com/hlissner/doom-emacs ~/.emacs.d
+    - git:
+        repo: https://github.com/hlissner/doom-emacs
+        dest: ~/.emacs.d
+        depth: 1
     - shell: ~/.emacs.d/bin/doom install
\ No newline at end of file
diff --git a/playbooks/roles/shell/tasks/tmux.yml b/playbooks/roles/shell/tasks/tmux.yml
index ce5c26c..b4408cf 100644
--- a/playbooks/roles/shell/tasks/tmux.yml
+++ b/playbooks/roles/shell/tasks/tmux.yml
@@ -1,6 +1,8 @@
 ---
 - name: Clone tpm
-  shell: git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+  git:
+    repo: https://github.com/tmux-plugins/tpm
+    dest: ~/.tmux/plugins/tpm
 
 - name: Create tmux.conf
   template:
diff --git a/playbooks/roles/shell/tasks/zsh.yml b/playbooks/roles/shell/tasks/zsh.yml
index 9c05676..827b2c1 100644
--- a/playbooks/roles/shell/tasks/zsh.yml
+++ b/playbooks/roles/shell/tasks/zsh.yml
@@ -3,10 +3,14 @@
   shell: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 
 - name: Clone zsh-autosuggestions
-  shell: git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+  git:
+    repo: https://github.com/zsh-users/zsh-autosuggestions
+    dest: ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
 
 - name: Clone zsh-syntax-highlighting
-  shell: git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+  git:
+    repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
+    dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
 
 - name: Clone starship
   shell: curl -fsSL https://starship.rs/install.sh | bash