diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile
index 568203a40f6040e0eab5c312ea95b3b2b3ba17fa..4dd0376642a2ff4881a3a9edc4fe410ad1ebbd3b 100644
--- a/13/mariadb-tomcat/Dockerfile
+++ b/13/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 81941b12ff5f8a888bc0c63e8a1c057382bb1969..b0b4595773d47169aecfb229241b56b0e5b10645 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.28"
-ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e"
+ENV MYSQL_JDBC_VERSION="8.0.29"
+ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 2933090b975cbdacd31e5e4e3c046a3c9c1b0b24..d3b3f13e000bb3623b3d37c4d22f6d01017053b2 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 5d452dd1c3a890d71d14beead23ceb33f22efe2f..56fc3ed78b3d21282eec85c5d83596fd94855788 100644
--- a/14/mariadb-tomcat/Dockerfile
+++ b/14/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index 1fa824f90e1187184792a4c7eaf944bc51186787..180f8aa771c67d6fa4f9c7731e4428203042ec5f 100644
--- a/14/mysql-tomcat/Dockerfile
+++ b/14/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.28"
-ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e"
+ENV MYSQL_JDBC_VERSION="8.0.29"
+ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile
index 74c373fc02c33c078860c3450dd43df4639a436e..b4381ef46ec0bb9b3dd675f91ac0452f0e7679dd 100644
--- a/14/postgres-tomcat/Dockerfile
+++ b/14/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/template/Dockerfile b/template/Dockerfile
index 310ee77b1ecbbc8472ea5fac1ed188a3c4d431b3..ca4a1e19ad9129eaa2b626a4e112f208156ecb38 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jdk11
+FROM tomcat:9-jre11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)