diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env
index 4ee996652b25359ea64be07016ff215987ef6297..586f2e381650f52372fa82b39ea953605d07dee4 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.3
+XWIKI_VERSION=10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 5a3d2ba9fed5ae964afde2ba536624cf2dd9f13b..86dc5f77199451101986e4d0f476d598d4c7952d 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.3
+ENV XWIKI_VERSION=10.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 46e76e6d74fc59c00d09bbe03da36b8ff223a9cfa6e84cf2eff3001922ac715f
+ENV XWIKI_DOWNLOAD_SHA256 4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a
 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 79780b520ae2565de1c146aeb5834cb049d45f2a..5a310bbc139ce501c2d5d4fd79cabac6f192fb07 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.3
+XWIKI_VERSION=10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 769728c83cdeb60984b2abfa16a097bc58974890..9e3320698e6fe7b505ef1fb2d1677da19eb5fdf2 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.3
+ENV XWIKI_VERSION=10.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 46e76e6d74fc59c00d09bbe03da36b8ff223a9cfa6e84cf2eff3001922ac715f
+ENV XWIKI_DOWNLOAD_SHA256 4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a
 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 5bd44ba162b7f49ca9a5d73804bc692fb68e5909..8988d7f14c14aaeb4e788455919178dd31bcaba3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: 'fcc07a2d4982847925d4405465c1e73f2e7475d99da9ed224cf6c63131f4de47'
     ],
     '10': [
-        xwikiVersion: '10.3',
-        xwikiSha256: '46e76e6d74fc59c00d09bbe03da36b8ff223a9cfa6e84cf2eff3001922ac715f'
+        xwikiVersion: '10.4',
+        xwikiSha256: '4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a'
     ]
 ]