diff --git a/.travis.yml b/.travis.yml
index 664e611..0583557 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,9 @@ language: bash
 services: docker
 
 env:
-  - VERSION=5.0
+  - VERSION=5
   - VERSION=2.4
-  - VERSION=2.3
-  - VERSION=2.2
-  - VERSION=2.1
-  - VERSION=2.0
   - VERSION=1.7
-  - VERSION=1.6
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/1.6/Dockerfile b/1.6/Dockerfile
deleted file mode 100644
index e63beca..0000000
--- a/1.6/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM openjdk:8-jre
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
-RUN set -x \
-	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
-	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu \
-	&& gosu nobody true
-
-# https://artifacts.elastic.co/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
-RUN set -x \
-	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb http://packages.elasticsearch.org/elasticsearch/1.6/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
-
-ENV ELASTICSEARCH_VERSION 1.6.2
-
-RUN set -x \
-	\
-# don't allow the package to install its sysctl file (causes the install to fail)
-# Failed to write '262144' to '/proc/sys/vm/max_map_count': Read-only file system
-	&& dpkg-divert --rename /usr/lib/sysctl.d/elasticsearch.conf \
-	\
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
-	&& for path in \
-		./data \
-		./logs \
-		./config \
-		./config/scripts \
-	; do \
-		mkdir -p "$path"; \
-		chown -R elasticsearch:elasticsearch "$path"; \
-	done
-
-COPY config ./config
-
-VOLUME /usr/share/elasticsearch/data
-
-COPY docker-entrypoint.sh /
-
-EXPOSE 9200 9300
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["elasticsearch"]
diff --git a/1.6/config/logging.yml b/1.6/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
--- a/1.6/config/logging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/2.0/Dockerfile b/2.0/Dockerfile
deleted file mode 100644
index 4f27e5b..0000000
--- a/2.0/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM openjdk:8-jre
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
-RUN set -x \
-	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
-	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu \
-	&& gosu nobody true
-
-# https://artifacts.elastic.co/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
-RUN set -x \
-	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
-
-ENV ELASTICSEARCH_VERSION 2.0.2
-
-RUN set -x \
-	\
-# don't allow the package to install its sysctl file (causes the install to fail)
-# Failed to write '262144' to '/proc/sys/vm/max_map_count': Read-only file system
-	&& dpkg-divert --rename /usr/lib/sysctl.d/elasticsearch.conf \
-	\
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
-	&& for path in \
-		./data \
-		./logs \
-		./config \
-		./config/scripts \
-	; do \
-		mkdir -p "$path"; \
-		chown -R elasticsearch:elasticsearch "$path"; \
-	done
-
-COPY config ./config
-
-VOLUME /usr/share/elasticsearch/data
-
-COPY docker-entrypoint.sh /
-
-EXPOSE 9200 9300
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["elasticsearch"]
diff --git a/2.0/config/elasticsearch.yml b/2.0/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
--- a/2.0/config/elasticsearch.yml
+++ /dev/null
@@ -1 +0,0 @@
-network.host: 0.0.0.0
diff --git a/2.0/config/logging.yml b/2.0/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
--- a/2.0/config/logging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/2.0/docker-entrypoint.sh b/2.0/docker-entrypoint.sh
deleted file mode 100755
index 09dd9fc..0000000
--- a/2.0/docker-entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@"
-fi
-
-# Drop root privileges if we are running elasticsearch
-# allow the container to be started with `--user`
-if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
-	# Change the ownership of /usr/share/elasticsearch/data to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	
-	set -- gosu elasticsearch "$@"
-	#exec gosu elasticsearch "$BASH_SOURCE" "$@"
-fi
-
-# As argument is not related to elasticsearch,
-# then assume that user wants to run his own process,
-# for example a `bash` shell to explore this image
-exec "$@"
diff --git a/2.1/Dockerfile b/2.1/Dockerfile
deleted file mode 100644
index 8173cdb..0000000
--- a/2.1/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM openjdk:8-jre
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
-RUN set -x \
-	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
-	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu \
-	&& gosu nobody true
-
-# https://artifacts.elastic.co/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
-RUN set -x \
-	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
-
-ENV ELASTICSEARCH_VERSION 2.1.2
-
-RUN set -x \
-	\
-# don't allow the package to install its sysctl file (causes the install to fail)
-# Failed to write '262144' to '/proc/sys/vm/max_map_count': Read-only file system
-	&& dpkg-divert --rename /usr/lib/sysctl.d/elasticsearch.conf \
-	\
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
-	&& for path in \
-		./data \
-		./logs \
-		./config \
-		./config/scripts \
-	; do \
-		mkdir -p "$path"; \
-		chown -R elasticsearch:elasticsearch "$path"; \
-	done
-
-COPY config ./config
-
-VOLUME /usr/share/elasticsearch/data
-
-COPY docker-entrypoint.sh /
-
-EXPOSE 9200 9300
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["elasticsearch"]
diff --git a/2.1/config/elasticsearch.yml b/2.1/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
--- a/2.1/config/elasticsearch.yml
+++ /dev/null
@@ -1 +0,0 @@
-network.host: 0.0.0.0
diff --git a/2.1/config/logging.yml b/2.1/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
--- a/2.1/config/logging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/2.1/docker-entrypoint.sh b/2.1/docker-entrypoint.sh
deleted file mode 100755
index 09dd9fc..0000000
--- a/2.1/docker-entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@"
-fi
-
-# Drop root privileges if we are running elasticsearch
-# allow the container to be started with `--user`
-if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
-	# Change the ownership of /usr/share/elasticsearch/data to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	
-	set -- gosu elasticsearch "$@"
-	#exec gosu elasticsearch "$BASH_SOURCE" "$@"
-fi
-
-# As argument is not related to elasticsearch,
-# then assume that user wants to run his own process,
-# for example a `bash` shell to explore this image
-exec "$@"
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
deleted file mode 100644
index 7d663d6..0000000
--- a/2.2/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM openjdk:8-jre
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
-RUN set -x \
-	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
-	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu \
-	&& gosu nobody true
-
-# https://artifacts.elastic.co/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
-RUN set -x \
-	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
-
-ENV ELASTICSEARCH_VERSION 2.2.2
-
-RUN set -x \
-	\
-# don't allow the package to install its sysctl file (causes the install to fail)
-# Failed to write '262144' to '/proc/sys/vm/max_map_count': Read-only file system
-	&& dpkg-divert --rename /usr/lib/sysctl.d/elasticsearch.conf \
-	\
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
-	&& for path in \
-		./data \
-		./logs \
-		./config \
-		./config/scripts \
-	; do \
-		mkdir -p "$path"; \
-		chown -R elasticsearch:elasticsearch "$path"; \
-	done
-
-COPY config ./config
-
-VOLUME /usr/share/elasticsearch/data
-
-COPY docker-entrypoint.sh /
-
-EXPOSE 9200 9300
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["elasticsearch"]
diff --git a/2.2/config/elasticsearch.yml b/2.2/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
--- a/2.2/config/elasticsearch.yml
+++ /dev/null
@@ -1 +0,0 @@
-network.host: 0.0.0.0
diff --git a/2.2/config/logging.yml b/2.2/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
--- a/2.2/config/logging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/2.2/docker-entrypoint.sh b/2.2/docker-entrypoint.sh
deleted file mode 100755
index 09dd9fc..0000000
--- a/2.2/docker-entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@"
-fi
-
-# Drop root privileges if we are running elasticsearch
-# allow the container to be started with `--user`
-if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
-	# Change the ownership of /usr/share/elasticsearch/data to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	
-	set -- gosu elasticsearch "$@"
-	#exec gosu elasticsearch "$BASH_SOURCE" "$@"
-fi
-
-# As argument is not related to elasticsearch,
-# then assume that user wants to run his own process,
-# for example a `bash` shell to explore this image
-exec "$@"
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
deleted file mode 100644
index b57f512..0000000
--- a/2.3/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM openjdk:8-jre
-
-# grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
-RUN set -x \
-	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
-	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu \
-	&& gosu nobody true
-
-# https://artifacts.elastic.co/GPG-KEY-elasticsearch
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
-# https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
-# https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
-RUN set -x \
-	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb http://packages.elasticsearch.org/elasticsearch/2.x/debian stable main' > /etc/apt/sources.list.d/elasticsearch.list
-
-ENV ELASTICSEARCH_VERSION 2.3.5
-
-RUN set -x \
-	\
-# don't allow the package to install its sysctl file (causes the install to fail)
-# Failed to write '262144' to '/proc/sys/vm/max_map_count': Read-only file system
-	&& dpkg-divert --rename /usr/lib/sysctl.d/elasticsearch.conf \
-	\
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/share/elasticsearch/bin:$PATH
-
-WORKDIR /usr/share/elasticsearch
-
-RUN set -ex \
-	&& for path in \
-		./data \
-		./logs \
-		./config \
-		./config/scripts \
-	; do \
-		mkdir -p "$path"; \
-		chown -R elasticsearch:elasticsearch "$path"; \
-	done
-
-COPY config ./config
-
-VOLUME /usr/share/elasticsearch/data
-
-COPY docker-entrypoint.sh /
-
-EXPOSE 9200 9300
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["elasticsearch"]
diff --git a/2.3/config/elasticsearch.yml b/2.3/config/elasticsearch.yml
deleted file mode 100644
index 5108c77..0000000
--- a/2.3/config/elasticsearch.yml
+++ /dev/null
@@ -1 +0,0 @@
-network.host: 0.0.0.0
diff --git a/2.3/config/logging.yml b/2.3/config/logging.yml
deleted file mode 100644
index c2681ac..0000000
--- a/2.3/config/logging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
-es.logger.level: INFO
-rootLogger: ${es.logger.level}, console
-logger:
-  # log action execution errors for easier debugging
-  action: DEBUG
-  # reduce the logging for aws, too much is logged under the default INFO
-  com.amazonaws: WARN
-
-appender:
-  console:
-    type: console
-    layout:
-      type: consolePattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/2.3/docker-entrypoint.sh b/2.3/docker-entrypoint.sh
deleted file mode 100755
index 09dd9fc..0000000
--- a/2.3/docker-entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@"
-fi
-
-# Drop root privileges if we are running elasticsearch
-# allow the container to be started with `--user`
-if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
-	# Change the ownership of /usr/share/elasticsearch/data to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	
-	set -- gosu elasticsearch "$@"
-	#exec gosu elasticsearch "$BASH_SOURCE" "$@"
-fi
-
-# As argument is not related to elasticsearch,
-# then assume that user wants to run his own process,
-# for example a `bash` shell to explore this image
-exec "$@"
diff --git a/5.0/docker-entrypoint.sh b/5.0/docker-entrypoint.sh
deleted file mode 100755
index 09dd9fc..0000000
--- a/5.0/docker-entrypoint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@"
-fi
-
-# Drop root privileges if we are running elasticsearch
-# allow the container to be started with `--user`
-if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
-	# Change the ownership of /usr/share/elasticsearch/data to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	
-	set -- gosu elasticsearch "$@"
-	#exec gosu elasticsearch "$BASH_SOURCE" "$@"
-fi
-
-# As argument is not related to elasticsearch,
-# then assume that user wants to run his own process,
-# for example a `bash` shell to explore this image
-exec "$@"
diff --git a/5.0/Dockerfile b/5/Dockerfile
similarity index 98%
rename from 5.0/Dockerfile
rename to 5/Dockerfile
index f227eac..c03e228 100644
--- a/5.0/Dockerfile
+++ b/5/Dockerfile
@@ -21,7 +21,7 @@ RUN set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
 	&& echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/elasticsearch.list
 
