diff --git a/.gitignore b/.gitignore
index d90e6b6ec..4ce2b4320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ coverage
 .grunt
 .lock-wscript
 node_modules
-**/.idea
+.idea
 .DS_Store
 .tmp
 .env
diff --git a/aws-java-simple-http-endpoint/.gitignore b/aws-java-simple-http-endpoint/.gitignore
index 7dd2350bb..c03f7342b 100644
--- a/aws-java-simple-http-endpoint/.gitignore
+++ b/aws-java-simple-http-endpoint/.gitignore
@@ -14,4 +14,3 @@ target
 
 # Serverless directories
 .serverless
-
diff --git a/aws-node-alexa-skill/.gitignore b/aws-node-alexa-skill/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-alexa-skill/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-auth0-custom-authorizers-api/.gitignore b/aws-node-auth0-custom-authorizers-api/.gitignore
index b512c09d4..2c4448065 100644
--- a/aws-node-auth0-custom-authorizers-api/.gitignore
+++ b/aws-node-auth0-custom-authorizers-api/.gitignore
@@ -1 +1,2 @@
-node_modules
\ No newline at end of file
+node_modules
+.serverless
diff --git a/aws-node-env-variables-encrypted-in-a-file/.gitignore b/aws-node-env-variables-encrypted-in-a-file/.gitignore
index c6314cdf4..2c4448065 100644
--- a/aws-node-env-variables-encrypted-in-a-file/.gitignore
+++ b/aws-node-env-variables-encrypted-in-a-file/.gitignore
@@ -1 +1,2 @@
-secrets.*.yml
+node_modules
+.serverless
diff --git a/aws-node-env-variables/.gitignore b/aws-node-env-variables/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-env-variables/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-fetch-file-and-store-in-s3/.gitignore b/aws-node-fetch-file-and-store-in-s3/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-fetch-file-and-store-in-s3/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-function-compiled-with-babel/.gitignore b/aws-node-function-compiled-with-babel/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-function-compiled-with-babel/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-iot-event/.gitignore b/aws-node-iot-event/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-iot-event/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-recursive-function/.gitignore b/aws-node-recursive-function/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-recursive-function/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-rest-api-with-dynamodb/.gitignore b/aws-node-rest-api-with-dynamodb/.gitignore
index 61364f15e..2c4448065 100644
--- a/aws-node-rest-api-with-dynamodb/.gitignore
+++ b/aws-node-rest-api-with-dynamodb/.gitignore
@@ -1,21 +1,2 @@
-.serverless
-*.log
-npm-debug.log
-pids
-*.pid
-*.seed
-dist
-lib-cov
-coverage
-.grunt
-.lock-wscript
 node_modules
-**/.idea
-.DS_Store
-.tmp
-.env
-env.js
-env.yml
-env.json
-admin.env
-tmp
+.serverless
diff --git a/aws-node-scheduled-cron/.gitignore b/aws-node-scheduled-cron/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-scheduled-cron/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-scheduled-weather/.gitignore b/aws-node-scheduled-weather/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-scheduled-weather/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-serve-dynamic-html-via-http-endpoint/.gitignore b/aws-node-serve-dynamic-html-via-http-endpoint/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-serve-dynamic-html-via-http-endpoint/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-simple-http-endpoint/.gitignore b/aws-node-simple-http-endpoint/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-simple-http-endpoint/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-single-page-app-via-cloudfront/.gitignore b/aws-node-single-page-app-via-cloudfront/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-single-page-app-via-cloudfront/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-node-text-analysis-via-sns-post-processing/.gitignore b/aws-node-text-analysis-via-sns-post-processing/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/aws-node-text-analysis-via-sns-post-processing/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/aws-python-alexa-skill/.gitignore b/aws-python-alexa-skill/.gitignore
new file mode 100644
index 000000000..94fcd47ab
--- /dev/null
+++ b/aws-python-alexa-skill/.gitignore
@@ -0,0 +1,3 @@
+.serverless
+*.pyc
+*.pyo
diff --git a/aws-python-rest-api-with-dynamodb/.gitignore b/aws-python-rest-api-with-dynamodb/.gitignore
new file mode 100644
index 000000000..94fcd47ab
--- /dev/null
+++ b/aws-python-rest-api-with-dynamodb/.gitignore
@@ -0,0 +1,3 @@
+.serverless
+*.pyc
+*.pyo
diff --git a/aws-python-scheduled-cron/.gitignore b/aws-python-scheduled-cron/.gitignore
new file mode 100644
index 000000000..94fcd47ab
--- /dev/null
+++ b/aws-python-scheduled-cron/.gitignore
@@ -0,0 +1,3 @@
+.serverless
+*.pyc
+*.pyo
diff --git a/aws-python-simple-http-endpoint/.gitignore b/aws-python-simple-http-endpoint/.gitignore
new file mode 100644
index 000000000..94fcd47ab
--- /dev/null
+++ b/aws-python-simple-http-endpoint/.gitignore
@@ -0,0 +1,3 @@
+.serverless
+*.pyc
+*.pyo
diff --git a/openwhisk-node-chaining-functions/.gitignore b/openwhisk-node-chaining-functions/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/openwhisk-node-chaining-functions/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/openwhisk-node-scheduled-cron/.gitignore b/openwhisk-node-scheduled-cron/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/openwhisk-node-scheduled-cron/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/openwhisk-node-simple-http-endpoint/.gitignore b/openwhisk-node-simple-http-endpoint/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/openwhisk-node-simple-http-endpoint/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless
diff --git a/openwhisk-node-simple/.gitignore b/openwhisk-node-simple/.gitignore
new file mode 100644
index 000000000..2c4448065
--- /dev/null
+++ b/openwhisk-node-simple/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.serverless