diff --git a/docker-compose.yml b/docker-compose.yml
index d0c5dca..58cc57f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,8 @@ services:
       - "5000:5000"
     networks:
       - docker_elk
+    depends_on:
+      - elasticsearch
   kibana:
     build: kibana/
     volumes:
@@ -27,6 +29,8 @@ services:
       - "5601:5601"
     networks:
       - docker_elk
+    depends_on:
+      - elasticsearch
 
 networks:
   docker_elk:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index ac8bf8a..e004826 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,8 +1 @@
 FROM kibana:5
-
-RUN apt-get update && apt-get install -y netcat bzip2
-
-COPY entrypoint.sh /tmp/entrypoint.sh
-RUN chmod +x /tmp/entrypoint.sh
-
-CMD ["/tmp/entrypoint.sh"]
diff --git a/kibana/entrypoint.sh b/kibana/entrypoint.sh
deleted file mode 100644
index c08d70a..0000000
--- a/kibana/entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Wait for the Elasticsearch container to be ready before starting Kibana.
-echo "Stalling for Elasticsearch"
-while true; do
-    nc -q 1 elasticsearch 9200 2>/dev/null && break
-done
-
-echo "Starting Kibana"
-exec kibana