diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 9a20c51241b8cdf54c579b81579c4add81a4d575..69c86b51b8e41ac32b9af505466d1f0cce2e1fc6 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.7
+XWIKI_VERSION=9.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 32ef046bed96ee950b5a64a16c969404e19ba11e..608b35867a73d70d07336f2d1c8bce135f592cf3 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/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=9.7
+ENV XWIKI_VERSION=9.8
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
+ENV XWIKI_DOWNLOAD_SHA256 f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2
 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 ef143545d7b7550350b25196fead3803f0d2cd13..eb9ec946a10f2c4480ef6b2f8c6e24bf075d2cdf 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.7
+XWIKI_VERSION=9.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index c13a3f5ae375624f1662a956de5fe0d24e87dd7d..5dc282c24e3ec3ff37344ded2ff104a1c4d52fdf 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/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=9.7
+ENV XWIKI_VERSION=9.8
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
+ENV XWIKI_DOWNLOAD_SHA256 f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2
 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 3563a1a2ad1a935f476bf8b5d4a31c2eb7b8a16f..8317a00819b6d5f490142713813a022ca7dfd143 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
     ],
     '9' : [
-        xwikiVersion: '9.7',
-        xwikiSha256: '511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418'
+        xwikiVersion: '9.8',
+        xwikiSha256: 'f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2'
     ]
 ]