diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 40ca50f68..62a2734b8 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -21,7 +21,7 @@
 | go | ✓ | ✓ | ✓ | `gopls` |
 | graphql | ✓ |  |  |  |
 | haskell | ✓ |  |  | `haskell-language-server-wrapper` |
-| hcl | ✓ |  | ✓ |  |
+| hcl | ✓ |  | ✓ | `terraform-ls` |
 | html | ✓ |  |  |  |
 | iex | ✓ |  |  |  |
 | java | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 2ce4cf129..8d210b63c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -762,7 +762,9 @@ language-server = { command = "kotlin-language-server" }
 name = "hcl"
 scope = "source.hcl"
 injection-regex = "(hcl|tf)"
-file-types = ["hcl", "tf"]
+file-types = ["hcl", "tf", "tfvars"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+language-server = { command = "terraform-ls", args = ["serve"] }
+auto-format = true