diff --git a/home-modules/explicit-configs/nvim/lua/keymappings.lua b/home-modules/explicit-configs/nvim/lua/keymappings.lua
index e7252ff..2c4a7af 100644
--- a/home-modules/explicit-configs/nvim/lua/keymappings.lua
+++ b/home-modules/explicit-configs/nvim/lua/keymappings.lua
@@ -78,7 +78,7 @@ vim.api.nvim_set_keymap('n', '<Leader>lgd', '<cmd>lua vim.lsp.buf.definition()<C
 vim.api.nvim_set_keymap('n', '<Leader>lgD', '<cmd>lua vim.lsp.buf.declaration()<CR>', {noremap = true, silent = true})
 vim.api.nvim_set_keymap('n', '<Leader>lgr', '<cmd>lua vim.lsp.buf.references()<CR>', {noremap = true, silent = true})
 vim.api.nvim_set_keymap('n', '<Leader>lgi', '<cmd>lua vim.lsp.buf.implementation()<CR>', {noremap = true, silent = true})
-vim.api.nvim_set_keymap('n', '<Leader>lf', '<cmd>lua vim.lsp.buf.format()<CR>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<Leader>lf', '<cmd>lua require("conform").format({ async = true, lsp_fallback = true })<CR>', {noremap = true, silent = true})
 vim.keymap.set('v', '<Leader>lrf', vim.lsp.buf.format)
 vim.api.nvim_set_keymap('n', '<Leader>lr', '<cmd>Lspsaga rename<CR>', {silent = true})
 vim.api.nvim_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', {noremap = true, silent = true})
diff --git a/home-modules/explicit-configs/nvim/lua/lsp/ocaml-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/ocaml-ls.lua
index 41b1dff..a1d0806 100644
--- a/home-modules/explicit-configs/nvim/lua/lsp/ocaml-ls.lua
+++ b/home-modules/explicit-configs/nvim/lua/lsp/ocaml-ls.lua
@@ -1,4 +1 @@
-require("lsp-format").setup{}
-require'lspconfig'.ocamllsp.setup{
-  on_attach = require("lsp-format").on_attach
-}
+require'lspconfig'.ocamllsp.setup{}
diff --git a/home-modules/explicit-configs/nvim/lua/plugins.lua b/home-modules/explicit-configs/nvim/lua/plugins.lua
index 7d19653..6107e99 100644
--- a/home-modules/explicit-configs/nvim/lua/plugins.lua
+++ b/home-modules/explicit-configs/nvim/lua/plugins.lua
@@ -115,7 +115,16 @@ return require('packer').startup(function(use)
     }
     
     -- Ocaml
-    use "lukas-reineke/lsp-format.nvim"
+    use {
+        "stevearc/conform.nvim",
+        config = function()
+            require("conform").setup({
+                formatters_by_ft = {
+                    ocaml = { "ocamlformat" },
+                },
+            })
+        end,
+    }
 
     -- Comments
     use 'tpope/vim-commentary'