diff --git a/dots/vimrc b/dots/vimrc
index a10c6547..10f4469b 100644
--- a/dots/vimrc
+++ b/dots/vimrc
@@ -193,6 +193,8 @@ set ai "Auto indent
 set si "Smart indent
 set wrap "Wrap lines
 
+" Fix auto-indentation for YAML files
+autocmd FileType yaml,yml setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>
 
 """"""""""""""""""""""""""""""
 " => Visual mode related