diff --git a/Dockerfile b/Dockerfile
index 198339fd..5639a74d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,4 +13,4 @@ ENV NODE_ENV development
 # Port 3000 for server
 # Port 35729 for livereload
 EXPOSE 3000 35729
-CMD ["grunt default"]
+CMD ["grunt"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 2aa0d8e2..56d4a488 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,25 +3,20 @@ 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
+      - mongo-data-wt:/data/db
   web:
-    build:
-      context: .
+    build: .
     volumes:
       - .:/usr/src/app
     ports:
       - "3000:3000"
       - "35729:35729"
-    networks:
-      - back-tier
+    environment:
+      DB_1_PORT_27017_TCP_ADDR: db
+      PORT: 3000
+    links:
+      - db
 volumes:
   mongo-data-wt:
     driver: local
-networks:
-  back-tier:
-    driver: bridge