diff --git a/Dockerfile b/Dockerfile
index 57c729a58a..d84d01a67e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,7 @@
 FROM node:latest
 
 RUN apt-get update && apt-get install -y libzmq3-dev
+
+VOLUME /netrunner
+
+WORKDIR /netrunner
diff --git a/compose.sh b/compose.sh
index 065f1663f3..4f91b90561 100755
--- a/compose.sh
+++ b/compose.sh
@@ -2,6 +2,31 @@
 
 set -e
 
+usage () {
+    cat<<EOF
+Usage: $0 [-b]
+
+  -b   build netrunner-node image
+EOF
+}
+
+while getopts ':b' o; do
+    case "${o}" in
+        b)
+            BUILD=true
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+
+if [[ -n ${BUILD} ]]; then
+    docker build -t netrunner-node .
+fi
+
+docker-compose up npm-install
+
 docker-compose up npm
 
 docker-compose up netrunner coffee stylus lein
diff --git a/docker-compose.yml b/docker-compose.yml
index b7aede54f3..0ab7373c0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,23 @@
 version: '2'
 services:
 
-  npm:
-    build: .
+  npm-install:
+    image: netrunner-node
     volumes:
-      - .:/workdir
+      - .:/netrunner
+    command: |
+      sh -c "npm install
+             ./node_modules/.bin/bower --allow-root install"
+
+  fetch:
+    image: netrunner-node
+    volumes:
+      - .:/netrunner
     links:
       - mongo
-    command: |
-      sh -c "cd /workdir
-             npm install
-             ./node_modules/.bin/bower --allow-root install
-             OPENSHIFT_MONGODB_DB_HOST=mongo npm run fetch"
+    environment: 
+      OPENSHIFT_MONGODB_DB_HOST: mongo 
+    command: npm run fetch
 
   mongo:
     image: mongo:latest
@@ -41,23 +47,21 @@ services:
              lein run"
 
   stylus:
-    build: .
+    image: netrunner-node
     volumes:
-      - .:/workdir
-    command: |
-      sh -c "cd /workdir
-             ./node_modules/.bin/stylus -w src/css -o resources/public/css/"
+      - .:/netrunner
+    command: ./node_modules/.bin/stylus -w src/css -o resources/public/css/
 
   coffee:
-    build: .
+    image: netrunner-node
     volumes:
-      - .:/workdir
+      - .:/netrunner
     ports:
       - 1042:1042
     links:
       - mongo
       - netrunner
-    command: |
-      sh -c "apt-get update && apt-get install -y libzmq3-dev
-             cd /workdir
-             MONGO_URL=mongodb://mongo:27017/netrunner CLOJURE_HOST=netrunner ./node_modules/.bin/coffee server.coffee"
+    environment:
+      MONGO_URL: mongodb://mongo:27017/netrunner
+      CLOJURE_HOST: netrunner
+    command: ./node_modules/.bin/coffee server.coffee