diff --git a/kakoune/.config/kak-tree-sitter/config.toml b/kakoune/.config/kak-tree-sitter/config.toml
index 057df7c..e50b2df 100644
--- a/kakoune/.config/kak-tree-sitter/config.toml
+++ b/kakoune/.config/kak-tree-sitter/config.toml
@@ -1,3 +1,12 @@
+# gotmpl
+[grammar.gotmpl.source.git]
+url = "https://github.com/ngalaiko/tree-sitter-go-template"
+pin = "aa71f63de226c5592dfbfc1f29949522d7c95fac"
+
+[language.gotmpl.queries.source.git]
+url = "https://github.com/helix-editor/helix"
+pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
+
 # templ
 [grammar.templ.source.git]
 url = "https://github.com/vrischmann/tree-sitter-templ"
diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index ba3e46c..44dd64f 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -8,6 +8,7 @@ hook global WinCreate .* %{
 }
 
 hook global BufCreate .*\.templ %{ set buffer filetype templ }
+hook global BufCreate .*\.html.tmpl %{ set buffer filetype gotmpl }
 
 # LOCAL