diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index afc78c4aab..84dd95ad97 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -15,3 +15,6 @@ deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main
 #
 # Unofficial repository for grafana (LP: #1768585).
 deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main
+
+# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
+deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 22e2d379e4..f9a8204b3f 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -21,7 +21,15 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
        'openjdk-8-jre'
     ] %}
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+{% if base_arch == 'x86_64' %}
+ENV java_arch=amd64
+{% elif base_arch == 'aarch64' %}
+ENV java_arch=arm64
+{% else %}
+ENV java_arch={{ base_arch }}
+{% endif %}
+
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{ java_arch }}/
 
 {% endif %}