diff --git a/.config/nvim/fnl/lsp.fnl b/.config/nvim/fnl/lsp.fnl
index 82146145..d0caea00 100644
--- a/.config/nvim/fnl/lsp.fnl
+++ b/.config/nvim/fnl/lsp.fnl
@@ -97,6 +97,8 @@
 (local isort (fmt "isort --quiet --profile black -"))
 (local python [black isort])
 
+(local yamlfmt (fmt "yamlfmt -in"))
+
 (setup-lsp :efm {:on_attach on-attach
                  :init_options {:documentFormatting true
                                 :hover true
@@ -108,13 +110,15 @@
                                         : python
                                         :typescript javascript
                                         :typescriptreact javascript
-                                        :vue [prettier]}}
+                                        :vue [prettier]
+                                        :yaml [yamlfmt]}}
                  :filetypes [:fennel
                              :javascript
                              :typescript
                              :python
                              :typescriptreact
-                             :vue]})
+                             :vue
+                             :yaml]})
 
 (setup-lsp :ansiblels)
 (setup-lsp :elmls)
diff --git a/.config/yamlfmt/.yamlfmt b/.config/yamlfmt/.yamlfmt
new file mode 100644
index 00000000..ea204901
--- /dev/null
+++ b/.config/yamlfmt/.yamlfmt
@@ -0,0 +1,2 @@
+formatter:
+  retain_line_breaks: true