diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env
index 0201efb58ed3fcdf73a01e669d8ed7588d274394..4572701b6707fff7cddb07c0d40aa1cbf91e8d96 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.11.7
+XWIKI_VERSION=10.11.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 15bb402bdeb3552a77768258eb8a46c3226801ed..358e92f7234d3fd74409cc13484c01e86195df01 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/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=10.11.7
+ENV XWIKI_VERSION=10.11.8
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
+ENV XWIKI_DOWNLOAD_SHA256 d3ac801e156966b1e5729a5251aa13662262460edcbf903ec8b5e5d98563bf7e
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/10/postgres-tomcat/.env b/10/postgres-tomcat/.env
index 9cbf865832397ae7d48206fe3fbf24de0202cdec..e449a4fd32c92fcde1f147aca1dc6019f4db95da 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.11.7
+XWIKI_VERSION=10.11.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 4fedcafe0e78331a2dc4667739c5a36fdc876c54..5e2796e184701ad49e258c3c674dc0f91b9d7384 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/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=10.11.7
+ENV XWIKI_VERSION=10.11.8
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5
+ENV XWIKI_DOWNLOAD_SHA256 d3ac801e156966b1e5729a5251aa13662262460edcbf903ec8b5e5d98563bf7e
 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 f3f6815cc08b9bf07c7bea480162c7615eaebbe9..c7ff9e9d895a141e30ed921261c0d27757107269 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,8 @@ def variants = ['mysql-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '10' : [
-        xwikiVersion: '10.11.7',
-        xwikiSha256: 'd343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5'
+        xwikiVersion: '10.11.8',
+        xwikiSha256: 'd3ac801e156966b1e5729a5251aa13662262460edcbf903ec8b5e5d98563bf7e'
     ],
     '11': [
         xwikiVersion: '11.3',