diff --git a/group_vars/arch/neovim.yml b/group_vars/arch/neovim.yml
index debc75b..ef6fb27 100644
--- a/group_vars/arch/neovim.yml
+++ b/group_vars/arch/neovim.yml
@@ -26,7 +26,7 @@ language_servers:
 
   - package: esbonio
     server_name: "esbonio"
-    auto_setup: true
+    auto_setup: false
 
   - package: lua-language-server
     server_name: "lua_ls"
diff --git a/group_vars/arch/system.yml b/group_vars/arch/system.yml
index 0d2feef..0de7041 100644
--- a/group_vars/arch/system.yml
+++ b/group_vars/arch/system.yml
@@ -22,3 +22,5 @@ packages:
   - which
   - gcc
   - make
+  - esbonio
+  - marksman
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index f9d4202..83c1adc 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -103,6 +103,12 @@ vim.lsp.config['lua_ls'] = {
   }
 }
 
+-- Use system binary for esbonio
+vim.lsp.config['esbonio'] = {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  cmd = { '/usr/bin/esbonio' }
+}
 {% endif %}
 vim.lsp.config['yamlls'] = {
   on_attach = on_attach,