diff --git a/Dockerfile.server b/Dockerfile
similarity index 75%
rename from Dockerfile.server
rename to Dockerfile
index 1745769..6b81b04 100644
--- a/Dockerfile.server
+++ b/Dockerfile
@@ -1,5 +1,9 @@
 FROM node:8
 
+WORKDIR /app
+
+RUN yarn global add nodemon
+
 COPY package.json yarn.lock ./
 RUN yarn --pure-lockfile
 COPY . .
diff --git a/Dockerfile.worker b/Dockerfile.worker
deleted file mode 100644
index 1cee604..0000000
--- a/Dockerfile.worker
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM node:8
-
-COPY package.json yarn.lock ./
-RUN yarn --pure-lockfile
-COPY . .
-
-CMD ["node", "server/ingestLogs.js"]
diff --git a/docker-compose.yml b/docker-compose.yml
index b6eab07..7e8b2d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,40 +3,39 @@ version: "3"
 networks:
   localnet: {}
 
-volumes:
-  pkgvol: {}
-
 services:
 
   cache:
     image: redis
-    ports:
-      - "6379:6379"
     volumes:
       - ./data:/data
+    ports:
+      - "6379:6379"
     networks:
       - localnet
 
   server:
-    build:
-      context: .
-      dockerfile: Dockerfile.server
+    build: .
+    image: server
+    command: nodemon --ignore client server.js
+    env_file: .env
+    volumes:
+      - .:/app
+    depends_on:
+      - cache
     ports:
       - "8080:5000"
-    volumes:
-      - pkgvol:/packages
     networks:
       - localnet
-    env_file: .env
-    depends_on:
-      - cache
 
   worker:
-    build:
-      context: .
-      dockerfile: Dockerfile.worker
-    networks:
-      - localnet
+    build: .
+    image: worker
+    command: nodemon --ignore client server/ingestLogs.js
     env_file: .env
+    volumes:
+      - .:/app
     depends_on:
       - cache
+    networks:
+      - localnet
diff --git a/package.json b/package.json
index 0a7788b..b4f9369 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "start": "echo 'Use `docker-compose up` to start the server",
+    "start": "docker-compose up",
     "build": "NODE_ENV=production webpack -p --json > server/stats.json",
     "lint": "eslint client && eslint server",
     "test": "jest"