diff --git a/roles/dotfiles/tasks/main.yaml b/roles/dotfiles/tasks/main.yaml
new file mode 100644
index 0000000..ba60d84
--- /dev/null
+++ b/roles/dotfiles/tasks/main.yaml
@@ -0,0 +1,16 @@
+---    
+- name: install required packages
+  package:
+      name:
+        - git
+      state: latest
+
+- name: clone dotfiles
+  become_user: "{{ account.name }}"
+  git:
+      repo: git@github.com:mandlm/dotfiles.git
+      dest: "{{ dotfiles }}"
+      accept_hostkey: yes
+      update: no
+
+
diff --git a/roles/git/tasks/main.yaml b/roles/git/tasks/main.yaml
new file mode 100644
index 0000000..52f4901
--- /dev/null
+++ b/roles/git/tasks/main.yaml
@@ -0,0 +1,14 @@
+---    
+- name: install required packages
+  package:
+      name:
+        - git
+      state: latest
+
+- name: install git config
+  become_user: "{{ account.name }}"
+  shell:
+      chdir: "{{ dotfiles }}/git"
+      cmd: ./install.sh
+      creates: "{{ account.home }}/.gitconfig"
+
diff --git a/roles/misc/tasks/main.yaml b/roles/misc/tasks/main.yaml
deleted file mode 100644
index 62ea42e..0000000
--- a/roles/misc/tasks/main.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----    
-- name: install basic packages
-  package:
-      name:
-        - aptitude
-        - git
-        - tmux
-        - tree
-      state: latest
-
-- name: clone dotfiles
-  become_user: "{{ account.name }}"
-  git:
-      repo: git@github.com:mandlm/dotfiles.git
-      dest: "{{ dotfiles }}"
-      accept_hostkey: yes
-      update: no
-
-- name: install zsh config
-  become_user: "{{ account.name }}"
-  shell:
-      chdir: "{{ dotfiles }}/zsh"
-      cmd: ./install.sh
-      creates: "{{ account.home }}/.zshrc"
-  
-- name: install tmux plugin manager
-  become_user: "{{ account.name }}"
-  git:
-      repo: https://github.com/tmux-plugins/tpm.git
-      dest: "{{ account.home }}/.tmux/plugins/tpm"
-      accept_hostkey: yes
-      update: no
-
-- name: install tmux config
-  become_user: "{{ account.name }}"
-  shell:
-      chdir: "{{ dotfiles }}/tmux"
-      cmd: ./install.sh
-      creates: "{{ account.home }}/.tmux.conf"
-
-- name: install git config
-  become_user: "{{ account.name }}"
-  shell:
-      chdir: "{{ dotfiles }}/git"
-      cmd: ./install.sh
-      creates: "{{ account.home }}/.gitconfig"
-
diff --git a/roles/oh-my-zsh/tasks/main.yaml b/roles/oh-my-zsh/tasks/main.yaml
deleted file mode 100644
index 2b34d6f..0000000
--- a/roles/oh-my-zsh/tasks/main.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: install required packages
-  package:
-      name:
-        - curl
-      state: latest
-
-- name: install oh-my-zsh
-  become_user: "{{ account.name }}"
-  shell: 
-      cmd: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc"
-      creates: "{{ account.home }}/.oh-my-zsh"
-
diff --git a/roles/tmux/tasks/main.yaml b/roles/tmux/tasks/main.yaml
new file mode 100644
index 0000000..bd9e7f3
--- /dev/null
+++ b/roles/tmux/tasks/main.yaml
@@ -0,0 +1,22 @@
+---    
+- name: install required packages
+  package:
+      name:
+        - tmux
+      state: latest
+
+- name: install tmux plugin manager
+  become_user: "{{ account.name }}"
+  git:
+      repo: https://github.com/tmux-plugins/tpm.git
+      dest: "{{ account.home }}/.tmux/plugins/tpm"
+      accept_hostkey: yes
+      update: no
+
+- name: install tmux config
+  become_user: "{{ account.name }}"
+  shell:
+      chdir: "{{ dotfiles }}/tmux"
+      cmd: ./install.sh
+      creates: "{{ account.home }}/.tmux.conf"
+
diff --git a/roles/user-account/tasks/main.yaml b/roles/user-account/tasks/main.yaml
index 8dc9048..813028a 100644
--- a/roles/user-account/tasks/main.yaml
+++ b/roles/user-account/tasks/main.yaml
@@ -1,18 +1,10 @@
 ---
-- name: install required packages
-  package:
-      name:
-        - zsh
-      state: latest
-
 - name: setup user account
   user:
       name: "{{ username }}"
       password: "{{ password }}"
       generate_ssh_key: yes
       create_home: yes
-      shell: /usr/bin/zsh
       state: present
       update_password: always
   register: account
-
diff --git a/roles/zsh/tasks/main.yaml b/roles/zsh/tasks/main.yaml
new file mode 100644
index 0000000..2157f07
--- /dev/null
+++ b/roles/zsh/tasks/main.yaml
@@ -0,0 +1,25 @@
+---
+- name: install required packages
+  package:
+      name:
+        - curl
+        - zsh
+      state: latest
+
+- name: install zsh config
+  become_user: "{{ account.name }}"
+  shell:
+      chdir: "{{ dotfiles }}/zsh"
+      cmd: ./install.sh
+      creates: "{{ account.home }}/.zshrc"
+  
+- name: install oh-my-zsh
+  become_user: "{{ account.name }}"
+  shell: 
+      cmd: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --unattended --keep-zshrc"
+      creates: "{{ account.home }}/.oh-my-zsh"
+
+- name: change login shell to zsh
+  user:
+      name: "{{ username }}"
+      shell: /usr/bin/zsh
diff --git a/wsl-debian.yaml b/wsl-debian.yaml
index b6e69e8..65e8116 100644
--- a/wsl-debian.yaml
+++ b/wsl-debian.yaml
@@ -10,6 +10,15 @@
     - update-packages
     - user-account
     - github-auth
-    - misc
-    - oh-my-zsh
+    - dotfiles
+    - git
+    - tmux
+    - zsh
     - neovim
+  tasks:
+    - name: install tools
+      package:
+          name:
+            - aptitude
+            - tree
+          state: latest