diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index e9a208710e851237f14c9c2766432780f905ec02..bc81d728f382ec2b0063bc723449ed653f121bbf 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -57,8 +57,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.22"
-ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
+ENV MYSQL_JDBC_VERSION="8.0.23"
+ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
 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/12/mysql-tomcat/xwiki/hibernate.cfg.xml b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
index 53793f2aab3d812c865572ea3275f56da8575b3a..06fd127105f33cff94770dc4414af0406ac4c957 100644
--- a/12/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -86,7 +86,7 @@
     <property name="connection.url">jdbc:mysql://replacecontainer/replacedatabase?useSSL=false</property>
     <property name="connection.username">replaceuser</property>
     <property name="connection.password">replacepassword</property>
-    <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+    <property name="connection.driver_class">com.mysql.cj.jdbc.Driver</property>
     <property name="dbcp.poolPreparedStatements">true</property>
     <property name="dbcp.maxOpenPreparedStatements">20</property>
 
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index f35c92342d2cfec1daf9fcb754ea3a6e85bdf56c..8c026239a3ba99832a718085bff8d00f855f3e26 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -57,8 +57,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.22"
-ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
+ENV MYSQL_JDBC_VERSION="8.0.23"
+ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
 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/mysql-tomcat/xwiki/hibernate.cfg.xml b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
index 53793f2aab3d812c865572ea3275f56da8575b3a..06fd127105f33cff94770dc4414af0406ac4c957 100644
--- a/13/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -86,7 +86,7 @@
     <property name="connection.url">jdbc:mysql://replacecontainer/replacedatabase?useSSL=false</property>
     <property name="connection.username">replaceuser</property>
     <property name="connection.password">replacepassword</property>
-    <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+    <property name="connection.driver_class">com.mysql.cj.jdbc.Driver</property>
     <property name="dbcp.poolPreparedStatements">true</property>
     <property name="dbcp.maxOpenPreparedStatements">20</property>