diff --git a/lua/java-core/ls/servers/jdtls/init.lua b/lua/java-core/ls/servers/jdtls/init.lua
index 708f51d..0484ce5 100644
--- a/lua/java-core/ls/servers/jdtls/init.lua
+++ b/lua/java-core/ls/servers/jdtls/init.lua
@@ -1,7 +1,6 @@
 local config = require('java-core.ls.servers.jdtls.config')
 local log = require('java-core.utils.log')
 local mason = require('java-core.utils.mason')
-local mason_reg = require('mason-registry')
 local path = require('java-core.utils.path')
 local plugins = require('java-core.ls.servers.jdtls.plugins')
 local util = require('lspconfig.util')
@@ -26,10 +25,9 @@ function M.get_config(opts)
 	-- pick the OS at runtime because mason.nvim does that for me at the
 	-- installation
 	local jdtls_root = mason.get_shared_path('jdtls')
-	local lombok_root = mason.get_shared_path('lombok-nightly')
 
 	local jdtls_config = path.join(jdtls_root, 'config')
-	local lombok_path = path.join(lombok_root, 'lombok.jar')
+	local lombok_path = path.join(jdtls_root, 'lombok.jar')
 	local equinox_launcher =
 		path.join(jdtls_root, 'plugins', 'org.eclipse.equinox.launcher.jar')
 	local plugin_paths = plugins.get_plugin_paths(opts.jdtls_plugins)
@@ -65,20 +63,6 @@ function M.get_config(opts)
 		utils.get_workspace_path(),
 	}
 
-	if opts.use_mason_jdk then
-		local jdk = mason_reg.get_package('openjdk-17')
-
-		if jdk:is_installed() then
-			local java_home = vim.fn.glob('$MASON/packages/jdk-17*')
-			local java_bin = path.join(java_home, '/bin')
-
-			base_config.cmd_env = {
-				['PATH'] = vim.fn.getenv('PATH') .. ':' .. java_bin,
-				['JAVA_HOME'] = java_home,
-			}
-		end
-	end
-
 	---@diagnostic disable-next-line: assign-type-mismatch
 	base_config.root_dir = M.get_root_finder(opts.root_markers)
 	base_config.init_options.bundles = plugin_paths
diff --git a/lua/java-core/ls/servers/jdtls/plugins.lua b/lua/java-core/ls/servers/jdtls/plugins.lua
index 1de9344..cb87704 100644
--- a/lua/java-core/ls/servers/jdtls/plugins.lua
+++ b/lua/java-core/ls/servers/jdtls/plugins.lua
@@ -26,7 +26,7 @@ local plug_jar_map = {
 		'com.microsoft.java.test.plugin-*.jar',
 	},
 	['java-debug-adapter'] = { '*.jar' },
-	['spring-boot-tools'] = { 'jars/*.jar' },
+	['vs-code-spring-boot-tools'] = { 'jars/*.jar' },
 }
 
 ---Returns a list of .jar file paths for given list of jdtls plugins