diff --git a/.gitignore b/.gitignore
index 7444dad4ec2..0aa0ed568ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,7 @@ build
 my-app*
 template/src/__tests__/__snapshots__/
 lerna-debug.log
-npm-debug.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 /.changelog
diff --git a/packages/react-scripts/template/gitignore b/packages/react-scripts/template/gitignore
index 45edb3c7d80..4fa4a53764b 100644
--- a/packages/react-scripts/template/gitignore
+++ b/packages/react-scripts/template/gitignore
@@ -12,4 +12,7 @@
 # misc
 .DS_Store
 .env
-npm-debug.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+