diff --git a/docker/README.md b/docker/README.md
index eb191c8..c990f21 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -64,3 +64,14 @@ Blender Cloud expects the following files to exist:
 
 - `/data/git/blender_cloud/config_local.py` with machine-local configuration overrides
 - `/data/config/google_app.json` with Google Cloud Storage credentials.
+
+
+## 7. ElasticSearch & kibana
+
+Kibana should be placed in read-only mode:
+
+`curl -XPUT 'localhost:9200/.kibana/_settings' -d '{ "index.blocks.read_only" : true }'`
+
+If editing is desired, temporarily turn off read-only mode:
+
+`curl -XPUT 'localhost:9200/.kibana/_settings' -d '{ "index.blocks.read_only" : false }'`
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 177d6a8..6781fc2 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,6 +30,20 @@ elastic:
         - "127.0.0.1:9200:9200"
     environment:
         xpack.security.enabled: 'false'
+kibana:
+    image: docker.elastic.co/kibana/kibana:5.6.1
+    container_name: kibana
+    restart: always
+    environment:
+        SERVER_NAME: "stats.cloud.blender.org"
+        ELASTICSEARCH_URL: http://elastic:9200
+        XPACK_SECURITY_ENABLED: 'false'
+        XPACK_MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED: 'false'
+        VIRTUAL_HOST: http://stats.cloud.blender.org/*,https://stats.cloud.blender.org/*,http://stats.blender-cloud/*,https://stats.blender-cloud/*
+        VIRTUAL_HOST_WEIGHT: 20
+        FORCE_SSL: "true"
+    links:
+        - elastic
 blender_cloud:
   image: armadillica/blender_cloud:latest
   container_name: blender_cloud
@@ -125,5 +139,6 @@ haproxy:
    - grafista
    # - notifserv
    - letsencrypt
+   - kibana
   volumes:
    - '/data/certs:/certs'