diff --git a/aerospike/README.md b/aerospike/README.md
index 4fbb7710ec1e..4494e0af0eef 100644
--- a/aerospike/README.md
+++ b/aerospike/README.md
@@ -16,8 +16,9 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.4.0.6`, `latest` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/026024b1d24866a0860afd72e2300151e026e872/Dockerfile)
--	[`3.13.0.11` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/29be954f3d764ae15f0666c39fc14b55f13f1033/Dockerfile)
+-	[`4.5.0.3`, `latest` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/a7cf658aee7a9dc5de6c1f6e48ace5f992a51220/Dockerfile)
+-	[`4.4.0.8` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/0c7f362304555be5d5d72fba6f87f3348ba03c2d/Dockerfile)
+-	[`4.3.1.8` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/7a82b44cef40a00fdd7270e4e526b694afa6c50b/Dockerfile)
 
 # Quick reference
 
diff --git a/clojure/README.md b/clojure/README.md
index 95a45b0686bd..a823d360bfab 100644
--- a/clojure/README.md
+++ b/clojure/README.md
@@ -16,15 +16,15 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`openjdk-8-lein`, `openjdk-8-lein-2.8.3`, `lein-2.8.3`, `lein`, `latest` (*target/openjdk-8/debian/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/debian/lein/Dockerfile)
--	[`openjdk-8-lein-alpine`, `openjdk-8-lein-2.8.3-alpine`, `lein-2.8.3-alpine`, `lein-alpine`, `alpine` (*target/openjdk-8/alpine/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/alpine/lein/Dockerfile)
--	[`openjdk-8-boot`, `openjdk-8-boot-2.8.2`, `boot-2.8.2`, `boot` (*target/openjdk-8/debian/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/debian/boot/Dockerfile)
--	[`openjdk-8-boot-alpine`, `openjdk-8-boot-2.8.2-alpine`, `boot-2.8.2-alpine`, `boot-alpine` (*target/openjdk-8/alpine/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/alpine/boot/Dockerfile)
--	[`openjdk-8-tools-deps`, `openjdk-8-tools-deps-1.10.0.408`, `tools-deps-1.10.0.408`, `tools-deps` (*target/openjdk-8/debian/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/debian/tools-deps/Dockerfile)
--	[`openjdk-8-tools-deps-alpine`, `openjdk-8-tools-deps-1.10.0.408-alpine`, `tools-deps-1.10.0.408-alpine`, `tools-deps-alpine` (*target/openjdk-8/alpine/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-8/alpine/tools-deps/Dockerfile)
--	[`openjdk-11-lein`, `openjdk-11-lein-2.8.3` (*target/openjdk-11/debian/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-11/debian/lein/Dockerfile)
--	[`openjdk-11-boot`, `openjdk-11-boot-2.8.2` (*target/openjdk-11/debian/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-11/debian/boot/Dockerfile)
--	[`openjdk-11-tools-deps`, `openjdk-11-tools-deps-1.10.0.408` (*target/openjdk-11/debian/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/35a046df3dea2a9b1261c5e57c21ba2224c602f9/target/openjdk-11/debian/tools-deps/Dockerfile)
+-	[`openjdk-8-lein`, `openjdk-8-lein-2.8.3`, `lein-2.8.3`, `lein`, `latest` (*target/openjdk-8/debian/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/debian/lein/Dockerfile)
+-	[`openjdk-8-lein-alpine`, `openjdk-8-lein-2.8.3-alpine`, `lein-2.8.3-alpine`, `lein-alpine`, `alpine` (*target/openjdk-8/alpine/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/alpine/lein/Dockerfile)
+-	[`openjdk-8-boot`, `openjdk-8-boot-2.8.2`, `boot-2.8.2`, `boot` (*target/openjdk-8/debian/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/debian/boot/Dockerfile)
+-	[`openjdk-8-boot-alpine`, `openjdk-8-boot-2.8.2-alpine`, `boot-2.8.2-alpine`, `boot-alpine` (*target/openjdk-8/alpine/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/alpine/boot/Dockerfile)
+-	[`openjdk-8-tools-deps`, `openjdk-8-tools-deps-1.10.0.411`, `tools-deps-1.10.0.411`, `tools-deps` (*target/openjdk-8/debian/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/debian/tools-deps/Dockerfile)
+-	[`openjdk-8-tools-deps-alpine`, `openjdk-8-tools-deps-1.10.0.411-alpine`, `tools-deps-1.10.0.411-alpine`, `tools-deps-alpine` (*target/openjdk-8/alpine/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-8/alpine/tools-deps/Dockerfile)
+-	[`openjdk-11-lein`, `openjdk-11-lein-2.8.3` (*target/openjdk-11/debian/lein/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-11/debian/lein/Dockerfile)
+-	[`openjdk-11-boot`, `openjdk-11-boot-2.8.2` (*target/openjdk-11/debian/boot/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-11/debian/boot/Dockerfile)
+-	[`openjdk-11-tools-deps`, `openjdk-11-tools-deps-1.10.0.411` (*target/openjdk-11/debian/tools-deps/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/91f3d11eaf065104ec5d3f2a75a27650ebda2878/target/openjdk-11/debian/tools-deps/Dockerfile)
 
 # Quick reference
 
diff --git a/haskell/README.md b/haskell/README.md
index fd4e970a7bc2..4d2422748545 100644
--- a/haskell/README.md
+++ b/haskell/README.md
@@ -16,8 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`8.6.2`, `8.6`, `8`, `latest` (*8.6/Dockerfile*)](https://github.com/freebroccolo/docker-haskell/blob/5362898713c831feb18b57f106385cac2b5daa1a/8.6/Dockerfile)
--	[`8.4.4`, `8.4` (*8.4/Dockerfile*)](https://github.com/freebroccolo/docker-haskell/blob/5362898713c831feb18b57f106385cac2b5daa1a/8.4/Dockerfile)
+-	[`8.6.3`, `8.6`, `8`, `latest` (*8.6/Dockerfile*)](https://github.com/freebroccolo/docker-haskell/blob/03467e1a14543d83d33833e669249a3c42f7b7c8/8.6/Dockerfile)
+-	[`8.4.4`, `8.4` (*8.4/Dockerfile*)](https://github.com/freebroccolo/docker-haskell/blob/03467e1a14543d83d33833e669249a3c42f7b7c8/8.4/Dockerfile)
 
 # Quick reference
 
diff --git a/kong/README.md b/kong/README.md
index 2ac351dc749a..ff1dc48e8191 100644
--- a/kong/README.md
+++ b/kong/README.md
@@ -59,13 +59,11 @@ WARNING:
 
 # What is Kong?
 
-Kong is a scalable, open source API Layer (also known as an API Gateway, or API Middleware). Kong was originally built by [Kong Inc.](https://konghq.com) (formerly known as Mashape) to secure, manage and extend over 15,000 Microservices for its API Marketplace, which generates billions of requests per month.
+Kong is a scalable, open source API Platform (also known as an API Gateway, or API Middleware, or Service Mesh for Microservices). Kong was originally built by [Kong Inc.](https://konghq.com) (formerly known as Mashape) to secure, manage and extend over 15,000 Microservices for its API Marketplace, which generates billions of requests per month.
 
-Backed by the battle-tested NGINX with a focus on high performance, Kong was made available as an open-source platform in 2015. Under active development, Kong is now used in production at hundreds of organizations from startups, to large enterprises and government departments including: The New York Times, Expedia, Healthcare.gov, The Guardian, Condè Nast, The University of Auckland, Ferrari, and Giphy.
+Under active development, Kong is now used in production at hundreds of organizations from startups, to large enterprises and governments including: The New York Times, Expedia, Healthcare.gov, The Guardian, Condè Nast, The University of Auckland, Ferrari, Rakuten, Cisco, SkyScanner, Yahoo! Japan, Giphy and so on.
 
-Kong's documentation can be found at [getkong.org/docs](http://getkong.org/docs).
-
-![logo](https://raw.githubusercontent.com/docker-library/docs/b07e98d17e225f17228bcb9ad418ac64bbe0db52/kong/logo.png)
+Kong's official documentation can be found at [docs.konghq.com](https://docs.konghq.com/).
 
 # How to use this image
 
@@ -94,7 +92,7 @@ docker run -d --name kong-database \
                 -p 5432:5432 \
                 -e "POSTGRES_USER=kong" \
                 -e "POSTGRES_DB=kong" \
-                postgres:9.5
+                postgres:9.6
 ```
 
 ## 2. Prepare your database
