diff --git a/extensions/terraform/languages/hcl/config.toml b/extensions/terraform/languages/hcl/config.toml
index 891b2f38d4..be7e601e01 100644
--- a/extensions/terraform/languages/hcl/config.toml
+++ b/extensions/terraform/languages/hcl/config.toml
@@ -12,3 +12,4 @@ brackets = [
     { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
     { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
 ]
+tab_size = 2
diff --git a/extensions/terraform/languages/hcl/indents.scm b/extensions/terraform/languages/hcl/indents.scm
index 74edb66bdf..be12af1d0c 100644
--- a/extensions/terraform/languages/hcl/indents.scm
+++ b/extensions/terraform/languages/hcl/indents.scm
@@ -6,6 +6,8 @@
   (function_call)
 ] @indent
 
-(_ "[" "]" @end) @indent
-(_ "(" ")" @end) @indent
-(_ "{" "}" @end) @indent
+[
+  "]"
+  "}"
+  ")"
+] @outdent
diff --git a/extensions/terraform/languages/terraform-vars/config.toml b/extensions/terraform/languages/terraform-vars/config.toml
index 12ed7e236c..4d803ee36e 100644
--- a/extensions/terraform/languages/terraform-vars/config.toml
+++ b/extensions/terraform/languages/terraform-vars/config.toml
@@ -12,3 +12,4 @@ brackets = [
     { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
     { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
 ]
+tab_size = 2
diff --git a/extensions/terraform/languages/terraform-vars/indents.scm b/extensions/terraform/languages/terraform-vars/indents.scm
index 95ad93df1d..b9ba0ad56a 100644
--- a/extensions/terraform/languages/terraform-vars/indents.scm
+++ b/extensions/terraform/languages/terraform-vars/indents.scm
@@ -6,9 +6,11 @@
   (function_call)
 ] @indent
 
-(_ "[" "]" @end) @indent
-(_ "(" ")" @end) @indent
-(_ "{" "}" @end) @indent
+[
+  "]"
+  "}"
+  ")"
+] @outdent
 
 ; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/indents.scm
 ; inherits: hcl
diff --git a/extensions/terraform/languages/terraform/indents.scm b/extensions/terraform/languages/terraform/indents.scm
index 95ad93df1d..b9ba0ad56a 100644
--- a/extensions/terraform/languages/terraform/indents.scm
+++ b/extensions/terraform/languages/terraform/indents.scm
@@ -6,9 +6,11 @@
   (function_call)
 ] @indent
 
-(_ "[" "]" @end) @indent
-(_ "(" ")" @end) @indent
-(_ "{" "}" @end) @indent
+[
+  "]"
+  "}"
+  ")"
+] @outdent
 
 ; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/indents.scm
 ; inherits: hcl