diff --git a/roles/neovim/files/lua/autocommands.lua b/roles/neovim/files/lua/autocommands.lua
index 456edbb..e4c6aaa 100644
--- a/roles/neovim/files/lua/autocommands.lua
+++ b/roles/neovim/files/lua/autocommands.lua
@@ -32,8 +32,8 @@ vim.api.nvim_create_autocmd("FileType", {
   command = "setlocal colorcolumn=80",
   group = group
 })
-vim.api.nvim_create_autocmd("BufEnter", {
-  pattern = { "Makefile", "*.asm" },
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "make", "asm" },
   command = "setlocal noexpandtab tabstop=6 shiftwidth=6 softtabstop=0",
   group = group
 })