diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 5506d4e0f28d014c6da6a6f07ffac7c6b2fd16d9..1127767091ea9980088c63b01d7e5294c4e5a639 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.10.3
+XWIKI_VERSION=12.10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 6d13535f3995ac400467bb86457b742417a02c16..471b6233b068953e13ac47e4d19bd7973dc65e6a 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -43,9 +43,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="12.10.3"
+ENV XWIKI_VERSION="12.10.4"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 402d97322fa9234a844b03630324bbd9a2152ff320e3c27c8ec3fc12a082223f
+ENV XWIKI_DOWNLOAD_SHA256 fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/12/postgres-tomcat/.env b/12/postgres-tomcat/.env
index 522a61db0148e3607ef5fdf59ac08e7d220a0164..ee16050595c2638de3c74b100f87564db8d1d7b1 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.10.3
+XWIKI_VERSION=12.10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 91b81f182e8ed9d51cd45209aec2278a3aac9d98..0f92514d119fbb94d8f51512bf38bb341871f78b 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/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="12.10.3"
+ENV XWIKI_VERSION="12.10.4"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 402d97322fa9234a844b03630324bbd9a2152ff320e3c27c8ec3fc12a082223f
+ENV XWIKI_DOWNLOAD_SHA256 fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4
 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 17fcc41e473899ee8682e23761d033ab3b2f2b74..9eeab1d6f966971a50bcaa5e926c4cde0c37c090 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,10 @@ def tokens = [
     '13': [
         xwikiVersion: '13.0',
         xwikiSha256: 'ae710ab7ec4447429b725cbbdbaa3fd6f6137ce4f3c4f7ba4da097b1a9047d09'
+    ],
+    '12': [
+        xwikiVersion: '12.10.4',
+        xwikiSha256: 'fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4'
     ]
 ]