diff --git a/library/xwiki b/library/xwiki
index eebc7848cbbfa..2933174a2839d 100644
--- a/library/xwiki
+++ b/library/xwiki
@@ -1,21 +1,37 @@
 Maintainers: XWiki Core Dev Team <committers@xwiki.org> (@xwiki)
 GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
 
-# Stable
-Tags: 17, 17.10, 17.10.0, 17-mysql-tomcat, 17.10-mysql-tomcat, 17.10.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+# LTS & Stable (until 18.0.0RC1)
+Tags: 17, 17.10, 17.10.2, 17-mysql-tomcat, 17.10-mysql-tomcat, 17.10.2-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest, lts-mysql-tomcat, lts-mysql, lts
 Architectures: amd64, arm64v8
 Directory: 17/mysql-tomcat
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
 
-Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.2-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
 Directory: 17/postgres-tomcat
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
 
-Tags: 17-mariadb-tomcat, 17.10-mariadb-tomcat, 17.10.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Tags: 17-mariadb-tomcat, 17.10-mariadb-tomcat, 17.10.2-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb, lts-mariadb-tomcat, lts-mariadb
 Architectures: amd64, arm64v8
 Directory: 17/mariadb-tomcat
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+
+# Missing 17.10.1 release. To be removed at next release.
+Tags: 17.10.1, 17.10.1-mysql-tomcat
+Architectures: amd64, arm64v8
+Directory: 17.10.1/mysql-tomcat
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+
+Tags: 17.10.1-postgres-tomcat
+Architectures: amd64, arm64v8
+Directory: 17.10.1//postgres-tomcat
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+
+Tags: 17.10.1-mariadb-tomcat
+Architectures: amd64, arm64v8
+Directory: 17.10.1/mariadb-tomcat
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
 
 # Intermediate LTS
 Tags: 17.4, 17.4.7, 17.4-mysql-tomcat, 17.4.7-mysql-tomcat
@@ -34,17 +50,17 @@ Directory: 17.4/mariadb-tomcat
 GitCommit: f5b8a93c46ec436d3540c59f64ad0b7488cdc413
 
 # LTS
-Tags: 16, 16.10, 16.10.15, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.15-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
+Tags: 16, 16.10, 16.10.15, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.15-mysql-tomcat
 Architectures: amd64, arm64v8
 Directory: 16/mysql-tomcat
 GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
 
-Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat
 Architectures: amd64, arm64v8
 Directory: 16/postgres-tomcat
 GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
 
-Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat,  lts-mariadb-tomcat, lts-mariadb
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat
 Architectures: amd64, arm64v8
 Directory: 16/mariadb-tomcat
 GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e