diff --git a/hylang/README.md b/hylang/README.md
index 33c69cda0..2a0d8796a 100644
--- a/hylang/README.md
+++ b/hylang/README.md
@@ -28,40 +28,35 @@ WARNING:
 
 ## Simple Tags
 
--	[`0.20.0-python3.8-buster`, `0.20-python3.8-buster`, `0-python3.8-buster`, `python3.8-buster`, `0.20.0-buster`, `0.20-buster`, `0-buster`, `buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-buster)
--	[`0.20.0-python3.8-alpine3.13`, `0.20-python3.8-alpine3.13`, `0-python3.8-alpine3.13`, `python3.8-alpine3.13`, `0.20.0-alpine3.13`, `0.20-alpine3.13`, `0-alpine3.13`, `alpine3.13`, `0.20.0-python3.8-alpine`, `0.20-python3.8-alpine`, `0-python3.8-alpine`, `python3.8-alpine`, `0.20.0-alpine`, `0.20-alpine`, `0-alpine`, `alpine`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-alpine3.13)
--	[`0.20.0-python3.8-alpine3.12`, `0.20-python3.8-alpine3.12`, `0-python3.8-alpine3.12`, `python3.8-alpine3.12`, `0.20.0-alpine3.12`, `0.20-alpine3.12`, `0-alpine3.12`, `alpine3.12`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-alpine3.12)
--	[`0.20.0-python3.8-windowsservercore-1809`, `0.20-python3.8-windowsservercore-1809`, `0-python3.8-windowsservercore-1809`, `python3.8-windowsservercore-1809`, `0.20.0-windowsservercore-1809`, `0.20-windowsservercore-1809`, `0-windowsservercore-1809`, `windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-1809)
--	[`0.20.0-python3.8-windowsservercore-ltsc2016`, `0.20-python3.8-windowsservercore-ltsc2016`, `0-python3.8-windowsservercore-ltsc2016`, `python3.8-windowsservercore-ltsc2016`, `0.20.0-windowsservercore-ltsc2016`, `0.20-windowsservercore-ltsc2016`, `0-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-ltsc2016)
--	[`0.20.0-python3.7-buster`, `0.20-python3.7-buster`, `0-python3.7-buster`, `python3.7-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.7-buster)
--	[`0.20.0-python3.7-stretch`, `0.20-python3.7-stretch`, `0-python3.7-stretch`, `python3.7-stretch`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.7-stretch)
--	[`0.20.0-python3.7-alpine3.13`, `0.20-python3.7-alpine3.13`, `0-python3.7-alpine3.13`, `python3.7-alpine3.13`, `0.20.0-python3.7-alpine`, `0.20-python3.7-alpine`, `0-python3.7-alpine`, `python3.7-alpine`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.7-alpine3.13)
--	[`0.20.0-python3.7-alpine3.12`, `0.20-python3.7-alpine3.12`, `0-python3.7-alpine3.12`, `python3.7-alpine3.12`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.7-alpine3.12)
--	[`0.20.0-python3.6-buster`, `0.20-python3.6-buster`, `0-python3.6-buster`, `python3.6-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.6-buster)
--	[`0.20.0-python3.6-stretch`, `0.20-python3.6-stretch`, `0-python3.6-stretch`, `python3.6-stretch`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.6-stretch)
--	[`0.20.0-python3.6-alpine3.13`, `0.20-python3.6-alpine3.13`, `0-python3.6-alpine3.13`, `python3.6-alpine3.13`, `0.20.0-python3.6-alpine`, `0.20-python3.6-alpine`, `0-python3.6-alpine`, `python3.6-alpine`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.6-alpine3.13)
--	[`0.20.0-python3.6-alpine3.12`, `0.20-python3.6-alpine3.12`, `0-python3.6-alpine3.12`, `python3.6-alpine3.12`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.6-alpine3.12)
--	[`0.20.0-pypy3.7-buster`, `0.20-pypy3.7-buster`, `0-pypy3.7-buster`, `pypy3.7-buster`, `0.20.0-pypy-buster`, `0.20-pypy-buster`, `0-pypy-buster`, `pypy-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.7-buster)
--	[`0.20.0-pypy3.7-windowsservercore-1809`, `0.20-pypy3.7-windowsservercore-1809`, `0-pypy3.7-windowsservercore-1809`, `pypy3.7-windowsservercore-1809`, `0.20.0-pypy-windowsservercore-1809`, `0.20-pypy-windowsservercore-1809`, `0-pypy-windowsservercore-1809`, `pypy-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.7-windowsservercore-1809)
--	[`0.20.0-pypy3.6-buster`, `0.20-pypy3.6-buster`, `0-pypy3.6-buster`, `pypy3.6-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.6-buster)
--	[`0.20.0-pypy3.6-windowsservercore-1809`, `0.20-pypy3.6-windowsservercore-1809`, `0-pypy3.6-windowsservercore-1809`, `pypy3.6-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.6-windowsservercore-1809)
+-	[`0.20.0-python3.8-buster`, `0.20-python3.8-buster`, `0-python3.8-buster`, `python3.8-buster`, `0.20.0-buster`, `0.20-buster`, `0-buster`, `buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-buster)
+-	[`0.20.0-python3.8-alpine3.13`, `0.20-python3.8-alpine3.13`, `0-python3.8-alpine3.13`, `python3.8-alpine3.13`, `0.20.0-alpine3.13`, `0.20-alpine3.13`, `0-alpine3.13`, `alpine3.13`, `0.20.0-python3.8-alpine`, `0.20-python3.8-alpine`, `0-python3.8-alpine`, `python3.8-alpine`, `0.20.0-alpine`, `0.20-alpine`, `0-alpine`, `alpine`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-alpine3.13)
+-	[`0.20.0-python3.8-alpine3.12`, `0.20-python3.8-alpine3.12`, `0-python3.8-alpine3.12`, `python3.8-alpine3.12`, `0.20.0-alpine3.12`, `0.20-alpine3.12`, `0-alpine3.12`, `alpine3.12`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-alpine3.12)
+-	[`0.20.0-python3.8-windowsservercore-1809`, `0.20-python3.8-windowsservercore-1809`, `0-python3.8-windowsservercore-1809`, `python3.8-windowsservercore-1809`, `0.20.0-windowsservercore-1809`, `0.20-windowsservercore-1809`, `0-windowsservercore-1809`, `windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-1809)
+-	[`0.20.0-python3.8-windowsservercore-ltsc2016`, `0.20-python3.8-windowsservercore-ltsc2016`, `0-python3.8-windowsservercore-ltsc2016`, `python3.8-windowsservercore-ltsc2016`, `0.20.0-windowsservercore-ltsc2016`, `0.20-windowsservercore-ltsc2016`, `0-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-ltsc2016)
+-	[`0.20.0-python3.7-buster`, `0.20-python3.7-buster`, `0-python3.7-buster`, `python3.7-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.7-buster)
+-	[`0.20.0-python3.7-stretch`, `0.20-python3.7-stretch`, `0-python3.7-stretch`, `python3.7-stretch`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.7-stretch)
+-	[`0.20.0-python3.7-alpine3.13`, `0.20-python3.7-alpine3.13`, `0-python3.7-alpine3.13`, `python3.7-alpine3.13`, `0.20.0-python3.7-alpine`, `0.20-python3.7-alpine`, `0-python3.7-alpine`, `python3.7-alpine`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.7-alpine3.13)
+-	[`0.20.0-python3.7-alpine3.12`, `0.20-python3.7-alpine3.12`, `0-python3.7-alpine3.12`, `python3.7-alpine3.12`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.7-alpine3.12)
+-	[`0.20.0-python3.6-buster`, `0.20-python3.6-buster`, `0-python3.6-buster`, `python3.6-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.6-buster)
+-	[`0.20.0-python3.6-stretch`, `0.20-python3.6-stretch`, `0-python3.6-stretch`, `python3.6-stretch`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.6-stretch)
+-	[`0.20.0-python3.6-alpine3.13`, `0.20-python3.6-alpine3.13`, `0-python3.6-alpine3.13`, `python3.6-alpine3.13`, `0.20.0-python3.6-alpine`, `0.20-python3.6-alpine`, `0-python3.6-alpine`, `python3.6-alpine`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.6-alpine3.13)
+-	[`0.20.0-python3.6-alpine3.12`, `0.20-python3.6-alpine3.12`, `0-python3.6-alpine3.12`, `python3.6-alpine3.12`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.6-alpine3.12)
+-	[`0.20.0-pypy3.7-buster`, `0.20-pypy3.7-buster`, `0-pypy3.7-buster`, `pypy3.7-buster`, `0.20.0-pypy-buster`, `0.20-pypy-buster`, `0-pypy-buster`, `pypy-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.pypy3.7-buster)
+-	[`0.20.0-pypy3.7-windowsservercore-1809`, `0.20-pypy3.7-windowsservercore-1809`, `0-pypy3.7-windowsservercore-1809`, `pypy3.7-windowsservercore-1809`, `0.20.0-pypy-windowsservercore-1809`, `0.20-pypy-windowsservercore-1809`, `0-pypy-windowsservercore-1809`, `pypy-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.pypy3.7-windowsservercore-1809)
 
 ## Shared Tags
 
 -	`0.20.0-python3.8`, `0.20-python3.8`, `0-python3.8`, `python3.8`, `0.20.0`, `0.20`, `0`, `latest`:
