diff --git a/Dockerfile b/Dockerfile
index e8f7078..49cda12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,62 @@
 # Dockerfile for the PDC's Visualizer service
 #
-# Base image
+#
+# Visualizer for PDC-collected aggregate data. Link to Auth and HAPI.
+#
+# Example:
+# sudo docker pull pdcbc/viz
+# sudo docker run -d  --name=viz -h viz --restart=always \
+#   --link auth:auth \
+#   --link hapi:hapi \
+#    -p 443:3004 \
+#    -p 80:3008 \
+#    pdcbc/viz
+#
+# Linked containers
+# - Auth:           --link auth:auth
+# - HAPI:           --link hapi:hapi
+#
+# External ports
+# - https:          -p <hostPort(443)>:3004
+# - http:           -p <hostPort(80)>:3008
+#
+# Modify default settings
+# - Node secret:    -e NODE_SECRET=<string>
+# - Reject non-CA   -e REJECT_NONCA_CERTS=<0/1>
+#    certificates?:
+#
+# Releases
+# - https://github.com/PDCbc/viz/releases
+#
 #
 FROM phusion/passenger-nodejs
+MAINTAINER derek.roberts@gmail.com
+ENV RELEASE 0.1.7
 
 
-# Update system, install Python 2.7
+# Packages
 #
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo 'Dpkg::Options{ "--force-confdef"; "--force-confold" }' \
-      >> /etc/apt/apt.conf.d/local
 RUN apt-get update; \
-    apt-get upgrade -y; \
-    apt-get install -y python2.7
+    apt-get install -y \
+      python2.7 \
+      git; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+
+# Prepare /app/ folder
+#
+WORKDIR /app/
+RUN git clone https://github.com/pdcbc/viz.git -b ${RELEASE} .; \
+    npm config set python /usr/bin/python2.7; \
+    npm install; \
+    chown -R app:app /app/
 
 
 # Create startup script and make it executable
 #
-RUN mkdir -p /etc/service/app/
-RUN ( \
+RUN mkdir -p /etc/service/app/; \
+    ( \
       echo "#!/bin/bash"; \
       echo "#"; \
       echo "set -e -o nounset"; \
@@ -26,13 +64,17 @@ RUN ( \
       echo ""; \
       echo "# Environment variables"; \
       echo "#"; \
-      echo "export PORT=\${PORT_VIZ}"; \
-      echo "export AUTH_MAIN_URL=https://auth:\${PORT_AUTH_M}"; \
-      echo "export AUTH_CONTROL_URL=https://auth:\${PORT_AUTH_C}"; \
-      echo "export CALLBACK_URL=https://auth:\${PORT_AUTH_C}/auth/callback"; \
-      echo "export HUBAPI_URL=\${URL_HAPI}"; \
-      echo "export SECRET=\${NODE_SECRET}"; \
-      echo "export DACS=\${DACS_STOREDIR}"; \
+      echo "export PORT=\${PORT_VIZ:-3004}"; \
+      echo "export PORT_VIZ_HTTP=\${PORT_VIZ:-3008}"; \
+      echo "export AUTH_MAIN_URL=https://auth:\${PORT_AUTH_M:-3005}"; \
+      echo "export AUTH_CONTROL_URL=https://auth:\${PORT_AUTH_C:-3006}"; \
+      echo "export CALLBACK_URL=https://auth:\${PORT_AUTH_C:-3006}/auth/callback"; \
+      echo "export HUBAPI_URL=https://hapi:\${PORT_HAPI:-3003}"; \
+      echo "#"; \
+      echo "export MODE=PROD"; \
+      echo "export DACS=/etc/dacs"; \
+      echo "export NODE_TLS_REJECT_UNAUTHORIZED=\${REJECT_NONCA_CERTS:-0}"; \
+      echo "export SECRET=\${NODE_SECRET:-notVerySecret}"; \
       echo ""; \
       echo ""; \
       echo "# Start service"; \
@@ -40,17 +82,8 @@ RUN ( \
       echo "cd /app/"; \
       echo "/sbin/setuser app npm start"; \
     )  \
-      >> /etc/service/app/run
-RUN chmod +x /etc/service/app/run
-
-
-# Prepare /app/ folder
-#
-WORKDIR /app/
-COPY . .
-RUN npm config set python /usr/bin/python2.7
-RUN npm install
-RUN chown -R app:app /app/
+      >> /etc/service/app/run; \
+    chmod +x /etc/service/app/run
 
 
 # Run Command