diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index e5b7c1fd02f56a1612b3aa16e80a951753c4867d..379e22d942a41b34785ef17e4a25c0761396a12a 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.11.7
+XWIKI_VERSION=9.11.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index e2c60a60b52270a43033fdd3a5fd440c3b575555..9a8009c070d28c2a6dd16b6d5a27e37e8d7fe281 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.11.7
+ENV XWIKI_VERSION=9.11.8
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe
+ENV XWIKI_DOWNLOAD_SHA256 e7b6f563012349dad2051fa7bb2ba5a5c2e736d11fcc41363a6acde16a4c128c
 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 144c31e2f00e9036106aefca9dfe505b21791862..ecfeb9cad7a52552256f3bf6fab1ea628a3e5e51 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.11.7
+XWIKI_VERSION=9.11.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 605fd36db645d98e292b32268110279ce1e0ab1d..032258e0d1d9a769545298c7a319de9fe592a882 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.11.7
+ENV XWIKI_VERSION=9.11.8
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe
+ENV XWIKI_DOWNLOAD_SHA256 e7b6f563012349dad2051fa7bb2ba5a5c2e736d11fcc41363a6acde16a4c128c
 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 57e72f91c17f16ca460baa0bed387218d61c3ed3..a090503185f18687102d658f1f6a340d9e58f998 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,8 @@ def variants = ['mysql-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '9' : [
-        xwikiVersion: '9.11.7',
-        xwikiSha256: '3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe'
+        xwikiVersion: '9.11.8',
+        xwikiSha256: 'e7b6f563012349dad2051fa7bb2ba5a5c2e736d11fcc41363a6acde16a4c128c'
     ],
     '10': [
         xwikiVersion: '10.8.1',