diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 346ab07e99274d88e5d5451098fc9fb14b9af249..321ac98e171eddf11ea2cfdf65605228c76c0437 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.4
+XWIKI_VERSION=12.5
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 7153d54f811115bdda3677d732b8a84d41a1d410..aca1085c41536dbaa2e4eb261a1af4f0bd103d2b 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.4"
+ENV XWIKI_VERSION="12.5"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
+ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
 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 7a37b2fe92b41960facf113c374b5e9bd1f20c4a..cfb3944b0182a9942a851666953e7831c5e7cd7e 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.4
+XWIKI_VERSION=12.5
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 3b317d12a1edf965b30bb412b66c6c4add39d053..ba5eb00d2015b8c6771f355f63b121af5fd99649 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.4"
+ENV XWIKI_VERSION="12.5"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
+ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
 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 44d89bd2aa14d3f3aa01682a95b5845474a28881..0500ae01d4a38235000d9d9a81c6656d77c900fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: 'b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058'
     ],
     '12': [
-        xwikiVersion: '12.4',
-        xwikiSha256: 'f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc'
+        xwikiVersion: '12.5',
+        xwikiSha256: '59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0'
     ]
 ]