diff --git a/composer/README.md b/composer/README.md
index ff7a239ea..bb44e8c28 100644
--- a/composer/README.md
+++ b/composer/README.md
@@ -28,7 +28,7 @@ WARNING:
 	[https://github.com/composer/docker/issues](https://github.com/composer/docker/issues)
 
 -	**Maintained by**:  
-	[Composer](https://github.com/composer/docker)
+	[Rob Bast](https://github.com/alcohol), with [contributions](https://github.com/composer/docker/graphs/contributors) from the community.
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
 	[`amd64`](https://hub.docker.com/r/amd64/composer/), [`arm32v6`](https://hub.docker.com/r/arm32v6/composer/), [`arm32v7`](https://hub.docker.com/r/arm32v7/composer/), [`arm64v8`](https://hub.docker.com/r/arm64v8/composer/), [`i386`](https://hub.docker.com/r/i386/composer/), [`ppc64le`](https://hub.docker.com/r/ppc64le/composer/)
@@ -71,7 +71,7 @@ You can bind mount the Composer home directory from your host to the container t
 ```console
 $ docker run --rm --interactive --tty \
   --volume $PWD:/app \
-  --volume $COMPOSER_HOME:/tmp \
+  --volume ${COMPOSER_HOME:-$HOME/.composer}:/tmp \
   composer install
 ```
 
@@ -80,13 +80,11 @@ $ docker run --rm --interactive --tty \
 Or if you are following the XDG specification:
 
 ```console
-$ COMPOSER_HOME=$HOME/.config/composer \
-  COMPOSER_CACHE_DIR=$HOME/.cache/composer \
-  docker run --rm --interactive --tty \
+$ docker run --rm --interactive --tty \
   --env COMPOSER_HOME \
   --env COMPOSER_CACHE_DIR \
-  --volume $COMPOSER_HOME:$COMPOSER_HOME \
-  --volume $COMPOSER_CACHE_DIR:$COMPOSER_CACHE_DIR \
+  --volume ${COMPOSER_HOME:-$HOME/.config/composer}:$COMPOSER_HOME \
+  --volume ${COMPOSER_CACHE_DIR:-$HOME/.cache/composer}:$COMPOSER_CACHE_DIR \
   --volume $PWD:/app \
   composer install
 ```
@@ -107,7 +105,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:
 
 ```console
-$ docker run --rm --interactive --tty \
+$ eval $(ssh-agent); \
+  docker run --rm --interactive --tty \
   --volume $PWD:/app \
   --volume $SSH_AUTH_SOCK:/ssh-auth.sock \
   --env SSH_AUTH_SOCK=/ssh-auth.sock \
@@ -119,7 +118,8 @@ $ docker run --rm --interactive --tty \
 When combining the use of private repositories with running Composer as another user, you might run into non-existent user errors (thrown by ssh). To work around this, simply mount the host passwd and group files (read-only) into the container:
 
 ```console
-$ docker run --rm --interactive --tty \
+$ eval $(ssh-agent); \
+  docker run --rm --interactive --tty \
   --volume $PWD:/app \
   --volume $SSH_AUTH_SOCK:/ssh-auth.sock \
   --volume /etc/passwd:/etc/passwd:ro \
@@ -131,45 +131,15 @@ $ docker run --rm --interactive --tty \
 
 # Troubleshooting
 
-### PHP versions
+### PHP version & extensions
 
-Our image is aimed at quickly running Composer without the need for having a PHP runtime installed. You should not rely on the PHP version in our container. We do not provide a Composer image for each supported PHP version because we do not want to encourage using Composer as a base image or a production image.
+Our image is aimed at quickly running Composer without the need for having a PHP runtime installed on your host. You should not rely on the PHP version in our container. We do not provide a Composer image for each supported PHP version because we do not want to encourage using Composer as a base image or a production image.
+
+We try 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.
 
 Suggestions:
 
--	use [`--ignore-platform-reqs`](https://getcomposer.org/doc/03-cli.md#install-i):
-
-	```console
-	$ composer install --ignore-platform-reqs
-	```
-
--	specify the target [platform](https://getcomposer.org/doc/06-config.md#platform) in your `composer.json`:
-
-	```json
-	{
-	  "config": {
-	    "platform": {
-	      "php": "7.1.3"
-	    }
-	  }
-	}
-	```
-
-### PHP extensions
-
-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.
-
-Suggestions:
-
--	pass the `--ignore-platform-reqs` and / or `--no-scripts` flags to `install` or `update`:
-
-	```console
-	$ docker run --rm --interactive --tty \
-	  --volume $PWD:/app \
-	  composer install --ignore-platform-reqs --no-scripts
-	```
-
--	create your own buid image and [install](https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md) Composer inside it.
+-	(optimal) create your own build image and [install](https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md) Composer inside it.
 
 	**Note:** Docker 17.05 introduced [multi-stage builds](https://docs.docker.com/develop/develop-images/multistage-build/), simplifying this enormously:
 
@@ -177,6 +147,27 @@ Suggestions:
 	COPY --from=composer /usr/bin/composer /usr/bin/composer
 	```
 
+-	(alternatively) specify the target [platform](https://getcomposer.org/doc/06-config.md#platform) / extension(s) in your `composer.json`:
+
+	```json
+	{
+	  "config": {
+	    "platform": {
+	      "php": "MAJOR.MINOR.PATCH",
+	      "ext-something": "1"
+	    }
+	  }
+	}
+	```
+
+-	(discouraged) pass the [`--ignore-platform-reqs`](https://getcomposer.org/doc/03-cli.md#install-i) and / or `--no-scripts` flags to `install` or `update`:
+
+	```console
+	$ docker run --rm --interactive --tty \
+	  --volume $PWD:/app \
+	  composer install --ignore-platform-reqs --no-scripts
+	```
+
 # License
 
 View [license information](https://github.com/composer/composer/blob/master/LICENSE) for the software contained in this image.
diff --git a/haxe/README.md b/haxe/README.md
index 3d484b93d..dcf785f4a 100644
--- a/haxe/README.md
+++ b/haxe/README.md
@@ -16,37 +16,82 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.4.7-stretch`, `3.4-stretch`, `3.4.7`, `3.4`, `latest`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.4/stretch/Dockerfile)
+## Simple Tags
+
+-	[`3.4.7-buster`, `3.4-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.4/buster/Dockerfile)
+-	[`3.4.7-stretch`, `3.4-stretch`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.4/stretch/Dockerfile)
 -	[`3.4.7-jessie`, `3.4-jessie`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d94c754a343676aede20497b5d28e8264e446ca6/3.4/jessie/Dockerfile)
--	[`3.4.7-windowsservercore-ltsc2016`, `3.4-windowsservercore-ltsc2016`, `3.4.7-windowsservercore`, `3.4-windowsservercore`](https://github.com/HaxeFoundation/docker-library-haxe/blob/5253ae458dec8d641082674de522a055f245a62e/3.4/windowsservercore-ltsc2016/Dockerfile)
--	[`3.4.7-alpine3.9`, `3.4-alpine3.9`, `3.4.7-alpine`, `3.4-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.4/alpine3.9/Dockerfile)
+-	[`3.4.7-windowsservercore-1803`, `3.4-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-1803/Dockerfile)
+-	[`3.4.7-windowsservercore-ltsc2016`, `3.4-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.4.7-alpine3.10`, `3.4-alpine3.10`, `3.4.7-alpine`, `3.4-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.4/alpine3.10/Dockerfile)
+-	[`3.4.7-alpine3.9`, `3.4-alpine3.9`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.4/alpine3.9/Dockerfile)
 -	[`3.4.7-alpine3.8`, `3.4-alpine3.8`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.4/alpine3.8/Dockerfile)
 -	[`3.4.7-alpine3.7`, `3.4-alpine3.7`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.4/alpine3.7/Dockerfile)
--	[`3.4.7-alpine3.6`, `3.4-alpine3.6`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.4/alpine3.6/Dockerfile)
--	[`3.3.0-rc.1-stretch`, `3.3.0-stretch`, `3.3-stretch`, `3.3.0-rc.1`, `3.3.0`, `3.3`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.3/stretch/Dockerfile)
+-	[`3.3.0-rc.1-buster`, `3.3.0-buster`, `3.3-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.3/buster/Dockerfile)
+-	[`3.3.0-rc.1-stretch`, `3.3.0-stretch`, `3.3-stretch`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.3/stretch/Dockerfile)
 -	[`3.3.0-rc.1-jessie`, `3.3.0-jessie`, `3.3-jessie`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d94c754a343676aede20497b5d28e8264e446ca6/3.3/jessie/Dockerfile)
--	[`3.3.0-rc.1-windowsservercore-ltsc2016`, `3.3.0-windowsservercore-ltsc2016`, `3.3-windowsservercore-ltsc2016`, `3.3.0-rc.1-windowsservercore`, `3.3.0-windowsservercore`, `3.3-windowsservercore`](https://github.com/HaxeFoundation/docker-library-haxe/blob/5253ae458dec8d641082674de522a055f245a62e/3.3/windowsservercore-ltsc2016/Dockerfile)
--	[`3.3.0-rc.1-alpine3.9`, `3.3.0-rc.1-alpine`, `3.3.0-alpine3.9`, `3.3-alpine3.9`, `3.3.0-alpine`, `3.3-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.3/alpine3.9/Dockerfile)
+-	[`3.3.0-rc.1-windowsservercore-1803`, `3.3.0-windowsservercore-1803`, `3.3-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-1803/Dockerfile)
+-	[`3.3.0-rc.1-windowsservercore-ltsc2016`, `3.3.0-windowsservercore-ltsc2016`, `3.3-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.3.0-rc.1-alpine3.10`, `3.3.0-rc.1-alpine`, `3.3.0-alpine3.10`, `3.3-alpine3.10`, `3.3.0-alpine`, `3.3-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.3/alpine3.10/Dockerfile)
+-	[`3.3.0-rc.1-alpine3.9`, `3.3.0-alpine3.9`, `3.3-alpine3.9`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.3/alpine3.9/Dockerfile)
 -	[`3.3.0-rc.1-alpine3.8`, `3.3.0-alpine3.8`, `3.3-alpine3.8`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.3/alpine3.8/Dockerfile)
 -	[`3.3.0-rc.1-alpine3.7`, `3.3.0-alpine3.7`, `3.3-alpine3.7`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.3/alpine3.7/Dockerfile)
--	[`3.3.0-rc.1-alpine3.6`, `3.3.0-alpine3.6`, `3.3-alpine3.6`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.3/alpine3.6/Dockerfile)
--	[`3.2.1-stretch`, `3.2-stretch`, `3.2.1`, `3.2`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.2/stretch/Dockerfile)
+-	[`3.2.1-buster`, `3.2-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.2/buster/Dockerfile)
+-	[`3.2.1-stretch`, `3.2-stretch`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.2/stretch/Dockerfile)
 -	[`3.2.1-jessie`, `3.2-jessie`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d94c754a343676aede20497b5d28e8264e446ca6/3.2/jessie/Dockerfile)
--	[`3.2.1-windowsservercore-ltsc2016`, `3.2-windowsservercore-ltsc2016`, `3.2.1-windowsservercore`, `3.2-windowsservercore`](https://github.com/HaxeFoundation/docker-library-haxe/blob/5253ae458dec8d641082674de522a055f245a62e/3.2/windowsservercore-ltsc2016/Dockerfile)
--	[`3.2.1-alpine3.9`, `3.2-alpine3.9`, `3.2.1-alpine`, `3.2-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.2/alpine3.9/Dockerfile)
+-	[`3.2.1-windowsservercore-1803`, `3.2-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-1803/Dockerfile)
+-	[`3.2.1-windowsservercore-ltsc2016`, `3.2-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.2.1-alpine3.10`, `3.2-alpine3.10`, `3.2.1-alpine`, `3.2-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.2/alpine3.10/Dockerfile)
+-	[`3.2.1-alpine3.9`, `3.2-alpine3.9`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e1f20012ff683a360ce99a0bccfbaf1996246832/3.2/alpine3.9/Dockerfile)
 -	[`3.2.1-alpine3.8`, `3.2-alpine3.8`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.2/alpine3.8/Dockerfile)
 -	[`3.2.1-alpine3.7`, `3.2-alpine3.7`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.2/alpine3.7/Dockerfile)
--	[`3.2.1-alpine3.6`, `3.2-alpine3.6`](https://github.com/HaxeFoundation/docker-library-haxe/blob/63ce668557c6f5afe60bac087ec24f19390f2707/3.2/alpine3.6/Dockerfile)
--	[`3.1.3-stretch`, `3.1-stretch`, `3.1.3`, `3.1`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.1/stretch/Dockerfile)
+-	[`3.1.3-stretch`, `3.1-stretch`](https://github.com/HaxeFoundation/docker-library-haxe/blob/e60ab8c2df98de16d9abfaf90b9227059433fd2e/3.1/stretch/Dockerfile)
 -	[`3.1.3-jessie`, `3.1-jessie`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d94c754a343676aede20497b5d28e8264e446ca6/3.1/jessie/Dockerfile)
--	[`3.1.3-windowsservercore-ltsc2016`, `3.1-windowsservercore-ltsc2016`, `3.1.3-windowsservercore`, `3.1-windowsservercore`](https://github.com/HaxeFoundation/docker-library-haxe/blob/5253ae458dec8d641082674de522a055f245a62e/3.1/windowsservercore-ltsc2016/Dockerfile)
--	[`4.0.0-rc.3-stretch`, `4.0.0-stretch`, `4.0-stretch`, `4.0.0-rc.3`, `4.0.0`, `4.0`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/stretch/Dockerfile)
+-	[`3.1.3-windowsservercore-1803`, `3.1-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.1/windowsservercore-1803/Dockerfile)
+-	[`3.1.3-windowsservercore-ltsc2016`, `3.1-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.1/windowsservercore-ltsc2016/Dockerfile)
+-	[`4.0.0-rc.3-buster`, `4.0.0-buster`, `4.0-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/4.0/buster/Dockerfile)
+-	[`4.0.0-rc.3-stretch`, `4.0.0-stretch`, `4.0-stretch`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/stretch/Dockerfile)
 -	[`4.0.0-rc.3-jessie`, `4.0.0-jessie`, `4.0-jessie`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/jessie/Dockerfile)
--	[`4.0.0-rc.3-windowsservercore-ltsc2016`, `4.0.0-windowsservercore-ltsc2016`, `4.0-windowsservercore-ltsc2016`, `4.0.0-rc.3-windowsservercore`, `4.0.0-windowsservercore`, `4.0-windowsservercore`](https://github.com/HaxeFoundation/docker-library-haxe/blob/5253ae458dec8d641082674de522a055f245a62e/4.0/windowsservercore-ltsc2016/Dockerfile)
--	[`4.0.0-rc.3-alpine3.9`, `4.0.0-rc.3-alpine`, `4.0.0-alpine3.9`, `4.0-alpine3.9`, `4.0.0-alpine`, `4.0-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/alpine3.9/Dockerfile)
+-	[`4.0.0-rc.3-windowsservercore-1803`, `4.0.0-windowsservercore-1803`, `4.0-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-1803/Dockerfile)
+-	[`4.0.0-rc.3-windowsservercore-ltsc2016`, `4.0.0-windowsservercore-ltsc2016`, `4.0-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-ltsc2016/Dockerfile)
+-	[`4.0.0-rc.3-alpine3.10`, `4.0.0-rc.3-alpine`, `4.0.0-alpine3.10`, `4.0-alpine3.10`, `4.0.0-alpine`, `4.0-alpine`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/4.0/alpine3.10/Dockerfile)
+-	[`4.0.0-rc.3-alpine3.9`, `4.0.0-alpine3.9`, `4.0-alpine3.9`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/alpine3.9/Dockerfile)
 -	[`4.0.0-rc.3-alpine3.8`, `4.0.0-alpine3.8`, `4.0-alpine3.8`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/alpine3.8/Dockerfile)
 -	[`4.0.0-rc.3-alpine3.7`, `4.0.0-alpine3.7`, `4.0-alpine3.7`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/alpine3.7/Dockerfile)
--	[`4.0.0-rc.3-alpine3.6`, `4.0.0-alpine3.6`, `4.0-alpine3.6`](https://github.com/HaxeFoundation/docker-library-haxe/blob/cbdd0660674ed25410f08254872805669659bf6c/4.0/alpine3.6/Dockerfile)
+
+## Shared Tags
+
+-	`3.4.7`, `3.4`, `latest`:
+	-	[`3.4.7-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.4/buster/Dockerfile)
+	-	[`3.4.7-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-1803/Dockerfile)
+	-	[`3.4.7-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-ltsc2016/Dockerfile)
+-	`3.4.7-windowsservercore`, `3.4-windowsservercore`:
+	-	[`3.4.7-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-1803/Dockerfile)
+	-	[`3.4.7-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.4/windowsservercore-ltsc2016/Dockerfile)
+-	`3.3.0-rc.1`, `3.3.0`, `3.3`:
+	-	[`3.3.0-rc.1-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.3/buster/Dockerfile)
+	-	[`3.3.0-rc.1-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-1803/Dockerfile)
+	-	[`3.3.0-rc.1-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-ltsc2016/Dockerfile)
+-	`3.3.0-rc.1-windowsservercore`, `3.3.0-windowsservercore`, `3.3-windowsservercore`:
+	-	[`3.3.0-rc.1-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-1803/Dockerfile)
+	-	[`3.3.0-rc.1-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.3/windowsservercore-ltsc2016/Dockerfile)
+-	`3.2.1`, `3.2`:
+	-	[`3.2.1-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/3.2/buster/Dockerfile)
+	-	[`3.2.1-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-1803/Dockerfile)
+	-	[`3.2.1-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-ltsc2016/Dockerfile)
+-	`3.2.1-windowsservercore`, `3.2-windowsservercore`:
+	-	[`3.2.1-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-1803/Dockerfile)
+	-	[`3.2.1-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.2/windowsservercore-ltsc2016/Dockerfile)
+-	`3.1.3-windowsservercore`, `3.1-windowsservercore`, `3.1.3`, `3.1`:
+	-	[`3.1.3-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.1/windowsservercore-1803/Dockerfile)
+	-	[`3.1.3-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/3.1/windowsservercore-ltsc2016/Dockerfile)
+-	`4.0.0-rc.3`, `4.0.0`, `4.0`:
+	-	[`4.0.0-rc.3-buster`](https://github.com/HaxeFoundation/docker-library-haxe/blob/d1948525b8a09b71846fd77d92a9c83162eb5c73/4.0/buster/Dockerfile)
+	-	[`4.0.0-rc.3-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-1803/Dockerfile)
+	-	[`4.0.0-rc.3-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-ltsc2016/Dockerfile)
+-	`4.0.0-rc.3-windowsservercore`, `4.0.0-windowsservercore`, `4.0-windowsservercore`:
+	-	[`4.0.0-rc.3-windowsservercore-1803`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-1803/Dockerfile)
+	-	[`4.0.0-rc.3-windowsservercore-ltsc2016`](https://github.com/HaxeFoundation/docker-library-haxe/blob/535da50f731cecffb631ce5941b7887c5e049855/4.0/windowsservercore-ltsc2016/Dockerfile)
 
 # Quick reference
 
@@ -145,7 +190,7 @@ The `haxe` images come in many flavors, each designed for a specific use case.
 
 This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
 
-Some of these tags may have names like jessie or stretch in them. These are the suite code names for releases of [Debian](https://wiki.debian.org/DebianReleases) and indicate which release the image is based on.
+Some of these tags may have names like buster, jessie, or stretch in them. These are the suite code names for releases of [Debian](https://wiki.debian.org/DebianReleases) and indicate which release the image is based on.
 
 ## `haxe:<version>-windowsservercore`
 
diff --git a/httpd/README.md b/httpd/README.md
index 40b14cd07..428dcad00 100644
--- a/httpd/README.md
+++ b/httpd/README.md
@@ -16,8 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2.4.39`, `2.4`, `2`, `latest`](https://github.com/docker-library/httpd/blob/35430c6d91ee2e4457028bb23b5b9c6151b59d89/2.4/Dockerfile)
--	[`2.4.39-alpine`, `2.4-alpine`, `2-alpine`, `alpine`](https://github.com/docker-library/httpd/blob/be1405819a93f642d218499ee9e7aa8dec4245f9/2.4/alpine/Dockerfile)
+-	[`2.4.39`, `2.4`, `2`, `latest`](https://github.com/docker-library/httpd/blob/4f35d1063ac851ee633bcb2072ab4a9c34bcaefa/2.4/Dockerfile)
+-	[`2.4.39-alpine`, `2.4-alpine`, `2-alpine`, `alpine`](https://github.com/docker-library/httpd/blob/f50f04246dbca7bfda7989692f486860603f4db4/2.4/alpine/Dockerfile)
 
 # Quick reference
 
diff --git a/matomo/README.md b/matomo/README.md
index 6ecfc6c98..a727a1b11 100644
--- a/matomo/README.md
+++ b/matomo/README.md
@@ -16,8 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.10.0-apache`, `3.10-apache`, `3-apache`, `apache`, `3.10.0`, `3.10`, `3`, `latest`](https://github.com/matomo-org/docker/blob/c3bc18c223ee4327acf5506eed3f2ffe517a027a/apache/Dockerfile)
--	[`3.10.0-fpm`, `3.10-fpm`, `3-fpm`, `fpm`](https://github.com/matomo-org/docker/blob/c3bc18c223ee4327acf5506eed3f2ffe517a027a/fpm/Dockerfile)
+-	[`3.10.0-apache`, `3.10-apache`, `3-apache`, `apache`, `3.10.0`, `3.10`, `3`, `latest`](https://github.com/matomo-org/docker/blob/689757368fff698888c004265e4de99d2bb70265/apache/Dockerfile)
+-	[`3.10.0-fpm`, `3.10-fpm`, `3-fpm`, `fpm`](https://github.com/matomo-org/docker/blob/689757368fff698888c004265e4de99d2bb70265/fpm/Dockerfile)
 -	[`3.10.0-fpm-alpine`, `3.10-fpm-alpine`, `3-fpm-alpine`, `fpm-alpine`](https://github.com/matomo-org/docker/blob/c3bc18c223ee4327acf5506eed3f2ffe517a027a/fpm-alpine/Dockerfile)
 
 # Quick reference