-ENV ELASTICSEARCH_VERSION 5.0.2
+ENV ELASTICSEARCH_VERSION 5.1.1
 
 RUN set -x \
 	\
diff --git a/5.0/config/elasticsearch.yml b/5/config/elasticsearch.yml
similarity index 100%
rename from 5.0/config/elasticsearch.yml
rename to 5/config/elasticsearch.yml
diff --git a/5.0/config/log4j2.properties b/5/config/log4j2.properties
similarity index 100%
rename from 5.0/config/log4j2.properties
rename to 5/config/log4j2.properties
diff --git a/1.6/docker-entrypoint.sh b/5/docker-entrypoint.sh
similarity index 100%
rename from 1.6/docker-entrypoint.sh
rename to 5/docker-entrypoint.sh
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index cfc55e0..51e0a8f 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -4,7 +4,7 @@ set -eu
 declare -A aliases=(
 	[1.7]='1'
 	[2.4]='2'
-	[5.0]='5 latest'
+	[5]='latest'
 )
 
 self="$(basename "$BASH_SOURCE")"
@@ -13,6 +13,9 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 versions=( */ )
 versions=( "${versions[@]%/}" )
 
+# sort version numbers with highest first
+IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS
+
 # get the most recent commit which modified any of "$@"
 fileCommit() {
 	git log -1 --format='format:%H' HEAD -- "$@"