diff --git a/browserless/docker-compose.yml b/browserless/docker-compose.yml
index 022b5ab..9b8a1f2 100644
--- a/browserless/docker-compose.yml
+++ b/browserless/docker-compose.yml
@@ -7,7 +7,8 @@ browserless:
     - MAX_CONCURRENT_SESSIONS=10
     - CONNECTION_TIMEOUT=600000
     - MAX_QUEUE_LENGTH=10
-    - ENABLE_CORS=true
     - CHROME_REFRESH_TIME=3600000
+    - ENABLE_CORS=true
+    - EXIT_ON_HEALTH_FAILURE=true
   shm_size: 2gb
   restart: always
diff --git a/statsd/Dockerfile b/statsd/Dockerfile
index 8d07d4a..6050338 100644
--- a/statsd/Dockerfile
+++ b/statsd/Dockerfile
@@ -5,10 +5,10 @@
 FROM alpine
 MAINTAINER kev <noreply@easypi.pro>
 
-ENV STATSD_VERSION 0.8.0
+ENV STATSD_VERSION 0.8.2
 ENV STATSD_URL https://github.com/etsy/statsd/archive/v$STATSD_VERSION.tar.gz
 
-WORKDIR /app
+WORKDIR /opt/statsd
 
 RUN set -xe \
     && apk add --no-cache ca-certificates curl nodejs nodejs-npm tar \