diff --git a/docker-compose.yml b/docker-compose.yml
index 26b388b..303993f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.1.1
     environment:
       - cluster.name=monitoring-cluster
       - bootstrap.memory_lock=true
@@ -39,7 +39,7 @@ services:
         max-size: "10m"
         max-file: "20"
   kibana:
-    # image: docker.elastic.co/kibana/kibana:5.6.0
+    # image: docker.elastic.co/kibana/kibana:6.1.1
     # Activates the stagemonitor kibana plugin.
     # It take several minutes to build the image. Also, the first invocation of Kibana can take a while
     # If you don't want this, comment out the build line and uncomment the image line
@@ -52,7 +52,6 @@ services:
       - esnet
     environment:
      - XPACK_GRAPH_ENABLED=false
-     - XPACK_MONITORING_ENABLED=false
      - XPACK_ML_ENABLED=false
      - XPACK_REPORTING_ENABLED=false
      - XPACK_SECURITY_ENABLED=false
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index a70a9fe..71695fd 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,2 +1,2 @@
-FROM docker.elastic.co/kibana/kibana:5.6.0
-RUN kibana-plugin install https://github.com/stagemonitor/stagemonitor-kibana/releases/download/v0.2.0/stagemonitor-kibana-0.2.0-5.6.0.zip
+FROM docker.elastic.co/kibana/kibana:6.1.1
+RUN kibana-plugin install https://github.com/stagemonitor/stagemonitor-kibana/releases/download/v0.3.0/stagemonitor-kibana-0.3.0-6.1.1.zip