diff --git a/lazy-lock.json b/lazy-lock.json
index 0dee908..76dd51a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -18,13 +18,13 @@
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "code_runner.nvim": { "branch": "main", "commit": "dcedccbf969a0f3bc00db446172b4966e83101dd" },
   "codeium.vim": { "branch": "main", "commit": "8c01979323b2b480c8bf160d3ff85bd1668baa49" },
-  "conform.nvim": { "branch": "master", "commit": "d28ccf945374edd9f1c34a82f6c22261dbd8ab98" },
+  "conform.nvim": { "branch": "master", "commit": "e3263eabbfc1bdbc5b6a60ba8431b64e8dca0a79" },
   "dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
   "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
   "inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
-  "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "e51b651ca26cba250ef3a1150c8d35045eee2a84" },
+  "lazy.nvim": { "branch": "main", "commit": "60cf258a9ae7fffe04bb31141141a91845158dcc" },
   "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
@@ -47,14 +47,14 @@
   "nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" },
   "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
   "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4cb925e96288a71409a86c84fd97f4434a95453e" },
   "nvim-material-icon": { "branch": "main", "commit": "38fc13fe4811c4bf62533180ff5e7bbd237c5ef5" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-scrollview": { "branch": "main", "commit": "f7f611330a8f7cd00dc81538fec369611be678ed" },
-  "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" },
-  "nvim-treesitter": { "branch": "master", "commit": "0603b3e3d21ebe2fa82dc5361a3d500e0d3ad3a8" },
+  "nvim-tree.lua": { "branch": "master", "commit": "28eac2801b201f301449e976d7a9e8cfde053ba3" },
+  "nvim-treesitter": { "branch": "master", "commit": "8e40904e49bbad5812798eb54be8c00d77cdd301" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
diff --git a/lua/pcode/plugins/lang/java2.lua b/lua/pcode/plugins/lang/java2.lua
new file mode 100644
index 0000000..6db9d45
--- /dev/null
+++ b/lua/pcode/plugins/lang/java2.lua
@@ -0,0 +1,40 @@
+return {
+  "nvim-java/nvim-java",
+  event = "VeryLazy",
+  config = function()
+    require("java").setup({
+      notifications = {
+        dap = false,
+      },
+      jdk = {
+        auto_install = false,
+      },
+    })
+    require("lspconfig").jdtls.setup({
+      settings = {
+        java = {
+          configuration = {
+            runtimes = {
+              {
+                name = "JavaSE-17",
+                path = os.getenv("JAVA_HOME") or "",
+                default = true,
+              },
+            },
+          },
+        },
+      },
+    })
+  end,
+  keys = {
+    { "<leader>rg", "", desc = "Gradle" },
+    { "<leader>rgp", "<cmd>JavaProfile<cr>", desc = "Java Profile" },
+    { "<leader>rgg", "<cmd>terminal<cr>gradle run<cr>", desc = "Run Gradle" },
+    { "<leader>rgb", "<cmd>JavaBuildBuildWorkspace<cr>", desc = "Java Build Workspace" },
+    { "<leader>rgd", "<cmd>JavaDapConfig<cr>", desc = "Java Configure DAP" },
+    { "<leader>T", "", desc = "Test" },
+    { "<leader>Tc", "<cmd>JavaTestRunCurrentClass<cr>", desc = "Test Current Class" },
+    { "<leader>Tm", "<cmd>JavaTestRunCurrentMethod<cr>", desc = "Test Current Method" },
+    { "<leader>Th", "<cmd>JavaTestViewLastReport<cr>", desc = "View Test Last Report" },
+  },
+}
diff --git a/lua/pcode/user/custom.lua b/lua/pcode/user/custom.lua
index 2477664..cd0e85c 100644
--- a/lua/pcode/user/custom.lua
+++ b/lua/pcode/user/custom.lua
@@ -126,27 +126,4 @@ return {
       return opts
     end,
   },
-  {
-    "nvim-java/nvim-java",
-    event = "VeryLazy",
-    config = function()
-      require("java").setup({
-        notifications = {
-          -- enable 'Configuring DAP' & 'DAP configured' messages on start up
-          dap = false,
-        },
-      })
-    end,
-    keys = {
-      { "<leader>rg", "", desc = "Gradle" },
-      { "<leader>rgp", "<cmd>JavaProfile<cr>", desc = "Java Profile" },
-      { "<leader>rgg", "<cmd>terminal<cr>gradle run<cr>", desc = "Run Gradle" },
-      { "<leader>rgb", "<cmd>JavaBuildBuildWorkspace<cr>", desc = "Java Build Workspace" },
-      { "<leader>rgd", "<cmd>JavaDapConfig<cr>", desc = "Java Configure DAP" },
-      { "<leader>T", "", desc = "Test" },
-      { "<leader>Tc", "<cmd>JavaTestRunCurrentClass<cr>", desc = "Test Current Class" },
-      { "<leader>Tm", "<cmd>JavaTestRunCurrentMethod<cr>", desc = "Test Current Method" },
-      { "<leader>Th", "<cmd>JavaTestViewLastReport<cr>", desc = "View Test Last Report" },
-    },
-  },
 }
diff --git a/lua/pcode/user/default.lua b/lua/pcode/user/default.lua
index 6628904..a88bd17 100644
--- a/lua/pcode/user/default.lua
+++ b/lua/pcode/user/default.lua
@@ -6,6 +6,7 @@ pcode.lang = {
   deno = false,
   golang = false,
   java = false,
+  java2 = true,
   javascript = false,
   kotlin = false,
   markdown = false,