diff --git a/docker/blocks/elastic6/docker-compose.yaml b/docker/blocks/elastic6/docker-compose.yaml
new file mode 100644
index 00000000000..dd2439f88e4
--- /dev/null
+++ b/docker/blocks/elastic6/docker-compose.yaml
@@ -0,0 +1,15 @@
+# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
+
+  elasticsearch6:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
+    command: elasticsearch
+    ports:
+      - "11200:9200"
+      - "11300:9300"
+
+  fake-elastic6-data:
+    image: grafana/fake-data-gen
+    network_mode: bridge
+    environment:
+      FD_DATASOURCE: elasticsearch6
+      FD_PORT: 11200
diff --git a/docker/blocks/elastic6/elasticsearch.yml b/docker/blocks/elastic6/elasticsearch.yml
new file mode 100644
index 00000000000..c57b2c12908
--- /dev/null
+++ b/docker/blocks/elastic6/elasticsearch.yml
@@ -0,0 +1,2 @@
+script.inline: on
+script.indexed: on