diff --git a/roles/account/tasks/main.yml b/roles/account/tasks/main.yml
index 0e363c5..35f3d17 100644
--- a/roles/account/tasks/main.yml
+++ b/roles/account/tasks/main.yml
@@ -6,10 +6,12 @@
     name:
       - exa
       - git
+      - htop
       - httpie
       - man
       - thefuck
       - tmux
+      - vim
       - zsh
 
 - name: Configure sudo insults
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index fdfe8a6..6860c69 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -20,15 +20,11 @@
       - dnsutils
       - git
       - gnupg2
-      - htop
       - python
       - python-pip
       - software-properties-common
-      - tmux
       - ufw
-      - vim
       - wget
-      - zsh
     state: present
     allow_unauthenticated: no
     update_cache: yes