diff --git a/Dockerfile-dev b/Dockerfile-dev
new file mode 100644
index 00000000..5c041477
--- /dev/null
+++ b/Dockerfile-dev
@@ -0,0 +1,21 @@
+# Build:
+# docker build -t tellform-prod -f ./Dockerfile-production .
+#
+# Run:
+# docker run -it tellform-prod
+
+FROM node:7
+MAINTAINER David Baldwynn <team@tellform.com>
+
+# Install NPM Global Libraries
+RUN npm install --quiet -g grunt bower && npm cache clean
+
+ADD . /code
+WORKDIR /code
+
+RUN npm install --quiet
+RUN bower install --interactive-mode=false --allow-root
+RUN grunt build
+
+# Run TellForm server
+CMD ["grunt"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..c31c0850
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,44 @@
+version: "3"
+services:
+  tellform:
+    build:
+      context: .
+      dockerfile: ./Dockerfile-dev
+    volumes:
+      - .:/code
+    ports:
+      - "5000:5000"
+      - 587:587
+    env_file:
+      - .env
+    links:
+      - mongo
+      - redis
+    depends_on:
+      - mongo
+      - redis
+  redis:
+    restart: always
+    image: redis
+    volumes:
+      - "$ROOT/redis:/data"
+    ports:
+      - "6379:6379"
+  web:
+    image: tellform/nginx:stable
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+      - "20523:20523"
+    env_file:
+      - .env
+    volumes: 
+      - "$ROOT/certs:/certs"
+  mongo:
+    restart: always
+    image: mongo
+    volumes: 
+      - "$ROOT/mongo:/data"
+    ports:
+      - "27107:27107"
\ No newline at end of file
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index c6e61e2a..00000000
Binary files a/dump.rdb and /dev/null differ