diff --git a/playbook.yml b/playbook.yml
index 8452f321..49fe798e 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -9,8 +9,28 @@
   become: true
   roles:
     - native-games
+- name: setup torbrowser hosts
+  hosts: torbrowser_hosts
+  become: true
+  roles:
+    - torbrowser-games
 - name: setup libreoffice hosts
   hosts: libreoffice_hosts
   become: true
   roles:
     - native-libreoffice
+- name: setup nextcloud-client
+  hosts: nextcloud_client_hosts
+  become: true
+  roles:
+    - native-nextcloud-client
+- name: setup dia
+  hosts: dia_hosts
+  become: true
+  roles:
+    - native-dia
+- name: setup docker
+  hosts: docker_hosts
+  become: true
+  roles:
+    - native-docker
diff --git a/roles/general/tasks/main.yml b/roles/general/tasks/main.yml
index 201b43fe..87966373 100644
--- a/roles/general/tasks/main.yml
+++ b/roles/general/tasks/main.yml
@@ -38,15 +38,9 @@
       - blender
       - obs-studio
 
-      # communication tools
-      - pidgin
-
       # code quality tools
       - shellcheck
 
-      # visualization tools
-      - dia
-
       # ide's
       - atom
       - arduino
@@ -54,18 +48,4 @@
 
       # virtualization tools
       - qemu
-
-      # containerization tools
-      - docker
-      - docker-compose
-
-      # orchestration tools
-      - ansible
-
-      # entertainment software
-      - rhythmbox
-
-      # cloud
-      - nextcloud-client
-
     state: present
diff --git a/roles/native-dia/tasks/main.yml b/roles/native-dia/tasks/main.yml
new file mode 100644
index 00000000..ab15837c
--- /dev/null
+++ b/roles/native-dia/tasks/main.yml
@@ -0,0 +1,4 @@
+- name: Install dia
+  community.general.pacman:
+    name: dia
+    state: present
diff --git a/roles/native-docker/tasks/main.yml b/roles/native-docker/tasks/main.yml
new file mode 100644
index 00000000..75af8363
--- /dev/null
+++ b/roles/native-docker/tasks/main.yml
@@ -0,0 +1,6 @@
+- name: Install docker
+  community.general.pacman:
+    name:
+      - docker
+      - docker-compose
+    state: present
diff --git a/roles/native-nextcloud-client/tasks/main.yml b/roles/native-nextcloud-client/tasks/main.yml
new file mode 100644
index 00000000..366e875b
--- /dev/null
+++ b/roles/native-nextcloud-client/tasks/main.yml
@@ -0,0 +1,4 @@
+- name: Install nextcloud-client
+  community.general.pacman:
+    name: nextcloud-client
+    state: present
diff --git a/roles/native-torbrowser/tasks/main.yml b/roles/native-torbrowser/tasks/main.yml
index 6a78678e..77c3f3f7 100644
--- a/roles/native-torbrowser/tasks/main.yml
+++ b/roles/native-torbrowser/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install gaming software
+- name: Install torbrowser
   community.general.pacman:
     name:
       - tor