diff --git a/symlinks/config/nvim/lua/esensar/init/plugins.lua b/symlinks/config/nvim/lua/esensar/init/plugins.lua
index af56b55..0c964d0 100644
--- a/symlinks/config/nvim/lua/esensar/init/plugins.lua
+++ b/symlinks/config/nvim/lua/esensar/init/plugins.lua
@@ -77,7 +77,8 @@ return require("packer").startup({
 
 		-- LSP
 		use("neovim/nvim-lspconfig") -- Easy LSP Config
-		use("williamboman/nvim-lsp-installer") -- Easy LSP install
+		use("williamboman/mason.nvim") -- Easy tool install
+		use("williamboman/mason-lspconfig.nvim") -- Lspconfig support for mason
 		use("hrsh7th/cmp-nvim-lsp") -- LSP source for cmp
 		use("hrsh7th/cmp-buffer") -- Buffer source for nvim-cmp
 		use("hrsh7th/cmp-path") -- Path source for nvim-cmp
diff --git a/symlinks/config/nvim/lua/esensar/lsp/jdtls_setup.lua b/symlinks/config/nvim/lua/esensar/lsp/jdtls_setup.lua
index a7c12c1..f57f35e 100644
--- a/symlinks/config/nvim/lua/esensar/lsp/jdtls_setup.lua
+++ b/symlinks/config/nvim/lua/esensar/lsp/jdtls_setup.lua
@@ -23,12 +23,14 @@ local function is_in_config_home(bufname)
 end
 
 function M.setup()
-	local _, installed_jdtls = require("nvim-lsp-installer.servers").get_server("jdtls")
+	local installed_jdtls = {
+		settings = require("mason-registry.jdtls"):get_lsp_settings_schema():or_else({ properties = {} }).properties,
+	}
 
 	require("jdtls").setup_dap({ hotcoredeplace = "auto" })
 	require("jdtls.setup").add_commands()
 
-	local config = vim.tbl_extend("force", installed_jdtls["_default_options"], {
+	local config = vim.tbl_extend("force", installed_jdtls, {
 		flags = {
 			allow_incremental_sync = true,
 		},
diff --git a/symlinks/config/nvim/lua/esensar/lsp/servers.lua b/symlinks/config/nvim/lua/esensar/lsp/servers.lua
index f9b7aa1..4d2f04b 100644
--- a/symlinks/config/nvim/lua/esensar/lsp/servers.lua
+++ b/symlinks/config/nvim/lua/esensar/lsp/servers.lua
@@ -3,7 +3,8 @@
 -------------------------------------------------------------------------------
 
 local lspconfig = require("lspconfig")
-require("nvim-lsp-installer").setup({})
+require("mason").setup()
+require("mason-lspconfig").setup()
 local common_config = require("esensar.lsp.server_config")
 
 -- Language specific LSP config overrides