diff --git a/Dockerfile b/Dockerfile
index 11caf240..198339fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,11 @@
 # DOCKER-VERSION 1.7.0
 
-FROM ubuntu
+FROM node:4
 
-# make sure apt is up to date
-RUN apt-get update
-
-MAINTAINER Matthias Luebken, matthias@catalyst-zero.com
-
-# install nodejs and npm
-RUN apt-get install -y nodejs npm git git-core
-
-WORKDIR /home/mean
+WORKDIR /usr/src/app
 
 # Install Mean.JS Prerequisites
-RUN npm install -g grunt-cli
-RUN npm install -g bower
-
-# Install Mean.JS packages
-ADD package.json /home/mean/package.json
-RUN npm install
-
-# Manually trigger bower. Why doesnt this work via npm install?
-ADD .bowerrc /home/mean/.bowerrc
-ADD bower.json /home/mean/bower.json
-RUN bower install --config.interactive=false --allow-root
-
-# Make everything available for start
-ADD . /home/mean
+RUN npm install -g grunt-cli bower
 
 # currently only works for development
 ENV NODE_ENV development
@@ -34,4 +13,4 @@ ENV NODE_ENV development
 # Port 3000 for server
 # Port 35729 for livereload
 EXPOSE 3000 35729
-CMD ["grunt"]
+CMD ["grunt default"]
diff --git a/README.md b/README.md
index a537b261..3c6b8100 100755
--- a/README.md
+++ b/README.md
@@ -58,12 +58,20 @@ MAILER_SERVICE_PROVIDER=Mandrill
 BASE_URL=yourdomain.com
 ```
 
+Create this directory or you will get errors.
+
+```
+mkdir uploads/pdfs
+```
+
 Edit the 'env' config in gruntfile.js to make sure your .env file is being used. If you don't include this your app won't run
 
-To run:
-```bash
-$ grun
-```
+To run development version:
+
+```$ grunt default```
+To run production version:
+
+```$ grunt production```
 
 Your application should run on port 3000, so in your browser just go to [http://localhost:3000](http://localhost:3000)
 
diff --git a/docker-compose.override.yml.template b/docker-compose.override.yml.template
new file mode 100644
index 00000000..d06dcca6
--- /dev/null
+++ b/docker-compose.override.yml.template
@@ -0,0 +1,9 @@
+
+version: '2'
+services:
+  web:
+    environment:
+      - MAILER_SERVICE_PROVIDER=Gmail
+      - MAILER_EMAIL_ID=test@example.com
+      - MAILER_PASSWORD=password
+      - HOST=http://localhost:3000
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..2aa0d8e2
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,27 @@
+
+version: '2'
+services:
+  db:
+    image: mongo:3.2
+    command: ['bash', '-c', 'mongod --storageEngine wiredTiger'] #['mongod', '--storageEngine', 'wiredTiger']
+    volumes:
+    - mongo-data-wt:/data/db
+    #- /tmp/etc:/etc
+    networks:
+      - back-tier
+  web:
+    build:
+      context: .
+    volumes:
+      - .:/usr/src/app
+    ports:
+      - "3000:3000"
+      - "35729:35729"
+    networks:
+      - back-tier
+volumes:
+  mongo-data-wt:
+    driver: local
+networks:
+  back-tier:
+    driver: bridge