diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 52ad01d..e5943a0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - "127.0.0.1:5672:5672"
 
   elastic:
-    image:                   armadillica/elasticsearch:latest
+    image:                   armadillica/elasticsearch:6.1.1
     container_name:          elastic
     restart:                 always
     volumes:
@@ -45,7 +45,7 @@ services:
       - elastic
 
   kibana:
-    image:                   armadillica/kibana:latest
+    image:                   armadillica/kibana:6.1.1
     container_name:          kibana
     restart:                 always
     environment:
diff --git a/docker/elastic/Dockerfile-elastic b/docker/elastic/Dockerfile-elastic
index 7294104..9ccd6ad 100644
--- a/docker/elastic/Dockerfile-elastic
+++ b/docker/elastic/Dockerfile-elastic
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.1.1
 LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
 
 RUN elasticsearch-plugin remove --purge  x-pack
diff --git a/docker/elastic/Dockerfile-kibana b/docker/elastic/Dockerfile-kibana
index fabdd4c..4cf90d3 100644
--- a/docker/elastic/Dockerfile-kibana
+++ b/docker/elastic/Dockerfile-kibana
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/kibana/kibana:5.6.1
+FROM docker.elastic.co/kibana/kibana:6.1.1
 LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
 
 RUN bin/kibana-plugin remove x-pack
diff --git a/docker/elastic/build.sh b/docker/elastic/build.sh
index 1be711c..ceea639 100755
--- a/docker/elastic/build.sh
+++ b/docker/elastic/build.sh
@@ -1,6 +1,15 @@
 #!/bin/bash -e
 
-docker build -t armadillica/elasticsearch:latest -f Dockerfile-elastic .
-docker build -t armadillica/kibana:latest -f Dockerfile-kibana .
+# When updating this, also update the versions in Dockerfile-*, and make sure that
+# it matches the versions of the elasticsearch and elasticsearch_dsl packages
+# used in Pillar. Those don't have to match exactly, but the major version should.
+VERSION=6.1.1
 
-echo "Done, built armadillica/elasticsearch:latest and armadillica/kibana:latest"
+docker build -t armadillica/elasticsearch:${VERSION} -f Dockerfile-elastic .
+docker build -t armadillica/kibana:${VERSION} -f Dockerfile-kibana .
+
+docker tag armadillica/elasticsearch:${VERSION} armadillica/elasticsearch:latest
+docker tag armadillica/kibana:${VERSION} armadillica/kibana:latest
+
+echo "Done, built armadillica/elasticsearch:${VERSION} and armadillica/kibana:${VERSION}"
+echo "Also tagged as armadillica/elasticsearch:latest and armadillica/kibana:latest"