diff --git a/.dockerignore b/.dockerignore
index e575619640..fe2acc1f2b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,3 +9,4 @@ tox.ini
 Dockerfile
 LICENSE
 README.md
+SECURITY.md
diff --git a/.gitignore b/.gitignore
index 297d7440ff..7228c2eae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,15 @@
 .DS_Store
-.python-version
-*.pyc
 __pycache__
 *.sw[op]
 *credentials.json
+
+/.*
+!/.gitignore
+!/.dockerignore
+!/.github
+
+/venv/
+
 /*.yml
 !/docker-compose.yml
 !/docker-compose.basic-auth.yml
@@ -14,7 +20,7 @@ __pycache__
 !/docker-compose.saml2.yml
 !/docker-compose.syslog.yml
 !/mkdocs.yml
-!/.travis.yml
+
 /conf/*
 !/conf/start
 !/conf/logstash
@@ -22,6 +28,6 @@ __pycache__
 !/conf/puppet
 !/conf/saml2
 !/conf/syslog
-/fabfile.py
-/venv/
-/wheels/
+
+tests/osquery/fixtures/*
+tests/santa/fixtures/*