diff --git a/8/mysql-tomcat/Dockerfile b/8/mysql-tomcat/Dockerfile
index c7865c7cfe86ae1cc1d8effef083f4638a84b398..434b463462f1f998dcb3b1ecb6171574cbfbc116 100644
--- a/8/mysql-tomcat/Dockerfile
+++ b/8/mysql-tomcat/Dockerfile
@@ -44,9 +44,6 @@ RUN apt-get update && \
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=8.4.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/8/postgres-tomcat/Dockerfile b/8/postgres-tomcat/Dockerfile
index 3297dfaa88cdf9530e57296461bfd162470f076f..038a07ebb1062233ca790215465ae28d7d4567ef 100644
--- a/8/postgres-tomcat/Dockerfile
+++ b/8/postgres-tomcat/Dockerfile
@@ -44,9 +44,6 @@ RUN apt-get update && \
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=8.4.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 9fece4e8bdcdcccbb4df8ab3aa615f458c8d8cfe..a200b0bafec23b22c5d6af54981c0d42d2262db9 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.1.2
+XWIKI_VERSION=9.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 97b0ae1e89c6d74658cd318f4a0dcfaef4300295..b1d1e35e0787a93281992c930807483e83af861b 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,12 +42,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=9.1.2
+ENV XWIKI_VERSION=9.2
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
+ENV XWIKI_DOWNLOAD_SHA256 7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/9/postgres-tomcat/.env b/9/postgres-tomcat/.env
index c25c2eb9b8aea329c36d1bf73a47768626af8874..f0dea98c31645956daad1b2c687fe57ce00511ad 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.1.2
+XWIKI_VERSION=9.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 81b28794b3f9e4f426fa0a6b916dbe7e45bd152e..e05870dc866cbe91159faa94ab778d1ff542f353 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,12 +42,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=9.1.2
+ENV XWIKI_VERSION=9.2
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
+ENV XWIKI_DOWNLOAD_SHA256 7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/build.gradle b/build.gradle
index 81588977456e1b50099251ec960885db4b38eed0..d650a3011bddf6aa68501d1cafa1c0b4009096a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,14 +29,18 @@ defaultTasks 'generate'
 
 def variants = ['mysql-tomcat', 'postgres-tomcat']
 
+// Note: To compute the sha256, download the binary and issue:
+// - Unix: sha256sum <binary name>
+// - Mac: shasum --algorithm 256 <binary name>
+
 def tokens = [
     '8' : [
         xwikiVersion: '8.4.4',
         xwikiSha256: 'b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23'
     ],
     '9' : [
-        xwikiVersion: '9.1.2',
-        xwikiSha256: '580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075'
+        xwikiVersion: '9.2',
+        xwikiSha256: '7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238'
     ]
 ]
 
diff --git a/template/Dockerfile b/template/Dockerfile
index 4e9d6395c6ea1f3fd4e74bff35507efe87d4118a..c5b2fb6b67fef72c79931047e6f9954594b54ef3 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -45,9 +45,6 @@ RUN apt-get update && \\
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=$xwikiVersion
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/\${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 $xwikiSha256
 RUN rm -rf /usr/local/tomcat/webapps/* && \\
   mkdir -p /usr/local/tomcat/temp && \\