diff --git a/base/.vimrc b/base/.vimrc
index d1143f96..d77caf7e 100644
--- a/base/.vimrc
+++ b/base/.vimrc
@@ -78,4 +78,7 @@ au BufNewFile,BufRead *.html,*.php
 " Treat PHP like HTML
 au BufNewFile,BufRead *.php
 	\ set filetype=html
-
+au FileType yaml
+	\ set tabstop=2 |
+	\ set softtabstop=2 |
+	\ set shiftwidth=2