diff --git a/template/Dockerfile b/template/Dockerfile
index 23feb5832c3ffad487871a795f820710570541f3..b65a19f97912d2a8528e806456da315f7d9a5f89 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,11 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-<% if (xwikiVersion.startsWith('10.'))
-     print 'FROM tomcat:8-jdk8-temurin'
-   else
-     print 'FROM tomcat:8-jdk11-temurin'
-%>
+FROM tomcat:9
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 8765173efd5f13894ec4f1a7a17da1fb0b6da0fe..ecf468de0b7ed8c89683888f2a750b3d3cc5a99a 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -125,8 +125,5 @@
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="notification-filter-preferences.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>''' %>
-    <% if (!xwikiVersion.startsWith('11.'))
-      print '<mapping resource="activitystream.hbm.xml"/>'
-    %>
   </session-factory>
 </hibernate-configuration>