diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..1b2aea1
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,19 @@
+#
+# Hidden files ignore
+#
+.*
+
+#
+# Remove uneeded files from docker context
+#
+/api/node_modules
+/ui/node_modules
+/ui/dist
+/cli/**
+/deploy/**
+
+#
+# Config files to ignore
+#
+/ui/config/apiconfig.js
+/api/config/mailgunConfig.js
diff --git a/.gitignore b/.gitignore
index 7cc9d61..76a66f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,6 @@ ui/config/apiconfig.js
 
 # Whitelist anchor files & .gitignore
 !.gitignore
+!.dockerignore
 !.travis.yml
 !**/.anchor
\ No newline at end of file
diff --git a/dockerfile b/dockerfile
index 26694e3..daea2ad 100755
--- a/dockerfile
+++ b/dockerfile
@@ -85,12 +85,6 @@ ENV MAILGUN_EMAIL_DOMAIN=""
 ENV MAILGUN_API_KEY=""
 ENV WEBSITE_DOMAIN=""
 
-# #
-# # Preload the NPM installs
-# #
-# RUN cd /application/ui  && ls && npm install
-# RUN cd /application/api && ls && npm install
-
 # Setup the workdir
 WORKDIR "/application/"