@@ -121,14 +119,13 @@ Once the database has been started and prepared, we can start a Kong container a
 ```shell
 $ docker run -d --name kong \
     --link kong-database:kong-database \
-    -e "KONG_DATABASE=cassandra" \
+    -e "KONG_DATABASE=postgres" \
     -e "KONG_CASSANDRA_CONTACT_POINTS=kong-database" \
     -e "KONG_PROXY_ACCESS_LOG=/dev/stdout" \
     -e "KONG_ADMIN_ACCESS_LOG=/dev/stdout" \
     -e "KONG_PROXY_ERROR_LOG=/dev/stderr" \
     -e "KONG_ADMIN_ERROR_LOG=/dev/stderr" \
-    -e "KONG_ADMIN_LISTEN=0.0.0.0:8001" \
-    -e "KONG_ADMIN_LISTEN_SSL=0.0.0.0:8444" \
+    -e "KONG_ADMIN_LISTEN=0.0.0.0:8001, 0.0.0.0:8444 ssl" \
     -p 8000:8000 \
     -p 8443:8443 \
     -p 8001:8001 \
@@ -136,13 +133,13 @@ $ docker run -d --name kong \
     kong
 ```
 
-If everything went well, and if you created your container with the default ports, Kong should be listening on your host's `8000` ([Proxy](http://getkong.org/docs/latest/configuration/#proxy_port)), `8443` ([Proxy SSL](http://getkong.org/docs/latest/configuration/#proxy_listen_ssl)), `8001` ([Admin API](http://getkong.org/docs/latest/configuration/#admin_listen)) and `8444` ([Admin API SSL](http://getkong.org/docs/latest/configuration/#admin_listen_ssl)) ports.
+If everything went well, and if you created your container with the default ports, Kong should be listening on your host's `8000` ([Proxy](https://docs.konghq.com/latest/configuration/#proxy_port)), `8443` ([Proxy SSL](https://docs.konghq.com/latest/configuration/#proxy_listen_ssl)), `8001` ([Admin API](https://docs.konghq.com/latest/configuration/#admin_listen)) and `8444` ([Admin API SSL](https://docs.konghq.com/latest/configuration/#admin_listen_ssl)) ports.
 
