diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index bd0af6882c67d3c13f5d5bf3244d189d9fd8eaf4..402e96f77fa42e6e6b32bcbd1445c63c0be7c70a 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -94,10 +94,10 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="activitystream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index d7ebe1038a0fe07d1e3462548e03f93fa8c9cb52..3efb6013a828851a552e749ccb5ffa18fb62b0a2 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -96,10 +96,10 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="activitystream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env
index baca356fdcab51f69b7015e4b849ae7d7daa9ac7..3c9fa5865f4af056457ce76275f079071167c95b 100644
--- a/11/mysql-tomcat/.env
+++ b/11/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=11.0.3
+XWIKI_VERSION=11.1
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index 9602127ea6a04d1fbcce526b72289a5dff388fef..e4e09c7fd4f1882e6e31326a2e8a6313dea65b26 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-tomcat/Dockerfile
@@ -44,9 +44,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION=11.0.3
+ENV XWIKI_VERSION=11.1
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf
+ENV XWIKI_DOWNLOAD_SHA256 a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
index bd0af6882c67d3c13f5d5bf3244d189d9fd8eaf4..ef2cdce60e57730ac1ba5ef85e7416e6b9e6cc0b 100644
--- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -94,10 +94,10 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="eventstream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/11/postgres-tomcat/.env b/11/postgres-tomcat/.env
index 9599d36d15e889d86027bb52fbcfe577bec99321..18a0895f5c06bd6c53526b5722ddaa3dde49c440 100644
--- a/11/postgres-tomcat/.env
+++ b/11/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=11.0.3
+XWIKI_VERSION=11.1
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index 68b74e053c204f641d8036f9fd7e0cfdb2f62f3c..663e0b341194dc1dfb48c988fb4a128416891063 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/postgres-tomcat/Dockerfile
@@ -44,9 +44,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION=11.0.3
+ENV XWIKI_VERSION=11.1
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf
+ENV XWIKI_DOWNLOAD_SHA256 a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
index d7ebe1038a0fe07d1e3462548e03f93fa8c9cb52..481e530942d4d31f5134a5991125f00945b80fdc 100644
--- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -96,10 +96,10 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="eventstream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>
diff --git a/build.gradle b/build.gradle
index fc2783181af4f40e0f177f9879848ced148aab60..9387d9f03c6c440b3a56095c10cd1c53cb3294ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '5b544d8786b71cc51b150a3623efa17aea1dfafda429776caeb97d5a3d2c5343'
     ],
     '11': [
-        xwikiVersion: '11.0.3',
-        xwikiSha256: 'ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf'
+        xwikiVersion: '11.1',
+        xwikiSha256: 'a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881'
     ]
 ]
 
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 4b7d484da2c68df569780a365e9c6aadcbaed45d..181c124c5f0a6832653d5e132c4dc5d268634061 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -94,7 +94,6 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>'''
 
@@ -116,9 +115,13 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>''' %>
-    <% if (!xwikiVersion.startsWith('9.')) println '<mapping resource="notification-filter-preferences.hbm.xml"/>' %>
+    <% if (xwikiVersion.startsWith('11.'))
+          println '<mapping resource="eventstream.hbm.xml"/>'
+       else
+          println '<mapping resource="activitystream.hbm.xml"/>'
+    %>
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>