diff --git a/localhost.yml b/localhost.yml
index b3059e4..646fc43 100644
--- a/localhost.yml
+++ b/localhost.yml
@@ -8,7 +8,7 @@
     - signal
     - dotfiles
     - prusa-slicer
-    - intellij
+    - dev-java:
     - autofs
     - dwm
     - docker
diff --git a/roles/intellij/tasks/arch.yml b/roles/dev-java/tasks/arch.yml
similarity index 100%
rename from roles/intellij/tasks/arch.yml
rename to roles/dev-java/tasks/arch.yml
diff --git a/roles/intellij/tasks/install.yml b/roles/dev-java/tasks/install.yml
similarity index 100%
rename from roles/intellij/tasks/install.yml
rename to roles/dev-java/tasks/install.yml
diff --git a/roles/intellij/tasks/main.yml b/roles/dev-java/tasks/main.yml
similarity index 80%
rename from roles/intellij/tasks/main.yml
rename to roles/dev-java/tasks/main.yml
index 97284fc..259bd36 100644
--- a/roles/intellij/tasks/main.yml
+++ b/roles/dev-java/tasks/main.yml
@@ -4,3 +4,5 @@
 
 - import_tasks: arch.yml
   when: ansible_distribution == "Archlinux"
+
+- import_tasks: system-setup.yml
diff --git a/roles/jetbrains/tasks/system-setup.yml b/roles/dev-java/tasks/system-setup.yml
similarity index 100%
rename from roles/jetbrains/tasks/system-setup.yml
rename to roles/dev-java/tasks/system-setup.yml
diff --git a/roles/intellij/tasks/ubuntu.yml b/roles/dev-java/tasks/ubuntu.yml
similarity index 100%
rename from roles/intellij/tasks/ubuntu.yml
rename to roles/dev-java/tasks/ubuntu.yml
diff --git a/roles/intellij/vars/main.yml b/roles/dev-java/vars/main.yml
similarity index 100%
rename from roles/intellij/vars/main.yml
rename to roles/dev-java/vars/main.yml