diff --git a/nvim/ftplugin/c.vim b/nvim/ftplugin/c.vim
index 4c7c80f..23e42dd 100644
--- a/nvim/ftplugin/c.vim
+++ b/nvim/ftplugin/c.vim
@@ -1,4 +1,3 @@
 " For c files
 call tagbar#autoopen(0)
 let g:easytags_async=1
-autocmd BufWritePost * exe ":UpdateTags"
diff --git a/nvim/ftplugin/cpp.vim b/nvim/ftplugin/cpp.vim
index 1927b68..baa07d5 100644
--- a/nvim/ftplugin/cpp.vim
+++ b/nvim/ftplugin/cpp.vim
@@ -1,4 +1,3 @@
 " For header files
 call tagbar#autoopen(0)
 let g:easytags_async = 1
-autocmd BufWritePost * exe ":UpdateTags"
diff --git a/nvim/init.vim b/nvim/init.vim
index a399665..55cf5da 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -242,3 +242,4 @@ catch
     " Ignore non existing file
 endtry
 let g:tex_flavor = "latex"
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab