diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile
new file mode 100644
index 0000000000..683f86bc23
--- /dev/null
+++ b/docker/elasticsearch/Dockerfile
@@ -0,0 +1,17 @@
+FROM openjdk:8
+
+MAINTAINER Kerem Sahin <ksahin@linkedin.com>
+
+RUN apt-get update && apt-get install -y wget && apt-get install -y curl
+
+COPY corpuser-index-config.json dataset-index-config.json /
+
+ENV DOCKERIZE_VERSION v0.6.1
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+CMD dockerize -wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
+            -timeout 60s; \
+            curl -XPUT $ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/corpuserinfodocument --data @corpuser-index-config.json; \
+            curl -XPUT $ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/datasetdocument --data @dataset-index-config.json
\ No newline at end of file
diff --git a/docker/elasticsearch/docker-compose.yml b/docker/elasticsearch/docker-compose.yml
index e5301869d5..74caca4a44 100644
--- a/docker/elasticsearch/docker-compose.yml
+++ b/docker/elasticsearch/docker-compose.yml
@@ -20,6 +20,18 @@ services:
     depends_on:
       - elasticsearch
 
+  # This "container" is a workaround to pre-create search indices
+  elasticsearch-setup:
+    build:
+      context: .
+    hostname: elasticsearch-setup
+    container_name: elasticsearch-setup
+    depends_on:
+      - elasticsearch
+    environment:
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT=9200
+
 networks:
   default:
     name: datahub_network
\ No newline at end of file
diff --git a/docker/elasticsearch/init.sh b/docker/elasticsearch/init.sh
deleted file mode 100644
index 162a65c663..0000000000
--- a/docker/elasticsearch/init.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-curl -XPUT localhost:9200/corpuserinfodocument --data @corpuser-index-config.json
-curl -XPUT localhost:9200/datasetdocument --data @dataset-index-config.json
\ No newline at end of file
diff --git a/docker/quickstart/docker-compose.yml b/docker/quickstart/docker-compose.yml
index 9f4028f6f9..63d94e431c 100644
--- a/docker/quickstart/docker-compose.yml
+++ b/docker/quickstart/docker-compose.yml
@@ -109,6 +109,18 @@ services:
     depends_on:
       - elasticsearch
 
+  # This "container" is a workaround to pre-create search indices
+  elasticsearch-setup:
+    build:
+      context: ../elasticsearch
+    hostname: elasticsearch-setup
+    container_name: elasticsearch-setup
+    depends_on:
+      - elasticsearch
+    environment:
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT=9200
+
   datahub-gms:
     image: keremsahin/datahub-gms:latest
     hostname: datahub-gms