diff --git a/nextcloud/README.md b/nextcloud/README.md
index 06ec1ddce79a..cc756a42281d 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -16,24 +16,24 @@ 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.9RC2-apache`, `13.0.9-rc-apache`, `13.0-rc-apache`, `13-rc-apache`, `13.0.9RC2`, `13.0.9-rc`, `13.0-rc`, `13-rc` (*13.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/d3853330f55561f9026857400be0736c55e74ad6/13.0-rc/apache/Dockerfile)
+-	[`13.0.9RC2-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/d3853330f55561f9026857400be0736c55e74ad6/13.0-rc/fpm-alpine/Dockerfile)
+-	[`13.0.9RC2-fpm`, `13.0.9-rc-fpm`, `13.0-rc-fpm`, `13-rc-fpm` (*13.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/d3853330f55561f9026857400be0736c55e74ad6/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.5RC2-apache`, `14.0.5-rc-apache`, `14.0-rc-apache`, `14-rc-apache`, `14.0.5RC2`, `14.0.5-rc`, `14.0-rc`, `14-rc` (*14.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/ce614ef0d4fbeda849e9d4242769c7d3e36289f4/14.0-rc/apache/Dockerfile)
+-	[`14.0.5RC2-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/ce614ef0d4fbeda849e9d4242769c7d3e36289f4/14.0-rc/fpm-alpine/Dockerfile)
+-	[`14.0.5RC2-fpm`, `14.0.5-rc-fpm`, `14.0-rc-fpm`, `14-rc-fpm` (*14.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/ce614ef0d4fbeda849e9d4242769c7d3e36289f4/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)
+-	[`15.0.1RC2-apache`, `15.0.1-rc-apache`, `15.0-rc-apache`, `15-rc-apache`, `rc-apache`, `15.0.1RC2`, `15.0.1-rc`, `15.0-rc`, `15-rc`, `rc` (*15.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/4db869636b4c44e331f0d910ae0ed7e734087700/15.0-rc/apache/Dockerfile)
+-	[`15.0.1RC2-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/4db869636b4c44e331f0d910ae0ed7e734087700/15.0-rc/fpm-alpine/Dockerfile)
+-	[`15.0.1RC2-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/4db869636b4c44e331f0d910ae0ed7e734087700/15.0-rc/fpm/Dockerfile)
+-	[`15.0.0-apache`, `15.0-apache`, `15-apache`, `15.0.0`, `15.0`, `15` (*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` (*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` (*15.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/31d7dedda906de8c4f387e17be7e16b55cb41031/15.0/fpm/Dockerfile)
 
 # Quick reference
 
diff --git a/wordpress/README.md b/wordpress/README.md
index 004440ebb811..a86cbea0b1f3 100644
--- a/wordpress/README.md
+++ b/wordpress/README.md
@@ -16,14 +16,18 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`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)
+-	[`5.0.3-php7.1-apache`, `5.0-php7.1-apache`, `5-php7.1-apache`, `php7.1-apache`, `5.0.3-php7.1`, `5.0-php7.1`, `5-php7.1`, `php7.1` (*php7.1/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.1/apache/Dockerfile)
+-	[`5.0.3-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/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.1/fpm/Dockerfile)
+-	[`5.0.3-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/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.1/fpm-alpine/Dockerfile)
+-	[`5.0.3-apache`, `5.0-apache`, `5-apache`, `apache`, `5.0.3`, `5.0`, `5`, `latest`, `5.0.3-php7.2-apache`, `5.0-php7.2-apache`, `5-php7.2-apache`, `php7.2-apache`, `5.0.3-php7.2`, `5.0-php7.2`, `5-php7.2`, `php7.2` (*php7.2/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.2/apache/Dockerfile)
+-	[`5.0.3-fpm`, `5.0-fpm`, `5-fpm`, `fpm`, `5.0.3-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/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.2/fpm/Dockerfile)
+-	[`5.0.3-fpm-alpine`, `5.0-fpm-alpine`, `5-fpm-alpine`, `fpm-alpine`, `5.0.3-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/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.2/fpm-alpine/Dockerfile)
+-	[`5.0.3-php7.3-apache`, `5.0-php7.3-apache`, `5-php7.3-apache`, `php7.3-apache`, `5.0.3-php7.3`, `5.0-php7.3`, `5-php7.3`, `php7.3` (*php7.3/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.3/apache/Dockerfile)
+-	[`5.0.3-php7.3-fpm`, `5.0-php7.3-fpm`, `5-php7.3-fpm`, `php7.3-fpm` (*php7.3/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.3/fpm/Dockerfile)
+-	[`5.0.3-php7.3-fpm-alpine`, `5.0-php7.3-fpm-alpine`, `5-php7.3-fpm-alpine`, `php7.3-fpm-alpine` (*php7.3/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d775299ddae6dafa232166f44b7c03d23ddf7bb6/php7.3/fpm-alpine/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)
+-	[`cli-2.1.0-php7.3`, `cli-2.1-php7.3`, `cli-2-php7.3`, `cli-php7.3` (*php7.3/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/f36a09ba86bc6f53326a36975f79bcf35bed7f9b/php7.3/cli/Dockerfile)
 
 # Quick reference