diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env
index f05167d80df58ef6e99e67d8cbc3adfa7fd04889..8849355573bb3ed572d521f585bd1f4419c2f5ea 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.5
+XWIKI_VERSION=10.6
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 6afbf25b63c561185c60331fc6380f4e29286d84..ef46551f7c664e436ae84e9f427be2b1f0f8c35b 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.5
+ENV XWIKI_VERSION=10.6
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96
+ENV XWIKI_DOWNLOAD_SHA256 36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2
 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 7fa0931d9bc29bd764c20c88cf319a53fcf634a1..5deeac83852640c0920ac0a41e8f8b1117ed20aa 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=10.5
+XWIKI_VERSION=10.6
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 997f99d171188b259a042d17e5cb63ce3811a45d..8815ff0d56329791cc25f3aee1a0bb8df95b57e8 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.5
+ENV XWIKI_VERSION=10.6
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96
+ENV XWIKI_DOWNLOAD_SHA256 36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2
 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 d6a6b464a88c07bfe75c8f864b4d5da09f84674e..50b46d5ba00314d9c95051657414350d3cf6b61c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe'
     ],
     '10': [
-        xwikiVersion: '10.5',
-        xwikiSha256: 'e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96'
+        xwikiVersion: '10.6',
+        xwikiSha256: '36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2'
     ]
 ]