diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 7c00e07..81ed632 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -14,7 +14,6 @@
   "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" },
diff --git a/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua b/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua
deleted file mode 100644
index 15bca72..0000000
--- a/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-return {
-  "williamboman/mason-lspconfig.nvim",
-  dependencies = { "williamboman/mason.nvim" },
-  opts = {
-    ensure_installed = {
-      "astro",
-      "cssls",
-      "emmet_ls",
-      "html",
-      "lua_ls",
-      "pyright",
-      "ruff_lsp",
-      "rust_analyzer",
-      "svelte",
-      "tailwindcss",
-      "tsserver",
-      "vimls",
-      "volar",
-      "vuels",
-    },
-    automatic_installation = true,
-  },
-}
diff --git a/nvim/.config/nvim/lua/plugins/mason-tool-installer.lua b/nvim/.config/nvim/lua/plugins/mason-tool-installer.lua
index 44ecc86..79ac7e4 100644
--- a/nvim/.config/nvim/lua/plugins/mason-tool-installer.lua
+++ b/nvim/.config/nvim/lua/plugins/mason-tool-installer.lua
@@ -2,20 +2,17 @@ return {
   "WhoIsSethDaniel/mason-tool-installer.nvim",
   opts = {
     ensure_installed = {
-      "astro-language-server",
+      -- LSP servers
       "css-lsp",
-      "emmet-ls",
       "html-lsp",
       "lua-language-server",
-      "prettier",
       "pyright",
+      "ruff-lsp",
+      "typescript-language-server",
+      -- Linters & formatters
+      "prettier",
       "ruff",
       "stylua",
-      "svelte-language-server",
-      "terraform-ls",
-      "tflint",
-      "typescript-language-server",
-      "vim-language-server",
     },
     run_on_start = false,
   },
diff --git a/nvim/.config/nvim/lua/plugins/mason.lua b/nvim/.config/nvim/lua/plugins/mason.lua
index 29f68b8..72ac07d 100644
--- a/nvim/.config/nvim/lua/plugins/mason.lua
+++ b/nvim/.config/nvim/lua/plugins/mason.lua
@@ -1,6 +1,6 @@
 return {
   "williamboman/mason.nvim",
-  build = ":MasonUpdate", -- :MasonUpdate updates registry contents
+  build = ":MasonUpdate",
   config = {
     PATH = "append",
   },