diff --git a/vim/.vimrc b/vim/.vimrc
index f418dd5..2183f88 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -87,6 +87,12 @@ nnoremap <S-Tab> :bprev<CR>
 "" Opens the nnn window in a split
 "let g:nnn#layout = { 'left': '~30%' } " or right, up, down
 
+" Fix auto-indentation for YAML files
+augroup yaml_fix
+    autocmd!
+    autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>
+augroup END
+
 map <C-n> :NERDTreeToggle<CR>
 
 "vim-jedi auto-select first, saves a keystroke