diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 0c02669..2f333ee 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
 ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64/
 
 RUN apt-get -y install --no-install-recommends openjdk-8-jre \
-    && curl https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.3/elasticsearch-2.3.3.deb -o /tmp/elasticsearch.deb \
+    && curl https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/{{ elasticsearch_version }}/elasticsearch-{{ elasticsearch_version }}.deb -o /tmp/elasticsearch.deb \
     && dpkg -i /tmp/elasticsearch.deb \
     && rm -f /tmp/elasticsearch.deb \
     && apt-get clean
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2
index 345273d..41ec668 100644
--- a/docker/kibana/Dockerfile.j2
+++ b/docker/kibana/Dockerfile.j2
@@ -1,7 +1,7 @@
 FROM {{ namespace }}/base-tools:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-RUN curl https://download.elastic.co/kibana/kibana/kibana_4.5.1_amd64.deb -o /tmp/kibana.deb \
+RUN curl https://download.elastic.co/kibana/kibana/kibana-{{ kibana_version }}-amd64.deb -o /tmp/kibana.deb \
     && dpkg -i /tmp/kibana.deb \
     && rm -f /tmp/kibana.deb
 
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index d74528b..380ec7b 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -22,3 +22,5 @@ configs:
 versions:
   influxdb_version: "0.13.0"
   grafana_version: "3.0.3-1463994644"
+  elasticsearch_version: "2.4.0"
+  kibana_version: "4.6.1"