diff --git a/.vimrc.settings b/.vimrc.settings
index 6ee1a2d3..79502d0d 100755
--- a/.vimrc.settings
+++ b/.vimrc.settings
@@ -50,6 +50,15 @@ augroup qf
     autocmd FileType qf set nobuflisted
 augroup END
 
+augroup filetype_yaml
+    autocmd!
+    autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=indent
+    autocmd FileType yaml |
+    setlocal shiftwidth=2 |
+    setlocal softtabstop=2 |
+    setlocal tabstop=2
+augroup END
+
 " vimdiff
 set diffopt+=iwhite
 set diffexpr=""