-You can now read the docs at [getkong.org/docs](http://getkong.org/docs) to learn more about Kong.
+You can now read the docs at [docs.konghq.com](https://docs.konghq.com/) to learn more about Kong.
 
 ## 3. Use Kong with a custom configuration (and a custom Cassandra/PostgreSQL cluster)
 
-You can override any property of the [Kong configuration file](http://getkong.org/docs/latest/configuration/) with environment variables. Just prepend any Kong configuration property with the `KONG_` prefix, for example:
+You can override any property of the [Kong configuration file](https://docs.konghq.com/latest/configuration/) with environment variables. Just prepend any Kong configuration property with the `KONG_` prefix, for example:
 
 ```shell
 $ docker run -d --name kong \
@@ -151,8 +148,7 @@ $ docker run -d --name kong \
     -e "KONG_LOG_LEVEL=info" \
     -e "KONG_CUSTOM_PLUGINS=helloworld" \
     -e "KONG_PG_HOST=1.1.1.1" \
-    -e "KONG_ADMIN_LISTEN=0.0.0.0:8001" \
-    -e "KONG_ADMIN_LISTEN_SSL=0.0.0.0:8444" \
+    -e "KONG_ADMIN_LISTEN=0.0.0.0:8001, 0.0.0.0:8444 ssl" \
     -p 8000:8000 \
     -p 8443:8443 \
     -p 8001:8001 \
@@ -168,7 +164,18 @@ If you change your custom configuration, you can reload Kong (without downtime)
 $ docker exec -it kong kong reload
 ```
 
-This will run the [`kong reload`](http://getkong.org/docs/latest/cli/#reload) command in your container.
+This will run the [`kong reload`](https://docs.konghq.com/latest/cli/#reload) command in your container.
+
+# Kubernetes Ingress
+
+Among the many deployment options [available](https://konghq.com/install), Kong also offers a [Kubernetes Ingress Controller](https://github.com/Kong/kubernetes-ingress-controller) ready to use in your K8S environment.
+
+# Service Mesh
+
+Since version 1.x you can run Kong in a Service Mesh deployment as a platform-agnostic sidecar proxy (including Kubernetes, but also on any other platform supported by Kong). To get started and learn more you can read the docs at:
+
+-	[Streams and Service Mesh](https://docs.konghq.com/latest/streams-and-service-mesh/)
+-	[Kubernetes and Service Mesh](https://github.com/Kong/kong-mesh-dist-kubernetes)
 
 # Image Variants
 
@@ -188,7 +195,7 @@ To minimize image size, it's uncommon for additional related tools (such as `git
 
 # License
 
-View [license information](https://getkong.org/license/) for the software contained in this image.
+View [license information](https://konghq.com/kong/license/) for the software contained in this image.
 
 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
 
diff --git a/lightstreamer/README.md b/lightstreamer/README.md
index 4fe2a4d74fc8..1751b3308994 100644
--- a/lightstreamer/README.md
+++ b/lightstreamer/README.md
@@ -18,9 +18,9 @@ WARNING:
 
 -	[`6.0.3`, `6.0` (*6.0/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/ca600ed95f9fa8ec632ef2ad0526c15d917a52b7/6.0/Dockerfile)
 -	[`6.1.0`, `6.1`, `6` (*6.1/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/22d6045bab9625ea9f8b3e1e53c4c34383335ed3/6.1/Dockerfile)
--	[`7.0.2-jre8`, `7.0-jre8`, `7-jre8` (*7.0/jre8/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/db18f37e9da49a859943e5a1156a19b01e441dc5/7.0/jre8/Dockerfile)
--	[`7.0.2-jre8-alpine`, `7.0-jre8-alpine`, `7-jre8-alpine`, `7.0.2-alpine`, `7.0-alpine`, `7-alpine` (*7.0/jre8-alpine/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/db18f37e9da49a859943e5a1156a19b01e441dc5/7.0/jre8-alpine/Dockerfile)
--	[`7.0.2-jre11`, `7.0-jre11`, `7-jre11`, `7.0.2`, `7.0`, `7`, `latest` (*7.0/jre11/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/db18f37e9da49a859943e5a1156a19b01e441dc5/7.0/jre11/Dockerfile)
+-	[`7.0.3-jre8`, `7.0-jre8`, `7-jre8` (*7.0/jre8/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/c93f3767ee869fdc4b1d8df73b03c55096a596eb/7.0/jre8/Dockerfile)
+-	[`7.0.3-jre8-alpine`, `7.0-jre8-alpine`, `7-jre8-alpine`, `7.0.3-alpine`, `7.0-alpine`, `7-alpine` (*7.0/jre8-alpine/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/c93f3767ee869fdc4b1d8df73b03c55096a596eb/7.0/jre8-alpine/Dockerfile)
+-	[`7.0.3-jre11`, `7.0-jre11`, `7-jre11`, `7.0.3`, `7.0`, `7`, `latest` (*7.0/jre11/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/c93f3767ee869fdc4b1d8df73b03c55096a596eb/7.0/jre11/Dockerfile)
 
 # Quick reference
 
diff --git a/neo4j/README.md b/neo4j/README.md
index f980646c1181..e2501d5deb75 100644
--- a/neo4j/README.md
+++ b/neo4j/README.md
@@ -16,8 +16,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.5.0`, `3.5`, `latest` (*3.5.0/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/bc0c1be414f5b671a681af8ac5dd8a5f83c02730/3.5.0/community/Dockerfile)
--	[`3.5.0-enterprise`, `3.5-enterprise`, `enterprise` (*3.5.0/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/bc0c1be414f5b671a681af8ac5dd8a5f83c02730/3.5.0/enterprise/Dockerfile)
+-	[`3.5.1`, `3.5`, `latest` (*3.5.1/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/2dc22d0d20420bbea6f0d98cd824baa138c3ddf2/3.5.1/community/Dockerfile)
+-	[`3.5.1-enterprise`, `3.5-enterprise`, `enterprise` (*3.5.1/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/2dc22d0d20420bbea6f0d98cd824baa138c3ddf2/3.5.1/enterprise/Dockerfile)
+-	[`3.5.0` (*3.5.0/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/bc0c1be414f5b671a681af8ac5dd8a5f83c02730/3.5.0/community/Dockerfile)
+-	[`3.5.0-enterprise` (*3.5.0/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/bc0c1be414f5b671a681af8ac5dd8a5f83c02730/3.5.0/enterprise/Dockerfile)
 -	[`3.4.11`, `3.4` (*3.4.11/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/14ae6f5ab7723d1a96a2c86fccccccc2052f71e0/3.4.11/community/Dockerfile)
 -	[`3.4.11-enterprise`, `3.4-enterprise` (*3.4.11/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/14ae6f5ab7723d1a96a2c86fccccccc2052f71e0/3.4.11/enterprise/Dockerfile)
 -	[`3.4.10` (*3.4.10/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/fd6e47784c8a05d7c4b9a5d324eb8a19e896e0a8/3.4.10/community/Dockerfile)
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 4ec77959b30d..06ec1ddce79a 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -16,12 +16,21 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
+-	[`13.0.9RC1-apache`, `13.0.9-rc-apache`, `13.0-rc-apache`, `13-rc-apache`, `13.0.9RC1`, `13.0.9-rc`, `13.0-rc`, `13-rc` (*13.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/49085a33e6926f7412f1d0b4774e7058b09153a9/13.0-rc/apache/Dockerfile)
+-	[`13.0.9RC1-fpm-alpine`, `13.0.9-rc-fpm-alpine`, `13.0-rc-fpm-alpine`, `13-rc-fpm-alpine` (*13.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/49085a33e6926f7412f1d0b4774e7058b09153a9/13.0-rc/fpm-alpine/Dockerfile)
+-	[`13.0.9RC1-fpm`, `13.0.9-rc-fpm`, `13.0-rc-fpm`, `13-rc-fpm` (*13.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/49085a33e6926f7412f1d0b4774e7058b09153a9/13.0-rc/fpm/Dockerfile)
 -	[`13.0.8-apache`, `13.0-apache`, `13-apache`, `production-apache`, `13.0.8`, `13.0`, `13`, `production` (*13.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/13.0/apache/Dockerfile)
 -	[`13.0.8-fpm-alpine`, `13.0-fpm-alpine`, `13-fpm-alpine`, `production-fpm-alpine` (*13.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/13.0/fpm-alpine/Dockerfile)
 -	[`13.0.8-fpm`, `13.0-fpm`, `13-fpm`, `production-fpm` (*13.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/13.0/fpm/Dockerfile)
+-	[`14.0.5RC1-apache`, `14.0.5-rc-apache`, `14.0-rc-apache`, `14-rc-apache`, `14.0.5RC1`, `14.0.5-rc`, `14.0-rc`, `14-rc` (*14.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/1999ee264bbb4a7143665dba930d2a9cbb777037/14.0-rc/apache/Dockerfile)
+-	[`14.0.5RC1-fpm-alpine`, `14.0.5-rc-fpm-alpine`, `14.0-rc-fpm-alpine`, `14-rc-fpm-alpine` (*14.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/1999ee264bbb4a7143665dba930d2a9cbb777037/14.0-rc/fpm-alpine/Dockerfile)
+-	[`14.0.5RC1-fpm`, `14.0.5-rc-fpm`, `14.0-rc-fpm`, `14-rc-fpm` (*14.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/1999ee264bbb4a7143665dba930d2a9cbb777037/14.0-rc/fpm/Dockerfile)
 -	[`14.0.4-apache`, `14.0-apache`, `14-apache`, `stable-apache`, `14.0.4`, `14.0`, `14`, `stable` (*14.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/14.0/apache/Dockerfile)
 -	[`14.0.4-fpm-alpine`, `14.0-fpm-alpine`, `14-fpm-alpine`, `stable-fpm-alpine` (*14.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/14.0/fpm-alpine/Dockerfile)
 -	[`14.0.4-fpm`, `14.0-fpm`, `14-fpm`, `stable-fpm` (*14.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/14.0/fpm/Dockerfile)
+-	[`15.0.1RC1-apache`, `15.0.1-rc-apache`, `15.0-rc-apache`, `15-rc-apache`, `rc-apache`, `15.0.1RC1`, `15.0.1-rc`, `15.0-rc`, `15-rc`, `rc` (*15.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/e7d2df22ad03a800a76f85b15eea471663d92ebe/15.0-rc/apache/Dockerfile)
+-	[`15.0.1RC1-fpm-alpine`, `15.0.1-rc-fpm-alpine`, `15.0-rc-fpm-alpine`, `15-rc-fpm-alpine`, `rc-fpm-alpine` (*15.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/e7d2df22ad03a800a76f85b15eea471663d92ebe/15.0-rc/fpm-alpine/Dockerfile)
+-	[`15.0.1RC1-fpm`, `15.0.1-rc-fpm`, `15.0-rc-fpm`, `15-rc-fpm`, `rc-fpm` (*15.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/e7d2df22ad03a800a76f85b15eea471663d92ebe/15.0-rc/fpm/Dockerfile)
 -	[`15.0.0-apache`, `15.0-apache`, `15-apache`, `apache`, `15.0.0`, `15.0`, `15`, `latest` (*15.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/15.0/apache/Dockerfile)
 -	[`15.0.0-fpm-alpine`, `15.0-fpm-alpine`, `15-fpm-alpine`, `fpm-alpine` (*15.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/15.0/fpm-alpine/Dockerfile)
 -	[`15.0.0-fpm`, `15.0-fpm`, `15-fpm`, `fpm` (*15.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/15.0/fpm/Dockerfile)
diff --git a/openjdk/README.md b/openjdk/README.md
index 2b663805048a..55454eefa144 100644
--- a/openjdk/README.md
+++ b/openjdk/README.md
@@ -18,18 +18,18 @@ WARNING:
 
 ## Simple Tags
 
--	[`13-ea-1-jdk-oraclelinux7`, `13-ea-1-oraclelinux7`, `13-ea-jdk-oraclelinux7`, `13-ea-oraclelinux7`, `13-jdk-oraclelinux7`, `13-oraclelinux7`, `13-ea-1-jdk-oracle`, `13-ea-1-oracle`, `13-ea-jdk-oracle`, `13-ea-oracle`, `13-jdk-oracle`, `13-oracle`, `13-ea-1-jdk`, `13-ea-1`, `13-ea-jdk`, `13-ea`, `13-jdk`, `13` (*13/jdk/oracle/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/oracle/Dockerfile)
+-	[`13-ea-2-jdk-oraclelinux7`, `13-ea-2-oraclelinux7`, `13-ea-jdk-oraclelinux7`, `13-ea-oraclelinux7`, `13-jdk-oraclelinux7`, `13-oraclelinux7`, `13-ea-2-jdk-oracle`, `13-ea-2-oracle`, `13-ea-jdk-oracle`, `13-ea-oracle`, `13-jdk-oracle`, `13-oracle`, `13-ea-2-jdk`, `13-ea-2`, `13-ea-jdk`, `13-ea`, `13-jdk`, `13` (*13/jdk/oracle/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/oracle/Dockerfile)
 -	[`13-ea-1-jdk-alpine3.8`, `13-ea-1-alpine3.8`, `13-ea-jdk-alpine3.8`, `13-ea-alpine3.8`, `13-jdk-alpine3.8`, `13-alpine3.8`, `13-ea-1-jdk-alpine`, `13-ea-1-alpine`, `13-ea-jdk-alpine`, `13-ea-alpine`, `13-jdk-alpine`, `13-alpine` (*13/jdk/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/alpine/Dockerfile)
--	[`13-ea-1-jdk-windowsservercore-ltsc2016`, `13-ea-1-windowsservercore-ltsc2016`, `13-ea-jdk-windowsservercore-ltsc2016`, `13-ea-windowsservercore-ltsc2016`, `13-jdk-windowsservercore-ltsc2016`, `13-windowsservercore-ltsc2016` (*13/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
--	[`13-ea-1-jdk-windowsservercore-1709`, `13-ea-1-windowsservercore-1709`, `13-ea-jdk-windowsservercore-1709`, `13-ea-windowsservercore-1709`, `13-jdk-windowsservercore-1709`, `13-windowsservercore-1709` (*13/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-1709/Dockerfile)
--	[`13-ea-1-jdk-windowsservercore-1803`, `13-ea-1-windowsservercore-1803`, `13-ea-jdk-windowsservercore-1803`, `13-ea-windowsservercore-1803`, `13-jdk-windowsservercore-1803`, `13-windowsservercore-1803` (*13/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-1803/Dockerfile)
--	[`13-ea-1-jdk-nanoserver-sac2016`, `13-ea-1-nanoserver-sac2016`, `13-ea-jdk-nanoserver-sac2016`, `13-ea-nanoserver-sac2016`, `13-jdk-nanoserver-sac2016`, `13-nanoserver-sac2016` (*13/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/nanoserver-sac2016/Dockerfile)
--	[`12-ea-25-jdk-oraclelinux7`, `12-ea-25-oraclelinux7`, `12-ea-jdk-oraclelinux7`, `12-ea-oraclelinux7`, `12-jdk-oraclelinux7`, `12-oraclelinux7`, `12-ea-25-jdk-oracle`, `12-ea-25-oracle`, `12-ea-jdk-oracle`, `12-ea-oracle`, `12-jdk-oracle`, `12-oracle`, `12-ea-25-jdk`, `12-ea-25`, `12-ea-jdk`, `12-ea`, `12-jdk`, `12` (*12/jdk/oracle/Dockerfile*)](https://github.com/docker-library/openjdk/blob/6f7c70eb527c39c3f315454b84fe0f776aa019fb/12/jdk/oracle/Dockerfile)
+-	[`13-ea-2-jdk-windowsservercore-ltsc2016`, `13-ea-2-windowsservercore-ltsc2016`, `13-ea-jdk-windowsservercore-ltsc2016`, `13-ea-windowsservercore-ltsc2016`, `13-jdk-windowsservercore-ltsc2016`, `13-windowsservercore-ltsc2016` (*13/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`13-ea-2-jdk-windowsservercore-1709`, `13-ea-2-windowsservercore-1709`, `13-ea-jdk-windowsservercore-1709`, `13-ea-windowsservercore-1709`, `13-jdk-windowsservercore-1709`, `13-windowsservercore-1709` (*13/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-1709/Dockerfile)
+-	[`13-ea-2-jdk-windowsservercore-1803`, `13-ea-2-windowsservercore-1803`, `13-ea-jdk-windowsservercore-1803`, `13-ea-windowsservercore-1803`, `13-jdk-windowsservercore-1803`, `13-windowsservercore-1803` (*13/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-1803/Dockerfile)
+-	[`13-ea-2-jdk-nanoserver-sac2016`, `13-ea-2-nanoserver-sac2016`, `13-ea-jdk-nanoserver-sac2016`, `13-ea-nanoserver-sac2016`, `13-jdk-nanoserver-sac2016`, `13-nanoserver-sac2016` (*13/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/nanoserver-sac2016/Dockerfile)
+-	[`12-ea-26-jdk-oraclelinux7`, `12-ea-26-oraclelinux7`, `12-ea-jdk-oraclelinux7`, `12-ea-oraclelinux7`, `12-jdk-oraclelinux7`, `12-oraclelinux7`, `12-ea-26-jdk-oracle`, `12-ea-26-oracle`, `12-ea-jdk-oracle`, `12-ea-oracle`, `12-jdk-oracle`, `12-oracle`, `12-ea-26-jdk`, `12-ea-26`, `12-ea-jdk`, `12-ea`, `12-jdk`, `12` (*12/jdk/oracle/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/oracle/Dockerfile)
 -	[`12-ea-25-jdk-alpine3.8`, `12-ea-25-alpine3.8`, `12-ea-jdk-alpine3.8`, `12-ea-alpine3.8`, `12-jdk-alpine3.8`, `12-alpine3.8`, `12-ea-25-jdk-alpine`, `12-ea-25-alpine`, `12-ea-jdk-alpine`, `12-ea-alpine`, `12-jdk-alpine`, `12-alpine` (*12/jdk/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/25c0a52bf0c70eafc6341bdb621580f4f282e1a1/12/jdk/alpine/Dockerfile)
--	[`12-ea-25-jdk-windowsservercore-ltsc2016`, `12-ea-25-windowsservercore-ltsc2016`, `12-ea-jdk-windowsservercore-ltsc2016`, `12-ea-windowsservercore-ltsc2016`, `12-jdk-windowsservercore-ltsc2016`, `12-windowsservercore-ltsc2016` (*12/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
--	[`12-ea-25-jdk-windowsservercore-1709`, `12-ea-25-windowsservercore-1709`, `12-ea-jdk-windowsservercore-1709`, `12-ea-windowsservercore-1709`, `12-jdk-windowsservercore-1709`, `12-windowsservercore-1709` (*12/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-1709/Dockerfile)
--	[`12-ea-25-jdk-windowsservercore-1803`, `12-ea-25-windowsservercore-1803`, `12-ea-jdk-windowsservercore-1803`, `12-ea-windowsservercore-1803`, `12-jdk-windowsservercore-1803`, `12-windowsservercore-1803` (*12/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-1803/Dockerfile)
--	[`12-ea-25-jdk-nanoserver-sac2016`, `12-ea-25-nanoserver-sac2016`, `12-ea-jdk-nanoserver-sac2016`, `12-ea-nanoserver-sac2016`, `12-jdk-nanoserver-sac2016`, `12-nanoserver-sac2016` (*12/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/3057ebcdbe57f042e13274a0a87c79a81f8f2dfc/12/jdk/windows/nanoserver-sac2016/Dockerfile)
+-	[`12-ea-26-jdk-windowsservercore-ltsc2016`, `12-ea-26-windowsservercore-ltsc2016`, `12-ea-jdk-windowsservercore-ltsc2016`, `12-ea-windowsservercore-ltsc2016`, `12-jdk-windowsservercore-ltsc2016`, `12-windowsservercore-ltsc2016` (*12/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`12-ea-26-jdk-windowsservercore-1709`, `12-ea-26-windowsservercore-1709`, `12-ea-jdk-windowsservercore-1709`, `12-ea-windowsservercore-1709`, `12-jdk-windowsservercore-1709`, `12-windowsservercore-1709` (*12/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-1709/Dockerfile)
+-	[`12-ea-26-jdk-windowsservercore-1803`, `12-ea-26-windowsservercore-1803`, `12-ea-jdk-windowsservercore-1803`, `12-ea-windowsservercore-1803`, `12-jdk-windowsservercore-1803`, `12-windowsservercore-1803` (*12/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-1803/Dockerfile)
+-	[`12-ea-26-jdk-nanoserver-sac2016`, `12-ea-26-nanoserver-sac2016`, `12-ea-jdk-nanoserver-sac2016`, `12-ea-nanoserver-sac2016`, `12-jdk-nanoserver-sac2016`, `12-nanoserver-sac2016` (*12/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/nanoserver-sac2016/Dockerfile)
 -	[`11.0.1-jdk-oraclelinux7`, `11.0.1-oraclelinux7`, `11.0-jdk-oraclelinux7`, `11.0-oraclelinux7`, `11-jdk-oraclelinux7`, `11-oraclelinux7`, `jdk-oraclelinux7`, `oraclelinux7`, `11.0.1-jdk-oracle`, `11.0.1-oracle`, `11.0-jdk-oracle`, `11.0-oracle`, `11-jdk-oracle`, `11-oracle`, `jdk-oracle`, `oracle` (*11/jdk/oracle/Dockerfile*)](https://github.com/docker-library/openjdk/blob/1ba292401cda0ed0b0c706c86b55d03dd5e27c5c/11/jdk/oracle/Dockerfile)
 -	[`11.0.1-jdk-stretch`, `11.0.1-stretch`, `11.0-jdk-stretch`, `11.0-stretch`, `11-jdk-stretch`, `11-stretch`, `jdk-stretch`, `stretch`, `11.0.1-jdk`, `11.0.1`, `11.0-jdk`, `11.0`, `11-jdk`, `11`, `jdk`, `latest` (*11/jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/258870647c5a4281c4cc81d0d17b6fd95bcf4141/11/jdk/Dockerfile)
 -	[`11.0.1-jdk-slim-stretch`, `11.0.1-slim-stretch`, `11.0-jdk-slim-stretch`, `11.0-slim-stretch`, `11-jdk-slim-stretch`, `11-slim-stretch`, `jdk-slim-stretch`, `slim-stretch`, `11.0.1-jdk-slim`, `11.0.1-slim`, `11.0-jdk-slim`, `11.0-slim`, `11-jdk-slim`, `11-slim`, `jdk-slim`, `slim` (*11/jdk/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/258870647c5a4281c4cc81d0d17b6fd95bcf4141/11/jdk/slim/Dockerfile)
@@ -58,18 +58,18 @@ WARNING:
 
 ## Shared Tags
 
--	`13-ea-1-jdk-windowsservercore`, `13-ea-1-windowsservercore`, `13-ea-jdk-windowsservercore`, `13-ea-windowsservercore`, `13-jdk-windowsservercore`, `13-windowsservercore`:
-	-	[`13-ea-1-jdk-windowsservercore-ltsc2016` (*13/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
-	-	[`13-ea-1-jdk-windowsservercore-1709` (*13/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-1709/Dockerfile)
-	-	[`13-ea-1-jdk-windowsservercore-1803` (*13/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/windowsservercore-1803/Dockerfile)
--	`13-ea-1-jdk-nanoserver`, `13-ea-1-nanoserver`, `13-ea-jdk-nanoserver`, `13-ea-nanoserver`, `13-jdk-nanoserver`, `13-nanoserver`:
-	-	[`13-ea-1-jdk-nanoserver-sac2016` (*13/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/db97c023c9f036d5e4df5fd9d1e5d21bdbabccce/13/jdk/windows/nanoserver-sac2016/Dockerfile)
--	`12-ea-25-jdk-windowsservercore`, `12-ea-25-windowsservercore`, `12-ea-jdk-windowsservercore`, `12-ea-windowsservercore`, `12-jdk-windowsservercore`, `12-windowsservercore`:
-	-	[`12-ea-25-jdk-windowsservercore-ltsc2016` (*12/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
-	-	[`12-ea-25-jdk-windowsservercore-1709` (*12/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-1709/Dockerfile)
-	-	[`12-ea-25-jdk-windowsservercore-1803` (*12/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/12/jdk/windows/windowsservercore-1803/Dockerfile)
--	`12-ea-25-jdk-nanoserver`, `12-ea-25-nanoserver`, `12-ea-jdk-nanoserver`, `12-ea-nanoserver`, `12-jdk-nanoserver`, `12-nanoserver`:
-	-	[`12-ea-25-jdk-nanoserver-sac2016` (*12/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/3057ebcdbe57f042e13274a0a87c79a81f8f2dfc/12/jdk/windows/nanoserver-sac2016/Dockerfile)
+-	`13-ea-2-jdk-windowsservercore`, `13-ea-2-windowsservercore`, `13-ea-jdk-windowsservercore`, `13-ea-windowsservercore`, `13-jdk-windowsservercore`, `13-windowsservercore`:
+	-	[`13-ea-2-jdk-windowsservercore-ltsc2016` (*13/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`13-ea-2-jdk-windowsservercore-1709` (*13/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-1709/Dockerfile)
+	-	[`13-ea-2-jdk-windowsservercore-1803` (*13/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/windowsservercore-1803/Dockerfile)
+-	`13-ea-2-jdk-nanoserver`, `13-ea-2-nanoserver`, `13-ea-jdk-nanoserver`, `13-ea-nanoserver`, `13-jdk-nanoserver`, `13-nanoserver`:
+	-	[`13-ea-2-jdk-nanoserver-sac2016` (*13/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/48b2de7e228dd4435a957172e912a399dbb93732/13/jdk/windows/nanoserver-sac2016/Dockerfile)
+-	`12-ea-26-jdk-windowsservercore`, `12-ea-26-windowsservercore`, `12-ea-jdk-windowsservercore`, `12-ea-windowsservercore`, `12-jdk-windowsservercore`, `12-windowsservercore`:
+	-	[`12-ea-26-jdk-windowsservercore-ltsc2016` (*12/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`12-ea-26-jdk-windowsservercore-1709` (*12/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-1709/Dockerfile)
+	-	[`12-ea-26-jdk-windowsservercore-1803` (*12/jdk/windows/windowsservercore-1803/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/windowsservercore-1803/Dockerfile)
+-	`12-ea-26-jdk-nanoserver`, `12-ea-26-nanoserver`, `12-ea-jdk-nanoserver`, `12-ea-nanoserver`, `12-jdk-nanoserver`, `12-nanoserver`:
+	-	[`12-ea-26-jdk-nanoserver-sac2016` (*12/jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/315ca52801a46e69af557460c7f0232a82582306/12/jdk/windows/nanoserver-sac2016/Dockerfile)
 -	`11.0.1-jdk-windowsservercore`, `11.0.1-windowsservercore`, `11.0-jdk-windowsservercore`, `11.0-windowsservercore`, `11-jdk-windowsservercore`, `11-windowsservercore`, `jdk-windowsservercore`, `windowsservercore`:
 	-	[`11.0.1-jdk-windowsservercore-ltsc2016` (*11/jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 	-	[`11.0.1-jdk-windowsservercore-1709` (*11/jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/d5214d1dd5be1fc53dae2dd35c852aaab6ace299/11/jdk/windows/windowsservercore-1709/Dockerfile)
diff --git a/php/README.md b/php/README.md
index fcd26d5e9928..3c747eb5618e 100644
--- a/php/README.md
+++ b/php/README.md
@@ -41,17 +41,6 @@ WARNING:
 -	[`7.1.25-cli-alpine3.8`, `7.1-cli-alpine3.8`, `7.1.25-alpine3.8`, `7.1-alpine3.8`, `7.1.25-cli-alpine`, `7.1-cli-alpine`, `7.1.25-alpine`, `7.1-alpine` (*7.1/alpine3.8/cli/Dockerfile*)](https://github.com/docker-library/php/blob/4fa4c526cf52725f859d7067006e8d4b3c226a52/7.1/alpine3.8/cli/Dockerfile)
 -	[`7.1.25-fpm-alpine3.8`, `7.1-fpm-alpine3.8`, `7.1.25-fpm-alpine`, `7.1-fpm-alpine` (*7.1/alpine3.8/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/4fa4c526cf52725f859d7067006e8d4b3c226a52/7.1/alpine3.8/fpm/Dockerfile)
 -	[`7.1.25-zts-alpine3.8`, `7.1-zts-alpine3.8`, `7.1.25-zts-alpine`, `7.1-zts-alpine` (*7.1/alpine3.8/zts/Dockerfile*)](https://github.com/docker-library/php/blob/4fa4c526cf52725f859d7067006e8d4b3c226a52/7.1/alpine3.8/zts/Dockerfile)
--	[`7.0.33-cli-stretch`, `7.0-cli-stretch`, `7.0.33-stretch`, `7.0-stretch`, `7.0.33-cli`, `7.0-cli`, `7.0.33`, `7.0` (*7.0/stretch/cli/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/stretch/cli/Dockerfile)
--	[`7.0.33-apache-stretch`, `7.0-apache-stretch`, `7.0.33-apache`, `7.0-apache` (*7.0/stretch/apache/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/stretch/apache/Dockerfile)
--	[`7.0.33-fpm-stretch`, `7.0-fpm-stretch`, `7.0.33-fpm`, `7.0-fpm` (*7.0/stretch/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/stretch/fpm/Dockerfile)
--	[`7.0.33-zts-stretch`, `7.0-zts-stretch`, `7.0.33-zts`, `7.0-zts` (*7.0/stretch/zts/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/stretch/zts/Dockerfile)
--	[`7.0.33-cli-jessie`, `7.0-cli-jessie`, `7.0.33-jessie`, `7.0-jessie` (*7.0/jessie/cli/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/jessie/cli/Dockerfile)
--	[`7.0.33-apache-jessie`, `7.0-apache-jessie` (*7.0/jessie/apache/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/jessie/apache/Dockerfile)
--	[`7.0.33-fpm-jessie`, `7.0-fpm-jessie` (*7.0/jessie/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/jessie/fpm/Dockerfile)
--	[`7.0.33-zts-jessie`, `7.0-zts-jessie` (*7.0/jessie/zts/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/jessie/zts/Dockerfile)
--	[`7.0.33-cli-alpine3.7`, `7.0-cli-alpine3.7`, `7.0.33-alpine3.7`, `7.0-alpine3.7`, `7.0.33-cli-alpine`, `7.0-cli-alpine`, `7.0.33-alpine`, `7.0-alpine` (*7.0/alpine3.7/cli/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/alpine3.7/cli/Dockerfile)
--	[`7.0.33-fpm-alpine3.7`, `7.0-fpm-alpine3.7`, `7.0.33-fpm-alpine`, `7.0-fpm-alpine` (*7.0/alpine3.7/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/alpine3.7/fpm/Dockerfile)
--	[`7.0.33-zts-alpine3.7`, `7.0-zts-alpine3.7`, `7.0.33-zts-alpine`, `7.0-zts-alpine` (*7.0/alpine3.7/zts/Dockerfile*)](https://github.com/docker-library/php/blob/b4319e8f767f1200c9013e08baf2c34b9c84e301/7.0/alpine3.7/zts/Dockerfile)
 
 # Quick reference
 
diff --git a/ruby/README.md b/ruby/README.md
index 53083b0e304f..836d5f6f0fc5 100644
--- a/ruby/README.md
+++ b/ruby/README.md
@@ -16,26 +16,26 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2.6.0-stretch`, `2.6-stretch`, `2-stretch`, `stretch`, `2.6.0`, `2.6`, `2`, `latest` (*2.6/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/3c52e456a323e12f76639993ae2bcf0429193cdd/2.6/stretch/Dockerfile)
--	[`2.6.0-slim-stretch`, `2.6-slim-stretch`, `2-slim-stretch`, `slim-stretch`, `2.6.0-slim`, `2.6-slim`, `2-slim`, `slim` (*2.6/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/3c52e456a323e12f76639993ae2bcf0429193cdd/2.6/stretch/slim/Dockerfile)
--	[`2.6.0-alpine3.8`, `2.6-alpine3.8`, `2-alpine3.8`, `alpine3.8`, `2.6.0-alpine`, `2.6-alpine`, `2-alpine`, `alpine` (*2.6/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/3c52e456a323e12f76639993ae2bcf0429193cdd/2.6/alpine3.8/Dockerfile)
--	[`2.6.0-alpine3.7`, `2.6-alpine3.7`, `2-alpine3.7`, `alpine3.7` (*2.6/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/3c52e456a323e12f76639993ae2bcf0429193cdd/2.6/alpine3.7/Dockerfile)
--	[`2.5.3-stretch`, `2.5-stretch`, `2.5.3`, `2.5` (*2.5/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/9a8e858e5d031266333cf79593b8581d32dd1b73/2.5/stretch/Dockerfile)
--	[`2.5.3-slim-stretch`, `2.5-slim-stretch`, `2.5.3-slim`, `2.5-slim` (*2.5/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/9a8e858e5d031266333cf79593b8581d32dd1b73/2.5/stretch/slim/Dockerfile)
--	[`2.5.3-alpine3.8`, `2.5-alpine3.8`, `2.5.3-alpine`, `2.5-alpine` (*2.5/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/9a8e858e5d031266333cf79593b8581d32dd1b73/2.5/alpine3.8/Dockerfile)
--	[`2.5.3-alpine3.7`, `2.5-alpine3.7` (*2.5/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/9a8e858e5d031266333cf79593b8581d32dd1b73/2.5/alpine3.7/Dockerfile)
--	[`2.4.5-stretch`, `2.4-stretch`, `2.4.5`, `2.4` (*2.4/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/stretch/Dockerfile)
--	[`2.4.5-slim-stretch`, `2.4-slim-stretch`, `2.4.5-slim`, `2.4-slim` (*2.4/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/stretch/slim/Dockerfile)
--	[`2.4.5-jessie`, `2.4-jessie` (*2.4/jessie/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/jessie/Dockerfile)
--	[`2.4.5-slim-jessie`, `2.4-slim-jessie` (*2.4/jessie/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/jessie/slim/Dockerfile)
--	[`2.4.5-alpine3.8`, `2.4-alpine3.8`, `2.4.5-alpine`, `2.4-alpine` (*2.4/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/alpine3.8/Dockerfile)
--	[`2.4.5-alpine3.7`, `2.4-alpine3.7` (*2.4/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d/2.4/alpine3.7/Dockerfile)
--	[`2.3.8-stretch`, `2.3-stretch`, `2.3.8`, `2.3` (*2.3/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/stretch/Dockerfile)
--	[`2.3.8-slim-stretch`, `2.3-slim-stretch`, `2.3.8-slim`, `2.3-slim` (*2.3/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/stretch/slim/Dockerfile)
--	[`2.3.8-jessie`, `2.3-jessie` (*2.3/jessie/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/jessie/Dockerfile)
--	[`2.3.8-slim-jessie`, `2.3-slim-jessie` (*2.3/jessie/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/jessie/slim/Dockerfile)
--	[`2.3.8-alpine3.8`, `2.3-alpine3.8`, `2.3.8-alpine`, `2.3-alpine` (*2.3/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/alpine3.8/Dockerfile)
--	[`2.3.8-alpine3.7`, `2.3-alpine3.7` (*2.3/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/3e08dc45ad0386783e757d91347c6a61bc21744e/2.3/alpine3.7/Dockerfile)
+-	[`2.6.0-stretch`, `2.6-stretch`, `2-stretch`, `stretch`, `2.6.0`, `2.6`, `2`, `latest` (*2.6/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.6/stretch/Dockerfile)
+-	[`2.6.0-slim-stretch`, `2.6-slim-stretch`, `2-slim-stretch`, `slim-stretch`, `2.6.0-slim`, `2.6-slim`, `2-slim`, `slim` (*2.6/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.6/stretch/slim/Dockerfile)
+-	[`2.6.0-alpine3.8`, `2.6-alpine3.8`, `2-alpine3.8`, `alpine3.8`, `2.6.0-alpine`, `2.6-alpine`, `2-alpine`, `alpine` (*2.6/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.6/alpine3.8/Dockerfile)
+-	[`2.6.0-alpine3.7`, `2.6-alpine3.7`, `2-alpine3.7`, `alpine3.7` (*2.6/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.6/alpine3.7/Dockerfile)
+-	[`2.5.3-stretch`, `2.5-stretch`, `2.5.3`, `2.5` (*2.5/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.5/stretch/Dockerfile)
+-	[`2.5.3-slim-stretch`, `2.5-slim-stretch`, `2.5.3-slim`, `2.5-slim` (*2.5/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.5/stretch/slim/Dockerfile)
+-	[`2.5.3-alpine3.8`, `2.5-alpine3.8`, `2.5.3-alpine`, `2.5-alpine` (*2.5/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.5/alpine3.8/Dockerfile)
+-	[`2.5.3-alpine3.7`, `2.5-alpine3.7` (*2.5/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.5/alpine3.7/Dockerfile)
+-	[`2.4.5-stretch`, `2.4-stretch`, `2.4.5`, `2.4` (*2.4/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/stretch/Dockerfile)
+-	[`2.4.5-slim-stretch`, `2.4-slim-stretch`, `2.4.5-slim`, `2.4-slim` (*2.4/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/stretch/slim/Dockerfile)
+-	[`2.4.5-jessie`, `2.4-jessie` (*2.4/jessie/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/jessie/Dockerfile)
+-	[`2.4.5-slim-jessie`, `2.4-slim-jessie` (*2.4/jessie/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/jessie/slim/Dockerfile)
+-	[`2.4.5-alpine3.8`, `2.4-alpine3.8`, `2.4.5-alpine`, `2.4-alpine` (*2.4/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/alpine3.8/Dockerfile)
+-	[`2.4.5-alpine3.7`, `2.4-alpine3.7` (*2.4/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.4/alpine3.7/Dockerfile)
+-	[`2.3.8-stretch`, `2.3-stretch`, `2.3.8`, `2.3` (*2.3/stretch/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/stretch/Dockerfile)
+-	[`2.3.8-slim-stretch`, `2.3-slim-stretch`, `2.3.8-slim`, `2.3-slim` (*2.3/stretch/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/stretch/slim/Dockerfile)
+-	[`2.3.8-jessie`, `2.3-jessie` (*2.3/jessie/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/jessie/Dockerfile)
+-	[`2.3.8-slim-jessie`, `2.3-slim-jessie` (*2.3/jessie/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/jessie/slim/Dockerfile)
+-	[`2.3.8-alpine3.8`, `2.3-alpine3.8`, `2.3.8-alpine`, `2.3-alpine` (*2.3/alpine3.8/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/alpine3.8/Dockerfile)
+-	[`2.3.8-alpine3.7`, `2.3-alpine3.7` (*2.3/alpine3.7/Dockerfile*)](https://github.com/docker-library/ruby/blob/84db4691c080384c8fbce44c722d46cedd6a384b/2.3/alpine3.7/Dockerfile)
 
 # Quick reference
 
diff --git a/rust/README.md b/rust/README.md
index 18624d7b1577..bd11919f681d 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -62,12 +62,12 @@ Rust is a systems programming language sponsored by Mozilla Research. It is desi
 The most straightforward way to use this image is to use a Rust container as both the build and runtime environment. In your `Dockerfile`, writing something along the lines of the following will compile and run your project:
 
 ```dockerfile
-FROM rust:1.23.0
+FROM rust:1.31
 
 WORKDIR /usr/src/myapp
 COPY . .
 
-RUN cargo install
+RUN cargo install --path .
 
 CMD ["myapp"]
 ```
diff --git a/traefik/README.md b/traefik/README.md
index 728b05f9ab27..cc0f6506cbb0 100644
--- a/traefik/README.md
+++ b/traefik/README.md
@@ -29,7 +29,7 @@ WARNING:
 	[https://github.com/containous/traefik-library-image/issues](https://github.com/containous/traefik-library-image/issues)
 
 -	**Maintained by**:  
-	[the Træfik Project](https://github.com/containous/traefik-library-image)
+	[the Traefik Project](https://github.com/containous/traefik-library-image)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
 	[`amd64`](https://hub.docker.com/r/amd64/traefik/), [`arm32v6`](https://hub.docker.com/r/arm32v6/traefik/), [`arm64v8`](https://hub.docker.com/r/arm64v8/traefik/), [`windows-amd64`](https://hub.docker.com/r/winamd64/traefik/)
@@ -50,11 +50,11 @@ WARNING:
 
 ![logo](https://raw.githubusercontent.com/docker-library/docs/a6cc2c5f4bc6658168f2a0abbb0307acaefff80e/traefik/logo.png)
 
-[Træfɪk](https://github.com/containous/traefik) is a modern HTTP reverse proxy and load balancer that makes deploying microservices easy.
+[Traefik](https://github.com/containous/traefik) is a modern HTTP reverse proxy and load balancer that makes deploying microservices easy.
 
-Træfik integrates with your existing infrastructure components ([Docker](https://www.docker.com/), [Swarm mode](https://docs.docker.com/engine/swarm/), [Kubernetes](https://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Rancher](https://rancher.com), [Amazon ECS](https://aws.amazon.com/ecs), ...) and configures itself automatically and dynamically.
+Traefik integrates with your existing infrastructure components ([Docker](https://www.docker.com/), [Swarm mode](https://docs.docker.com/engine/swarm/), [Kubernetes](https://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Rancher](https://rancher.com), [Amazon ECS](https://aws.amazon.com/ecs), ...) and configures itself automatically and dynamically.
 
-Telling Træfik where your orchestrator is could be the *only* configuration step you need to do.
+Telling Traefik where your orchestrator is could be the *only* configuration step you need to do.
 
 # Example usage
 
@@ -73,7 +73,7 @@ domain = "docker.local"
 watch = true
 ```
 
-Start Træfɪk:
+Start Traefik:
 
 ```bash
 docker run -d -p 8080:8080 -p 80:80 \
@@ -88,7 +88,7 @@ Start a backend server, named `test`:
 docker run -d --name test emilevauge/whoami
 ```
 
-And finally, you can access to your `whoami` server throught Træfɪk, on the domain name `{containerName}.{configuredDomain}`:
+And finally, you can access to your `whoami` server throught Traefik, on the domain name `{containerName}.{configuredDomain}`:
 
 ```bash
 curl --header 'Host: test.docker.local' 'http://localhost:80/'
@@ -117,7 +117,7 @@ The web UI [http://localhost:8080](http://localhost:8080) will give you an overv
 
 You can find the complete documentation at [https://docs.traefik.io](https://docs.traefik.io).
 
-A collection of contributions around Træfik can be found at [https://awesome.traefik.io](https://awesome.traefik.io).
+A collection of contributions around Traefik can be found at [https://awesome.traefik.io](https://awesome.traefik.io).
 
 # License
 
diff --git a/wordpress/README.md b/wordpress/README.md
index f0f4234f2917..004440ebb811 100644
--- a/wordpress/README.md
+++ b/wordpress/README.md
@@ -16,20 +16,12 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`5.0.2-php5.6-apache`, `5.0-php5.6-apache`, `5-php5.6-apache`, `php5.6-apache`, `5.0.2-php5.6`, `5.0-php5.6`, `5-php5.6`, `php5.6` (*php5.6/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php5.6/apache/Dockerfile)
--	[`5.0.2-php5.6-fpm`, `5.0-php5.6-fpm`, `5-php5.6-fpm`, `php5.6-fpm` (*php5.6/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php5.6/fpm/Dockerfile)
--	[`5.0.2-php5.6-fpm-alpine`, `5.0-php5.6-fpm-alpine`, `5-php5.6-fpm-alpine`, `php5.6-fpm-alpine` (*php5.6/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php5.6/fpm-alpine/Dockerfile)
--	[`5.0.2-php7.0-apache`, `5.0-php7.0-apache`, `5-php7.0-apache`, `php7.0-apache`, `5.0.2-php7.0`, `5.0-php7.0`, `5-php7.0`, `php7.0` (*php7.0/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.0/apache/Dockerfile)
--	[`5.0.2-php7.0-fpm`, `5.0-php7.0-fpm`, `5-php7.0-fpm`, `php7.0-fpm` (*php7.0/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.0/fpm/Dockerfile)
--	[`5.0.2-php7.0-fpm-alpine`, `5.0-php7.0-fpm-alpine`, `5-php7.0-fpm-alpine`, `php7.0-fpm-alpine` (*php7.0/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.0/fpm-alpine/Dockerfile)
 -	[`5.0.2-php7.1-apache`, `5.0-php7.1-apache`, `5-php7.1-apache`, `php7.1-apache`, `5.0.2-php7.1`, `5.0-php7.1`, `5-php7.1`, `php7.1` (*php7.1/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.1/apache/Dockerfile)
 -	[`5.0.2-php7.1-fpm`, `5.0-php7.1-fpm`, `5-php7.1-fpm`, `php7.1-fpm` (*php7.1/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.1/fpm/Dockerfile)
 -	[`5.0.2-php7.1-fpm-alpine`, `5.0-php7.1-fpm-alpine`, `5-php7.1-fpm-alpine`, `php7.1-fpm-alpine` (*php7.1/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.1/fpm-alpine/Dockerfile)
 -	[`5.0.2-apache`, `5.0-apache`, `5-apache`, `apache`, `5.0.2`, `5.0`, `5`, `latest`, `5.0.2-php7.2-apache`, `5.0-php7.2-apache`, `5-php7.2-apache`, `php7.2-apache`, `5.0.2-php7.2`, `5.0-php7.2`, `5-php7.2`, `php7.2` (*php7.2/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.2/apache/Dockerfile)
 -	[`5.0.2-fpm`, `5.0-fpm`, `5-fpm`, `fpm`, `5.0.2-php7.2-fpm`, `5.0-php7.2-fpm`, `5-php7.2-fpm`, `php7.2-fpm` (*php7.2/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.2/fpm/Dockerfile)
 -	[`5.0.2-fpm-alpine`, `5.0-fpm-alpine`, `5-fpm-alpine`, `fpm-alpine`, `5.0.2-php7.2-fpm-alpine`, `5.0-php7.2-fpm-alpine`, `5-php7.2-fpm-alpine`, `php7.2-fpm-alpine` (*php7.2/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f63c0db6593494e8fee0e542af9413e22c1da15b/php7.2/fpm-alpine/Dockerfile)
--	[`cli-2.1.0-php5.6`, `cli-2.1-php5.6`, `cli-2-php5.6`, `cli-php5.6` (*php5.6/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/aecdd7dcc8e9dd923d3096d353fa70d63de26a1b/php5.6/cli/Dockerfile)
--	[`cli-2.1.0-php7.0`, `cli-2.1-php7.0`, `cli-2-php7.0`, `cli-php7.0` (*php7.0/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/aecdd7dcc8e9dd923d3096d353fa70d63de26a1b/php7.0/cli/Dockerfile)
 -	[`cli-2.1.0-php7.1`, `cli-2.1-php7.1`, `cli-2-php7.1`, `cli-php7.1` (*php7.1/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/aecdd7dcc8e9dd923d3096d353fa70d63de26a1b/php7.1/cli/Dockerfile)
 -	[`cli-2.1.0`, `cli-2.1`, `cli-2`, `cli`, `cli-2.1.0-php7.2`, `cli-2.1-php7.2`, `cli-2-php7.2`, `cli-php7.2` (*php7.2/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/aecdd7dcc8e9dd923d3096d353fa70d63de26a1b/php7.2/cli/Dockerfile)