diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 7292b61bae3f..259ffe002b12 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -80,5 +80,5 @@
 | typescript | ✓ |  | ✓ | `typescript-language-server` |
 | vue | ✓ |  |  | `vls` |
 | wgsl | ✓ |  |  |  |
-| yaml | ✓ |  | ✓ |  |
+| yaml | ✓ |  | ✓ | `yaml-language-server` |
 | zig | ✓ |  | ✓ | `zls` |
diff --git a/languages.toml b/languages.toml
index 3b2eedf2c37d..19d42e963276 100644
--- a/languages.toml
+++ b/languages.toml
@@ -644,6 +644,7 @@ file-types = ["yml", "yaml"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+language-server = { command = "yaml-language-server", args = ["--stdio"] }
 injection-regex = "yml|yaml"
 
 [[grammar]]