diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 6a2b1dcb2e8ef08345a40f86f3db9fac99d13232..19681617fe8e02af07325a0573346375b3c5ec13 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.3.1
+XWIKI_VERSION=9.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index c5483829b1ad9d50a3304168b405a80a3791e32b..0b219e47c2f8c4f27d29c91b009ca78e811e1eac 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,9 +42,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.3.1
+ENV XWIKI_VERSION=9.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e113d5c805c4c5977a8e0c0d27700bb45fa69f0d155132f7cc5f06ed0f888e79
+ENV XWIKI_DOWNLOAD_SHA256 0c50d7b261f72f582b94171b80b4711def614845663d0633b17c870b8c84d0fb
 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 b26c5fbc32e3c80d4d7c484f06f06c6d3ae8e571..014a48314ddbdcdc36c48d99ccb8d65968dd21b9 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.3.1
+XWIKI_VERSION=9.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index b2ea09236607ba7867854213552d9291cccad096..da562604ff7c17402168bf1991f34ab04908c2f6 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,9 +42,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.3.1
+ENV XWIKI_VERSION=9.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e113d5c805c4c5977a8e0c0d27700bb45fa69f0d155132f7cc5f06ed0f888e79
+ENV XWIKI_DOWNLOAD_SHA256 0c50d7b261f72f582b94171b80b4711def614845663d0633b17c870b8c84d0fb
 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 31d556fa3df732e6dce1ee2167a6e34c2339616d..4ea27c93f83b9f05f044083559a3bd56d0a30782 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
     ],
     '9' : [
-        xwikiVersion: '9.3.1',
-        xwikiSha256: 'e113d5c805c4c5977a8e0c0d27700bb45fa69f0d155132f7cc5f06ed0f888e79'
+        xwikiVersion: '9.4',
+        xwikiSha256: '0c50d7b261f72f582b94171b80b4711def614845663d0633b17c870b8c84d0fb'
     ]
 ]