diff --git a/arangodb/README.md b/arangodb/README.md
index d2a3a75e7795..4a143587bd68 100644
--- a/arangodb/README.md
+++ b/arangodb/README.md
@@ -17,7 +17,7 @@ WARNING:
 # Supported tags and respective `Dockerfile` links
 
 -	[`2.8`, `2.8.11` (*jessie/2.8.11/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/d6fca9a137cd21345b1d380fc0e72daacb6130ce/jessie/2.8.11/Dockerfile)
--	[`3.2`, `3.2.3`, `latest` (*stretch/3.2.3/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/a921ff4451f6cf1c8c426438d43a40c42f8a3e3e/stretch/3.2.3/Dockerfile)
+-	[`3.2`, `3.2.4`, `latest` (*stretch/3.2.4/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/53829f3067e6191bbc38fb373a35fec615bd0056/stretch/3.2.4/Dockerfile)
 
 # Quick reference
 
diff --git a/composer/README.md b/composer/README.md
index ad76d05e06d9..0179276f1b42 100644
--- a/composer/README.md
+++ b/composer/README.md
@@ -82,6 +82,8 @@ docker run --rm --interactive --tty \
 
 When you need to access private repositories, you will either need to share your configured credentials, or mount your `ssh-agent` socket inside the running container:
 
+**Note:** This currently does not work on OSX, see [docker/for-mac#410](https://github.com/docker/for-mac/issues/410).
+
 ```sh
 docker run --rm --interactive --tty \
     --volume $PWD:/app \
@@ -90,7 +92,7 @@ docker run --rm --interactive --tty \
     composer install
 ```
 
-When combining the use of private repositories with running Composer as another (local) user, you might run into non-existant user errors. To work around this, simply mount the host passwd and group files (read-only) into the container:
+When combining the use of private repositories with running Composer as another (local) user, you might run into non-existant user errors (thrown by ssh). To work around this, simply mount the host passwd and group files (read-only) into the container:
 
 ```sh
 docker run --rm --interactive --tty \
@@ -109,7 +111,7 @@ docker run --rm --interactive --tty \
 
 We aim to deliver an image that is as lean as possible, built for running Composer only.
 
-Sometimes dependencies or Composer [scripts](https://getcomposer.org/doc/articles/scripts.md) require the availability of certain PHP extensions. In this scenario, you have two options:
+Sometimes dependencies or Composer [scripts](https://getcomposer.org/doc/articles/scripts.md) require the availability of certain PHP extensions. You can work around this as follows:
 
 -	Pass the `--ignore-platform-reqs` and `--no-scripts` flags to `install` or `update`:
 
@@ -121,6 +123,16 @@ Sometimes dependencies or Composer [scripts](https://getcomposer.org/doc/article
 
 -	Create your own image (possibly by extending `FROM composer`).
 
+**Note:** Docker introduced [multi-stage](https://docs.docker.com/engine/userguide/eng-image/multistage-build/) builds in 17.05:
+
+-	Create your own image, and copy Composer from the official image into it:
+
+	```dockerfile
+	COPY --from=composer:1.5 /usr/bin/composer /usr/bin/composer
+	```
+
+It is highly recommended that you create a "build" image that extends from your baseline production image. Binaries such as Composer should not end up in your production environment.
+
 ### Local runtime/binary
 
 If you want to be able to run `composer` as if it was installed on your host locally, you can define the following function in your `~/.bashrc`, `~/.zshrc` or similar:
diff --git a/groovy/README.md b/groovy/README.md
index ea47bc5cabf2..63614d060408 100644
--- a/groovy/README.md
+++ b/groovy/README.md
@@ -16,26 +16,36 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2.4.11-jdk7`, `2.4-jdk7`, `jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk7/Dockerfile)
--	[`2.4.11-jre7`, `2.4-jre7`, `jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre7/Dockerfile)
--	[`2.4.11-jdk7-alpine`, `2.4-jdk7-alpine`, `jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk7-alpine/Dockerfile)
--	[`2.4.11-jre7-alpine`, `2.4-jre7-alpine`, `jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre7-alpine/Dockerfile)
--	[`2.4.11-jdk8`, `2.4-jdk8`, `jdk8`, `2.4.11-jdk`, `2.4-jdk`, `jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk8/Dockerfile)
--	[`2.4.11-jre8`, `2.4-jre8`, `jre8`, `2.4.11-jre`, `2.4-jre`, `jre`, `2.4.11`, `2.4`, `latest` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre8/Dockerfile)
--	[`2.4.11-jdk8-alpine`, `2.4-jdk8-alpine`, `jdk8-alpine`, `2.4.11-jdk-alpine`, `2.4-jdk-alpine`, `jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk8-alpine/Dockerfile)
--	[`2.4.11-jre8-alpine`, `2.4-jre8-alpine`, `jre8-alpine`, `2.4.11-jre-alpine`, `2.4-jre-alpine`, `jre-alpine`, `2.4.11-alpine`, `2.4-alpine`, `alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre8-alpine/Dockerfile)
--	[`2.4.11-jdk9`, `2.4-jdk9`, `jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk9/Dockerfile)
--	[`2.4.11-jre9`, `2.4-jre9`, `jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre9/Dockerfile)
--	[`2.5.0-beta-1-jdk7`, `2.5-jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk7/Dockerfile)
--	[`2.5.0-beta-1-jre7`, `2.5-jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre7/Dockerfile)
--	[`2.5.0-beta-1-jdk7-alpine`, `2.5-jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk7-alpine/Dockerfile)
--	[`2.5.0-beta-1-jre7-alpine`, `2.5-jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre7-alpine/Dockerfile)
--	[`2.5.0-beta-1-jdk8`, `2.5-jdk8`, `2.5.0-beta-1-jdk`, `2.5-jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk8/Dockerfile)
--	[`2.5.0-beta-1-jre8`, `2.5-jre8`, `2.5.0-beta-1-jre`, `2.5-jre`, `2.5.0-beta-1`, `2.5` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre8/Dockerfile)
--	[`2.5.0-beta-1-jdk8-alpine`, `2.5-jdk8-alpine`, `2.5.0-beta-1-jdk-alpine`, `2.5-jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk8-alpine/Dockerfile)
--	[`2.5.0-beta-1-jre8-alpine`, `2.5-jre8-alpine`, `2.5.0-beta-1-jre-alpine`, `2.5-jre-alpine`, `2.5.0-beta-1-alpine`, `2.5-alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre8-alpine/Dockerfile)
--	[`2.5.0-beta-1-jdk9`, `2.5-jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk9/Dockerfile)
--	[`2.5.0-beta-1-jre9`, `2.5-jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre9/Dockerfile)
+-	[`2.4.12-jdk7`, `2.4-jdk7`, `jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jdk7/Dockerfile)
+-	[`2.4.12-jre7`, `2.4-jre7`, `jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jre7/Dockerfile)
+-	[`2.4.12-jdk7-alpine`, `2.4-jdk7-alpine`, `jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jdk7-alpine/Dockerfile)
+-	[`2.4.12-jre7-alpine`, `2.4-jre7-alpine`, `jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jre7-alpine/Dockerfile)
+-	[`2.4.12-jdk8`, `2.4-jdk8`, `jdk8`, `2.4.12-jdk`, `2.4-jdk`, `jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jdk8/Dockerfile)
+-	[`2.4.12-jre8`, `2.4-jre8`, `jre8`, `2.4.12-jre`, `2.4-jre`, `jre`, `2.4.12`, `2.4`, `latest` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jre8/Dockerfile)
+-	[`2.4.12-jdk8-alpine`, `2.4-jdk8-alpine`, `jdk8-alpine`, `2.4.12-jdk-alpine`, `2.4-jdk-alpine`, `jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jdk8-alpine/Dockerfile)
+-	[`2.4.12-jre8-alpine`, `2.4-jre8-alpine`, `jre8-alpine`, `2.4.12-jre-alpine`, `2.4-jre-alpine`, `jre-alpine`, `2.4.12-alpine`, `2.4-alpine`, `alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jre8-alpine/Dockerfile)
+-	[`2.4.12-jdk9`, `2.4-jdk9`, `jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jdk9/Dockerfile)
+-	[`2.4.12-jre9`, `2.4-jre9`, `jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/5946f838dd18919efc335da19311fbaab0b2a29b/jre9/Dockerfile)
+-	[`2.5.0-beta-1-jdk7`, `2.5-jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jdk7/Dockerfile)
+-	[`2.5.0-beta-1-jre7`, `2.5-jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jre7/Dockerfile)
+-	[`2.5.0-beta-1-jdk7-alpine`, `2.5-jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jdk7-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jre7-alpine`, `2.5-jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jre7-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jdk8`, `2.5-jdk8`, `2.5.0-beta-1-jdk`, `2.5-jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jdk8/Dockerfile)
+-	[`2.5.0-beta-1-jre8`, `2.5-jre8`, `2.5.0-beta-1-jre`, `2.5-jre`, `2.5.0-beta-1`, `2.5` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jre8/Dockerfile)
+-	[`2.5.0-beta-1-jdk8-alpine`, `2.5-jdk8-alpine`, `2.5.0-beta-1-jdk-alpine`, `2.5-jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jdk8-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jre8-alpine`, `2.5-jre8-alpine`, `2.5.0-beta-1-jre-alpine`, `2.5-jre-alpine`, `2.5.0-beta-1-alpine`, `2.5-alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jre8-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jdk9`, `2.5-jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jdk9/Dockerfile)
+-	[`2.5.0-beta-1-jre9`, `2.5-jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/69b40f5b88b4d022e5393116b8995cc98515b594/jre9/Dockerfile)
+-	[`2.6.0-alpha-1-jdk7`, `2.6-jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jdk7/Dockerfile)
+-	[`2.6.0-alpha-1-jre7`, `2.6-jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jre7/Dockerfile)
+-	[`2.6.0-alpha-1-jdk7-alpine`, `2.6-jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jdk7-alpine/Dockerfile)
+-	[`2.6.0-alpha-1-jre7-alpine`, `2.6-jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jre7-alpine/Dockerfile)
+-	[`2.6.0-alpha-1-jdk8`, `2.6-jdk8`, `2.6.0-alpha-1-jdk`, `2.6-jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jdk8/Dockerfile)
+-	[`2.6.0-alpha-1-jre8`, `2.6-jre8`, `2.6.0-alpha-1-jre`, `2.6-jre`, `2.6.0-alpha-1`, `2.6` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jre8/Dockerfile)
+-	[`2.6.0-alpha-1-jdk8-alpine`, `2.6-jdk8-alpine`, `2.6.0-alpha-1-jdk-alpine`, `2.6-jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jdk8-alpine/Dockerfile)
+-	[`2.6.0-alpha-1-jre8-alpine`, `2.6-jre8-alpine`, `2.6.0-alpha-1-jre-alpine`, `2.6-jre-alpine`, `2.6.0-alpha-1-alpine`, `2.6-alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jre8-alpine/Dockerfile)
+-	[`2.6.0-alpha-1-jdk9`, `2.6-jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jdk9/Dockerfile)
+-	[`2.6.0-alpha-1-jre9`, `2.6-jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/ed957c25d14e389dacef8bad7d5ed7026bb35edf/jre9/Dockerfile)
 
 # Quick reference
 
diff --git a/jetty/README.md b/jetty/README.md
index aae184050248..89b2a27f496a 100644
--- a/jetty/README.md
+++ b/jetty/README.md
@@ -16,8 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`9.4.6`, `9.4`, `9`, `9.4.6-jre8`, `9.4-jre8`, `9-jre8`, `latest`, `jre8` (*9.4-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/cafead33ad5c46a0226bff9713719579828ace15/9.4-jre8/Dockerfile)
--	[`9.4.6-alpine`, `9.4-alpine`, `9-alpine`, `9.4.6-jre8-alpine`, `9.4-jre8-alpine`, `9-jre8-alpine`, `alpine`, `jre8-alpine` (*9.4-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/cafead33ad5c46a0226bff9713719579828ace15/9.4-jre8/alpine/Dockerfile)
+-	[`9.4.7`, `9.4`, `9`, `9.4.7-jre8`, `9.4-jre8`, `9-jre8`, `latest`, `jre8` (*9.4-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/74289191601774dc6c343435ab47f103e6740570/9.4-jre8/Dockerfile)
+-	[`9.4.7-alpine`, `9.4-alpine`, `9-alpine`, `9.4.7-jre8-alpine`, `9.4-jre8-alpine`, `9-jre8-alpine`, `alpine`, `jre8-alpine` (*9.4-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/74289191601774dc6c343435ab47f103e6740570/9.4-jre8/alpine/Dockerfile)
 -	[`9.3.20`, `9.3`, `9.3.20-jre8`, `9.3-jre8` (*9.3-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/cafead33ad5c46a0226bff9713719579828ace15/9.3-jre8/Dockerfile)
 -	[`9.3.20-alpine`, `9.3-alpine`, `9.3.20-jre8-alpine`, `9.3-jre8-alpine` (*9.3-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/cafead33ad5c46a0226bff9713719579828ace15/9.3-jre8/alpine/Dockerfile)
 -	[`9.2.22`, `9.2`, `9.2.22-jre8`, `9.2-jre8` (*9.2-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/cafead33ad5c46a0226bff9713719579828ace15/9.2-jre8/Dockerfile)
diff --git a/joomla/README.md b/joomla/README.md
index 9cae0d802d1e..d112f65856e1 100644
--- a/joomla/README.md
+++ b/joomla/README.md
@@ -16,10 +16,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.7.5-apache`, `3.7-apache`, `3-apache`, `apache`, `3.7.5`, `3.7`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/b1988bf493baee9f09e3cd345c594ebd6b0c0dd6/apache/Dockerfile)
--	[`3.7.5-apache-php7`, `3.7-apache-php7`, `3-apache-php7`, `apache-php7` (*apache-php7/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/b1988bf493baee9f09e3cd345c594ebd6b0c0dd6/apache-php7/Dockerfile)
--	[`3.7.5-fpm`, `3.7-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/b1988bf493baee9f09e3cd345c594ebd6b0c0dd6/fpm/Dockerfile)
--	[`3.7.5-fpm-php7`, `3.7-fpm-php7`, `3-fpm-php7`, `fpm-php7` (*fpm-php7/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/b1988bf493baee9f09e3cd345c594ebd6b0c0dd6/fpm-php7/Dockerfile)
+-	[`3.8.0-apache`, `3.8-apache`, `3-apache`, `apache`, `3.8.0`, `3.8`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/7f460a60ab1d239f55a38934abe530294d4fab62/apache/Dockerfile)
+-	[`3.8.0-apache-php7`, `3.8-apache-php7`, `3-apache-php7`, `apache-php7` (*apache-php7/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/7f460a60ab1d239f55a38934abe530294d4fab62/apache-php7/Dockerfile)
+-	[`3.8.0-fpm`, `3.8-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/7f460a60ab1d239f55a38934abe530294d4fab62/fpm/Dockerfile)
+-	[`3.8.0-fpm-php7`, `3.8-fpm-php7`, `3-fpm-php7`, `fpm-php7` (*fpm-php7/Dockerfile*)](https://github.com/joomla/docker-joomla/blob/7f460a60ab1d239f55a38934abe530294d4fab62/fpm-php7/Dockerfile)
 
 # Quick reference
 
diff --git a/orientdb/README.md b/orientdb/README.md
index 7735ea7806ca..1a493d024025 100644
--- a/orientdb/README.md
+++ b/orientdb/README.md
@@ -18,11 +18,10 @@ WARNING:
 
 -	[`2.0.18` (*2.0/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/8a9633c19fa9c53a5446b9b62997ff389813e785/2.0/Dockerfile)
 -	[`2.1.25` (*2.1/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/8a9633c19fa9c53a5446b9b62997ff389813e785/2.1/Dockerfile)
--	[`2.2.28` (*2.2/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/fab18a6400a060ee30d75fd7bc111b63b9661d64/2.2/x86_64/alpine/Dockerfile)
+-	[`2.2.28`, `latest` (*2.2/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/fab18a6400a060ee30d75fd7bc111b63b9661d64/2.2/x86_64/alpine/Dockerfile)
 -	[`2.2.28-spatial` (*2.2-spatial/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/fab18a6400a060ee30d75fd7bc111b63b9661d64/2.2-spatial/x86_64/alpine/Dockerfile)
 -	[`3.0.0m2` (*3.0/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/222b64299884eeb4b324e2822873f69e8a7c006e/3.0/x86_64/alpine/Dockerfile)
 -	[`3.0.0m2-spatial` (*3.0-spatial/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/63df9efb84b44535fd99145b00fb5e2dda6beaa3/3.0-spatial/x86_64/alpine/Dockerfile)
--	[`latest` (*2.2/x86_64/alpine/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/7de6c9c056ac364a1bd93fffae01b2f81a4b5029/2.2/x86_64/alpine/Dockerfile)
 
 # Quick reference
 
diff --git a/telegraf/README.md b/telegraf/README.md
index 2aa43323f225..58ed54984f45 100644
--- a/telegraf/README.md
+++ b/telegraf/README.md
@@ -18,8 +18,8 @@ WARNING:
 
 -	[`1.3`, `1.3.5` (*telegraf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.3/Dockerfile)
 -	[`1.3-alpine`, `1.3.5-alpine` (*telegraf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.3/alpine/Dockerfile)
--	[`1.4`, `1.4.0`, `latest` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.4/Dockerfile)
--	[`1.4-alpine`, `1.4.0-alpine`, `alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.4/alpine/Dockerfile)
+-	[`1.4`, `1.4.1`, `latest` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/143e1a5f30db7928eded3089e2662a577ad5317b/telegraf/1.4/Dockerfile)
+-	[`1.4-alpine`, `1.4.1-alpine`, `alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/143e1a5f30db7928eded3089e2662a577ad5317b/telegraf/1.4/alpine/Dockerfile)
 
 # Quick reference