diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index ec3f45c2ca4266cbd5fdf86450f46517e04594ac..79bfde2b735d3ea9e95467529db81b2183f9085d 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/12/mysql-tomcat/xwiki/hibernate.cfg.xml b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
index 06fd127105f33cff94770dc4414af0406ac4c957..27f0836293c3a2d3504a651fb0d23d69a4431eff 100644
--- a/12/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,5 @@
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="notification-filter-preferences.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index a45a44e424d1cca7806d523c86124087df3dfb1f..871e7b55252b61b9366d7349245267040449802c 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/12/postgres-tomcat/xwiki/hibernate.cfg.xml b/12/postgres-tomcat/xwiki/hibernate.cfg.xml
index f0c065d626c4ad83725e7cb122462bc4fe7ff6e6..da57a105760acbaa09590c846e55e8cf4291a0b0 100644
--- a/12/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -103,6 +103,5 @@
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="notification-filter-preferences.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 963fac7d10f15e0fc9b5b833ca253a6dbd118b49..15f087757f1fc2535bf7c3dcc1be81f3e6c05110 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/13/mysql-tomcat/xwiki/hibernate.cfg.xml b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
index 06fd127105f33cff94770dc4414af0406ac4c957..27f0836293c3a2d3504a651fb0d23d69a4431eff 100644
--- a/13/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,5 @@
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="notification-filter-preferences.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 9d590af266c107bef26400222130f3f78961d7e2..253489656ec20de44118df30696e637b364e2ab7 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
 #    _/ /'`\ \_     \  /\  /    | |  | |`\ \  | |
 #   |____||____|     \/  \/    [___][__|  \_][___]
 
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
 
 # Note: when using docker-compose, the ENV values below are overridden from the .env file.
 
diff --git a/13/postgres-tomcat/xwiki/hibernate.cfg.xml b/13/postgres-tomcat/xwiki/hibernate.cfg.xml
index f0c065d626c4ad83725e7cb122462bc4fe7ff6e6..da57a105760acbaa09590c846e55e8cf4291a0b0 100644
--- a/13/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -103,6 +103,5 @@
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="notification-filter-preferences.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>