diff --git a/nvim/after/ftplugin/gotmpl.lua b/nvim/after/ftplugin/gotmpl.lua
new file mode 100644
index 0000000..4ae46d6
--- /dev/null
+++ b/nvim/after/ftplugin/gotmpl.lua
@@ -0,0 +1,7 @@
+local setlocal = vim.opt_local
+
+-- Tabs and spaces
+setlocal.expandtab = false
+setlocal.tabstop = 8
+setlocal.shiftwidth = 8
+setlocal.softtabstop = 8
diff --git a/nvim/lua/ftdetect/gotmpl.lua b/nvim/lua/ftdetect/gotmpl.lua
new file mode 100644
index 0000000..e495bd6
--- /dev/null
+++ b/nvim/lua/ftdetect/gotmpl.lua
@@ -0,0 +1,4 @@
+vim.api.nvim_create_autocmd(
+  { "BufNewFile", "BufRead"},
+  { pattern = {"*.gotmpl"}, command = "set ft=gotmpl" }
+)
diff --git a/nvim/lua/ftdetect/init.lua b/nvim/lua/ftdetect/init.lua
index f8d7ba9..31318d8 100644
--- a/nvim/lua/ftdetect/init.lua
+++ b/nvim/lua/ftdetect/init.lua
@@ -1 +1,2 @@
 require("ftdetect.jsonnet")
+require("ftdetect.gotmpl")
diff --git a/nvim/lua/plugins/config/treesitter.lua b/nvim/lua/plugins/config/treesitter.lua
index fc65180..80600e5 100644
--- a/nvim/lua/plugins/config/treesitter.lua
+++ b/nvim/lua/plugins/config/treesitter.lua
@@ -9,6 +9,8 @@ treesitter.setup {
     "bash",
     "go",
     "gomod",
+    "gosum",
+    "gotmpl",
     "hcl",
     "json",
     "lua",