diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 98b21b9872d853c44c1ed204f580d8f60b4de5c9..d5696bf96bf607c6198a4f3e6bd0314edcd58eb4 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.8.1
+XWIKI_VERSION=9.9
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 1fe79a1fe04378be490de1cf09965255aee5a263..013a9506e67154bc179a4f3b149007f87ea81e1b 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.8.1
+ENV XWIKI_VERSION=9.9
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 26f55d585ed1b05cf730af585ab1cd0751e2b09770e2ab27c11e3b55027b9733
+ENV XWIKI_DOWNLOAD_SHA256 6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9
 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 cff5681f8c559fc19c1b99a113f837d393fb1205..354edb0b52b393cfef68998f6790656a0f980f66 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.8.1
+XWIKI_VERSION=9.9
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 1dd58f2b14aa6dd0bd23ed2144a56e3071fee6d4..b10375e1b4cd3d8745e3bf5cf1ea7ae8770d2563 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.8.1
+ENV XWIKI_VERSION=9.9
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 26f55d585ed1b05cf730af585ab1cd0751e2b09770e2ab27c11e3b55027b9733
+ENV XWIKI_DOWNLOAD_SHA256 6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9
 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 e39bb73b4754dfa3ca9b19bb2039d22b56ad458e..72d115316313441b200620a1f2c92704bee8e2fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
     ],
     '9' : [
-        xwikiVersion: '9.8.1',
-        xwikiSha256: '26f55d585ed1b05cf730af585ab1cd0751e2b09770e2ab27c11e3b55027b9733'
+        xwikiVersion: '9.9',
+        xwikiSha256: '6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9'
     ]
 ]