diff --git a/nextcloud/README.md b/nextcloud/README.md
index fc4650409de8..b279b78fe038 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -16,27 +16,18 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`12.0.13RC2-apache`, `12.0.13-rc-apache`, `12.0-rc-apache`, `12-rc-apache`, `12.0.13RC2`, `12.0.13-rc`, `12.0-rc`, `12-rc` (*12.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/12.0-rc/apache/Dockerfile)
--	[`12.0.13RC2-fpm-alpine`, `12.0.13-rc-fpm-alpine`, `12.0-rc-fpm-alpine`, `12-rc-fpm-alpine` (*12.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/12.0-rc/fpm-alpine/Dockerfile)
--	[`12.0.13RC2-fpm`, `12.0.13-rc-fpm`, `12.0-rc-fpm`, `12-rc-fpm` (*12.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/12.0-rc/fpm/Dockerfile)
--	[`12.0.12-apache`, `12.0-apache`, `12-apache`, `12.0.12`, `12.0`, `12` (*12.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/12.0/apache/Dockerfile)
--	[`12.0.12-fpm-alpine`, `12.0-fpm-alpine`, `12-fpm-alpine` (*12.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/12.0/fpm-alpine/Dockerfile)
--	[`12.0.12-fpm`, `12.0-fpm`, `12-fpm` (*12.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/12.0/fpm/Dockerfile)
--	[`13.0.8RC2-apache`, `13.0.8-rc-apache`, `13.0-rc-apache`, `13-rc-apache`, `13.0.8RC2`, `13.0.8-rc`, `13.0-rc`, `13-rc` (*13.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/13.0-rc/apache/Dockerfile)
--	[`13.0.8RC2-fpm-alpine`, `13.0.8-rc-fpm-alpine`, `13.0-rc-fpm-alpine`, `13-rc-fpm-alpine` (*13.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/13.0-rc/fpm-alpine/Dockerfile)
--	[`13.0.8RC2-fpm`, `13.0.8-rc-fpm`, `13.0-rc-fpm`, `13-rc-fpm` (*13.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/13.0-rc/fpm/Dockerfile)
--	[`13.0.7-apache`, `13.0-apache`, `13-apache`, `stable-apache`, `production-apache`, `13.0.7`, `13.0`, `13`, `stable`, `production` (*13.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/13.0/apache/Dockerfile)
--	[`13.0.7-fpm-alpine`, `13.0-fpm-alpine`, `13-fpm-alpine`, `stable-fpm-alpine`, `production-fpm-alpine` (*13.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/13.0/fpm-alpine/Dockerfile)
--	[`13.0.7-fpm`, `13.0-fpm`, `13-fpm`, `stable-fpm`, `production-fpm` (*13.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/13.0/fpm/Dockerfile)
--	[`14.0.4RC2-apache`, `14.0.4-rc-apache`, `14.0-rc-apache`, `14-rc-apache`, `rc-apache`, `14.0.4RC2`, `14.0.4-rc`, `14.0-rc`, `14-rc`, `rc` (*14.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/14.0-rc/apache/Dockerfile)
--	[`14.0.4RC2-fpm-alpine`, `14.0.4-rc-fpm-alpine`, `14.0-rc-fpm-alpine`, `14-rc-fpm-alpine`, `rc-fpm-alpine` (*14.0-rc/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/14.0-rc/fpm-alpine/Dockerfile)
--	[`14.0.4RC2-fpm`, `14.0.4-rc-fpm`, `14.0-rc-fpm`, `14-rc-fpm`, `rc-fpm` (*14.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/b4c914d530e9f309189eaab912244a15561641f7/14.0-rc/fpm/Dockerfile)
--	[`14.0.3-apache`, `14.0-apache`, `14-apache`, `apache`, `14.0.3`, `14.0`, `14`, `latest` (*14.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/14.0/apache/Dockerfile)
--	[`14.0.3-fpm-alpine`, `14.0-fpm-alpine`, `14-fpm-alpine`, `fpm-alpine` (*14.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/14.0/fpm-alpine/Dockerfile)
--	[`14.0.3-fpm`, `14.0-fpm`, `14-fpm`, `fpm` (*14.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/14.0/fpm/Dockerfile)
--	[`15.0.0beta2-apache`, `15.0.0-beta-apache`, `15.0-beta-apache`, `15-beta-apache`, `beta-apache`, `15.0.0beta2`, `15.0.0-beta`, `15.0-beta`, `15-beta`, `beta` (*15.0-beta/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/15.0-beta/apache/Dockerfile)
--	[`15.0.0beta2-fpm-alpine`, `15.0.0-beta-fpm-alpine`, `15.0-beta-fpm-alpine`, `15-beta-fpm-alpine`, `beta-fpm-alpine` (*15.0-beta/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/15.0-beta/fpm-alpine/Dockerfile)
--	[`15.0.0beta2-fpm`, `15.0.0-beta-fpm`, `15.0-beta-fpm`, `15-beta-fpm`, `beta-fpm` (*15.0-beta/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/ae849f190066e68156554d908cce5fa3e38fa05f/15.0-beta/fpm/Dockerfile)
+-	[`12.0.13-apache`, `12.0-apache`, `12-apache`, `12.0.13`, `12.0`, `12` (*12.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/8b7e80cb360facfba81b570a09aa9094b945585b/12.0/apache/Dockerfile)
+-	[`12.0.13-fpm-alpine`, `12.0-fpm-alpine`, `12-fpm-alpine` (*12.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/8b7e80cb360facfba81b570a09aa9094b945585b/12.0/fpm-alpine/Dockerfile)
+-	[`12.0.13-fpm`, `12.0-fpm`, `12-fpm` (*12.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/8b7e80cb360facfba81b570a09aa9094b945585b/12.0/fpm/Dockerfile)
+-	[`13.0.8-apache`, `13.0-apache`, `13-apache`, `13.0.8`, `13.0`, `13` (*13.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/250b44903fc1ae750ffbb8927d8d7a4f07cfaf11/13.0/apache/Dockerfile)
+-	[`13.0.8-fpm-alpine`, `13.0-fpm-alpine`, `13-fpm-alpine` (*13.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/250b44903fc1ae750ffbb8927d8d7a4f07cfaf11/13.0/fpm-alpine/Dockerfile)
+-	[`13.0.8-fpm`, `13.0-fpm`, `13-fpm` (*13.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/250b44903fc1ae750ffbb8927d8d7a4f07cfaf11/13.0/fpm/Dockerfile)
+-	[`14.0.4-apache`, `14.0-apache`, `14-apache`, `apache`, `14.0.4`, `14.0`, `14`, `latest` (*14.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/d6712dc1e9bc9d02eee51956ef568715c76c8969/14.0/apache/Dockerfile)
+-	[`14.0.4-fpm-alpine`, `14.0-fpm-alpine`, `14-fpm-alpine`, `fpm-alpine` (*14.0/fpm-alpine/Dockerfile*)](https://github.com/nextcloud/docker/blob/d6712dc1e9bc9d02eee51956ef568715c76c8969/14.0/fpm-alpine/Dockerfile)
+-	[`14.0.4-fpm`, `14.0-fpm`, `14-fpm`, `fpm` (*14.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/d6712dc1e9bc9d02eee51956ef568715c76c8969/14.0/fpm/Dockerfile)
+-	[`15.0.0RC1-apache`, `15.0.0-rc-apache`, `15.0-rc-apache`, `15-rc-apache`, `rc-apache`, `15.0.0RC1`, `15.0.0-rc`, `15.0-rc`, `15-rc`, `rc` (*15.0-rc/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/9929de89d9adc9e8f4531fc0a90bf3befbdee981/15.0-rc/apache/Dockerfile)
+-	[`15.0.0RC1-fpm-alpine`, `15.0.0-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/9929de89d9adc9e8f4531fc0a90bf3befbdee981/15.0-rc/fpm-alpine/Dockerfile)
+-	[`15.0.0RC1-fpm`, `15.0.0-rc-fpm`, `15.0-rc-fpm`, `15-rc-fpm`, `rc-fpm` (*15.0-rc/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/9929de89d9adc9e8f4531fc0a90bf3befbdee981/15.0-rc/fpm/Dockerfile)
 
 # Quick reference