diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index a247197..0b4b059 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -236,6 +236,12 @@ local file_specific = {
     end,
     odin = function()
         vim.bo.expandtab = false
+    end,
+    go = function()
+        vim.bo.expandtab = false
+    end,
+    yaml = function()
+        vim.bo.tabstop = 2
     end
 }