-	-	[`0.20.0-python3.8-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-buster)
-	-	[`0.20.0-python3.8-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-1809)
-	-	[`0.20.0-python3.8-windowsservercore-ltsc2016`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-ltsc2016)
+	-	[`0.20.0-python3.8-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-buster)
+	-	[`0.20.0-python3.8-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-1809)
+	-	[`0.20.0-python3.8-windowsservercore-ltsc2016`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.8-windowsservercore-ltsc2016)
 -	`0.20.0-python3.7`, `0.20-python3.7`, `0-python3.7`, `python3.7`:
-	-	[`0.20.0-python3.7-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.7-buster)
+	-	[`0.20.0-python3.7-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.7-buster)
 -	`0.20.0-python3.6`, `0.20-python3.6`, `0-python3.6`, `python3.6`:
-	-	[`0.20.0-python3.6-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.python3.6-buster)
+	-	[`0.20.0-python3.6-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.python3.6-buster)
 -	`0.20.0-pypy3.7`, `0.20-pypy3.7`, `0-pypy3.7`, `pypy3.7`, `0.20.0-pypy`, `0.20-pypy`, `0-pypy`, `pypy`:
-	-	[`0.20.0-pypy3.7-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.7-buster)
-	-	[`0.20.0-pypy3.7-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.7-windowsservercore-1809)
--	`0.20.0-pypy3.6`, `0.20-pypy3.6`, `0-pypy3.6`, `pypy3.6`:
-	-	[`0.20.0-pypy3.6-buster`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.6-buster)
-	-	[`0.20.0-pypy3.6-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/2b9abbea083ffe4b8e86eb5951f470d04a2aa9c0/dockerfiles-generated/Dockerfile.pypy3.6-windowsservercore-1809)
+	-	[`0.20.0-pypy3.7-buster`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.pypy3.7-buster)
+	-	[`0.20.0-pypy3.7-windowsservercore-1809`](https://github.com/hylang/docker-hylang/blob/4d8c121c54e2dba1f5b58dc8167d1069ff24f496/dockerfiles-generated/Dockerfile.pypy3.7-windowsservercore-1809)
 
 # Quick reference (cont.)
 
diff --git a/xwiki/README.md b/xwiki/README.md
index 9f6824f37..0591a8cec 100644
--- a/xwiki/README.md
+++ b/xwiki/README.md
@@ -26,10 +26,8 @@ WARNING:
 
 -	[`13`, `13.2`, `13.2.0`, `13-mysql-tomcat`, `13.2-mysql-tomcat`, `13.2.0-mysql-tomcat`, `mysql-tomcat`, `stable-mysql-tomcat`, `stable-mysql`, `stable`, `latest`](https://github.com/xwiki-contrib/docker-xwiki/blob/aad779028a6f54d9821560d01d6a03633e180a8b/13/mysql-tomcat/Dockerfile)
 -	[`13-postgres-tomcat`, `13.2-postgres-tomcat`, `13.2.0-postgres-tomcat`, `postgres-tomcat`, `stable-postgres-tomcat`, `stable-postgres`](https://github.com/xwiki-contrib/docker-xwiki/blob/aad779028a6f54d9821560d01d6a03633e180a8b/13/postgres-tomcat/Dockerfile)
--	[`12`, `12.10`, `12.10.5`, `12-mysql-tomcat`, `12.10-mysql-tomcat`, `12.10.5-mysql-tomcat`, `lts-mysql-tomcat`, `lts-mysql`, `lts`](https://github.com/xwiki-contrib/docker-xwiki/blob/fa6a9086e02c084a0a3dd527a17af3cf24738e50/12/mysql-tomcat/Dockerfile)
--	[`12-postgres-tomcat`, `12.10-postgres-tomcat`, `12.10.5-postgres-tomcat`, `lts-postgres-tomcat`, `lts-postgres`](https://github.com/xwiki-contrib/docker-xwiki/blob/fa6a9086e02c084a0a3dd527a17af3cf24738e50/12/postgres-tomcat/Dockerfile)
--	[`12.6`, `12.6.8`, `12.6-mysql-tomcat`, `12.6.8-mysql-tomcat`](https://github.com/xwiki-contrib/docker-xwiki/blob/4f6080d2e7d4b358f09517b4d1e6537261c7574e/12/mysql-tomcat/Dockerfile)
--	[`12.6-postgres-tomcat`, `12.6.8-postgres-tomcat`](https://github.com/xwiki-contrib/docker-xwiki/blob/4f6080d2e7d4b358f09517b4d1e6537261c7574e/12/postgres-tomcat/Dockerfile)
+-	[`12`, `12.10`, `12.10.6`, `12-mysql-tomcat`, `12.10-mysql-tomcat`, `12.10.6-mysql-tomcat`, `lts-mysql-tomcat`, `lts-mysql`, `lts`](https://github.com/xwiki-contrib/docker-xwiki/blob/246a8efc36a5838f17930b773314b12c90181740/12/mysql-tomcat/Dockerfile)
+-	[`12-postgres-tomcat`, `12.10-postgres-tomcat`, `12.10.6-postgres-tomcat`, `lts-postgres-tomcat`, `lts-postgres`](https://github.com/xwiki-contrib/docker-xwiki/blob/246a8efc36a5838f17930b773314b12c90181740/12/postgres-tomcat/Dockerfile)
 
 # Quick reference (cont.)