diff --git a/images/elasticsearch/2.4/Dockerfile b/images/elasticsearch/2.4/Dockerfile
index d7857043..47cd0428 100644
--- a/images/elasticsearch/2.4/Dockerfile
+++ b/images/elasticsearch/2.4/Dockerfile
@@ -4,3 +4,7 @@ FROM elasticsearch:2.4
 # configure plugins
 RUN /usr/share/elasticsearch/bin/plugin install analysis-icu
 RUN /usr/share/elasticsearch/bin/plugin install cloud-aws
+
+# elasticsearch config
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
diff --git a/images/elasticsearch/2.4/elasticsearch.yml b/images/elasticsearch/2.4/elasticsearch.yml
new file mode 100644
index 00000000..e150a7ef
--- /dev/null
+++ b/images/elasticsearch/2.4/elasticsearch.yml
@@ -0,0 +1,8 @@
+bootstrap.memory_lock: true
+network.host: 0.0.0.0
+http.port: 9200
+node.master: true
+node.data: true
+threadpool:
+  bulk:
+    queue_size: 1000