diff --git a/.dockerignore b/.dockerignore
index ce563e77b..ceca66501 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,7 +12,7 @@ ROADMAP.md
 requirements-nover.txt
 run-local.sh
 .DS_Store
-*.pyc
+**/*.pyc
 .tox
 htmlcov
 .coverage
diff --git a/Dockerfile b/Dockerfile
index 3c32036d2..0657f5af6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -121,6 +121,7 @@ RUN optipng -clobber -quiet static/img/**/*.png
 RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev  libsasl2-dev libpq-dev libffi-dev libgpgme11-dev nodejs npm jpegoptim optipng
 RUN apt-get autoremove -y
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN rm -rf .npm
 RUN rm -rf grunt
 RUN rm -rf node_modules
 
@@ -154,6 +155,7 @@ ADD .git/HEAD GIT_HEAD
 
 # Add all of the files!
 ADD . .
+RUN pyclean .
 
 # Run the tests
 ENV RUN_ACI_TESTS False