diff --git a/.dockerignore b/.dockerignore
index c8ae49a4e..7c06534dc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,20 @@
-.env
-.git
-.gitignore
+.DS_Store
+/.composer/
+/.env
+/.git
+/.gitconfig
+/.gitignore
+/bootstrap/cache
 /docker-compose-state/
+/node_modules
+/npm-debug.log
+/public/storage
+/public/vendor/horizon
+/storage/*.key
+/storage/docker
+/vendor
+/yarn-error.log
+
+# exceptions - these *MUST* be last
+!/bootstrap/cache/.gitignore
+!/public/vendor/horizon/.gitignore
diff --git a/.gitignore b/.gitignore
index f83ec13c4..b8e9b18de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /public/hot
 /public/storage
 /storage/*.key
+/storage/docker
 /vendor
 Homestead.json
 Homestead.yaml