diff --git a/15/mariadb-tomcat/.env b/15/mariadb-tomcat/.env
index 73cd354da670f9edd8a53b7f6a6107fadeb8f1a2..21f1dc69ea61ad5fc09dc4dc38606e51db83f7dd 100644
--- a/15/mariadb-tomcat/.env
+++ b/15/mariadb-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.7
+XWIKI_VERSION=15.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mariadb-tomcat/Dockerfile b/15/mariadb-tomcat/Dockerfile
index 7989bbb00b2ad5ac7b114b770d158bfb6d50c081..9cf04f4b7439e8ca422a72ea82e421c0e670c0cd 100644
--- a/15/mariadb-tomcat/Dockerfile
+++ b/15/mariadb-tomcat/Dockerfile
@@ -48,9 +48,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="15.7"
+ENV XWIKI_VERSION="15.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
+ENV XWIKI_DOWNLOAD_SHA256 359e44485615722ab533559ec3e3334197a10935e4dfa6fc872b93d1447475fc
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/15/mysql-tomcat/.env b/15/mysql-tomcat/.env
index 73cd354da670f9edd8a53b7f6a6107fadeb8f1a2..21f1dc69ea61ad5fc09dc4dc38606e51db83f7dd 100644
--- a/15/mysql-tomcat/.env
+++ b/15/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.7
+XWIKI_VERSION=15.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mysql-tomcat/Dockerfile b/15/mysql-tomcat/Dockerfile
index 0ff9fe036a2d0913384c313bc4a7a1cfc3eb3651..08aed85106ddc3179b6694f69ddd764c6dc33f27 100644
--- a/15/mysql-tomcat/Dockerfile
+++ b/15/mysql-tomcat/Dockerfile
@@ -48,9 +48,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="15.7"
+ENV XWIKI_VERSION="15.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
+ENV XWIKI_DOWNLOAD_SHA256 359e44485615722ab533559ec3e3334197a10935e4dfa6fc872b93d1447475fc
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/15/postgres-tomcat/.env b/15/postgres-tomcat/.env
index 015af7384cd88f362bfd6585cb965077847603a7..91bcd4f1c22c05f31923af26edce05501fb6ed8f 100644
--- a/15/postgres-tomcat/.env
+++ b/15/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.7
+XWIKI_VERSION=15.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/postgres-tomcat/Dockerfile b/15/postgres-tomcat/Dockerfile
index 46f8a26767ae4e7c9dc182ae95586563f7512ae0..db99e42f942f9cce68ce9913a258fe32f8b92be9 100644
--- a/15/postgres-tomcat/Dockerfile
+++ b/15/postgres-tomcat/Dockerfile
@@ -49,9 +49,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="15.7"
+ENV XWIKI_VERSION="15.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
+ENV XWIKI_DOWNLOAD_SHA256 359e44485615722ab533559ec3e3334197a10935e4dfa6fc872b93d1447475fc
 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 91383946437f8832c0f1befa777a054369d06054..543f023e94cf7d69dbf0daabf3487d5ad2278762 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '15': [
-        xwikiVersion: '15.7',
-        xwikiSha256: 'f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64',
+        xwikiVersion: '15.8',
+        xwikiSha256: '359e44485615722ab533559ec3e3334197a10935e4dfa6fc872b93d1447475fc',
         mysqlJDBCVersion: '8.1.0',
         mysqlJDBCSha256: 'e2e657e9c5ebe06a73485c9739ebd8a18e7bebb852a58d0da287da850beca1c7',
         mariadbJDBCVersion: '3.2.0',