diff --git a/.gitattributes b/.gitattributes
index 35002d0cb..40b06093e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
 .git* export-ignore
 
 # Normalize puppet manifests' line endings to LF on checkin and prevent conversion to CRLF when the files are checked out
-.vagrant-puppet/* eol=lf
+.puppet* eol=lf
diff --git a/.gitignore b/.gitignore
index df08870cd..6c60b5fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 
 # Except those related to git and vagrant
 !.git*
-!.vagrant-puppet*
+!.puppet*
 
 # Exclude application log files
 var/log/*