diff --git a/configurations/host/materusPC/default.nix b/configurations/host/materusPC/default.nix
index 8232c6b..9521de8 100644
--- a/configurations/host/materusPC/default.nix
+++ b/configurations/host/materusPC/default.nix
@@ -7,6 +7,7 @@
       ./vm
       ./secrets
       ./containers
+      ./other
 
       ./scripts.nix
       ./tmp.nix
@@ -15,7 +16,6 @@
       ./kde.nix
 
       ./audio.nix
-      ./apps.nix
     ];
 
 
diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix
index c91fbc2..77cc7f9 100644
--- a/configurations/host/materusPC/home/materus/default.nix
+++ b/configurations/host/materusPC/home/materus/default.nix
@@ -71,7 +71,7 @@
       freetype.dev
 
       fpc
-      openjdk21
+      gradle
       bison
       flex
 
@@ -109,6 +109,10 @@
     ];
   };
 
+  home.file.".gradle/gradle.properties".text = ''
+  org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME
+  org.gradle.home=${pkgs.jdk21}
+  '';
 
   xdg.desktopEntries.brave-browser =
     let
diff --git a/configurations/host/materusPC/apps.nix b/configurations/host/materusPC/other/apps.nix
similarity index 100%
rename from configurations/host/materusPC/apps.nix
rename to configurations/host/materusPC/other/apps.nix
diff --git a/configurations/host/materusPC/other/default.nix b/configurations/host/materusPC/other/default.nix
new file mode 100644
index 0000000..a1ad7ea
--- /dev/null
+++ b/configurations/host/materusPC/other/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+ imports = [
+  ./apps.nix
+  ./java.nix
+ ];
+
+}
\ No newline at end of file
diff --git a/configurations/host/materusPC/other/java.nix b/configurations/host/materusPC/other/java.nix
new file mode 100644
index 0000000..55446e1
--- /dev/null
+++ b/configurations/host/materusPC/other/java.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  programs = {
+    java.enable = true;
+    java.package = pkgs.jdk;
+    java.binfmt = true;
+  };
+
+  environment.variables = { 
+    JAVA_8_HOME = pkgs.jdk8;
+    JAVA_17_HOME = pkgs.jdk17;
+    JAVA_21_HOME = pkgs.jdk21;
+  };
+}
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index a16b6ed..bc7b5e2 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -166,9 +166,6 @@
   environment.shells = with pkgs; [ zsh bashInteractive fish ];
   programs = {
     fish.enable = true;
-    java.enable = true;
-    java.package = pkgs.graalvm-ce;
-    java.binfmt = true;
     command-not-found.enable = false;
     dconf.enable = true;
   };