diff --git a/ws/Archetypes/maven-prototype-jpa-hibernate/src/main/resources/META-INF/persistence.xml b/ws/Archetypes/maven-prototype-jpa-hibernate/src/main/resources/META-INF/persistence.xml
index ee0ae29b5ef4afd7e918276aa29a65c86cbf1e32..14183bd6cd9e775ccc4f8447a281616c0b8b3f22 100644
--- a/ws/Archetypes/maven-prototype-jpa-hibernate/src/main/resources/META-INF/persistence.xml
+++ b/ws/Archetypes/maven-prototype-jpa-hibernate/src/main/resources/META-INF/persistence.xml
@@ -54,8 +54,8 @@
             <property name="hibernate.format_sql" value="true"/>
             <property name="hibernate.use_sql_comments" value="true"/>
             
-            <!-- Choose Mysql's innodb backend -->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
+            <!-- Choose Mysql's innodb backend being dialect's default-->
+	    <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL57Dialect" />
             
             <!-- Enable Hibernate scanning for entity classes and adding them automatically
                 but not for hbm.xml files. -->
@@ -109,8 +109,8 @@
             <property name="hibernate.format_sql" value="true"/>
             <property name="hibernate.use_sql_comments" value="true"/>
             
-            <!-- Choose Mysql's innodb backend -->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
+	    <!-- Choose Mysql's innodb backend being dialect's default -->
+	    <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL57Dialect" />
             
             <!-- Enable Hibernate scanning for entity classes and adding them automatically
                 but not for hbm.xml files. -->
diff --git a/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index ac9472525aa26a2a1a01864ff851aaeece715a71..750917d5218a8fddfc1e45a984806a071f311b68 100644
--- a/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -36,7 +36,7 @@
             <!-- 
                 JDBC database connection parameter
             -->
-            <property name = "javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name = "javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
             <property name = "javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/hdm?useSSL=false"/>
             <property name = "javax.persistence.jdbc.user" value="hdmuser"/>
             <property name = "javax.persistence.jdbc.password" value="XYZ"/>
@@ -58,8 +58,8 @@
             <property name = "hibernate.format_sql" value="true"/>
             <property name = "hibernate.use_sql_comments" value="true"/>
 
-            <!-- Choose Mysql's innodb backend -->
-            <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
+            <!-- Choose Mysql's innodb backend by dialect's default -->
+	    <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL57Dialect" />
             
             <!-- Enable Hibernate scanning for entity classes and adding them automatically
                 but not for hbm.xml files. -->
@@ -76,7 +76,7 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         
         <properties>
-            <property name = "javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name = "javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
             <property name = "javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/hdm?useSSL=false"/>
             <property name = "javax.persistence.jdbc.user" value="hdmuser"/>
             <property name = "javax.persistence.jdbc.password" value="XYZ"/>
@@ -88,8 +88,8 @@
             <property name = "hibernate.show_sql" value = "true" />
             <property name = "hibernate.format_sql" value="true"/>
             <property name = "hibernate.use_sql_comments" value="true"/>
-            
-            <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
+
+	    <property name = "hibernate.dialect" value="org.hibernate.dialect.MySQL57Dialect" />
             
             <property name = "hibernate.archive.autodetection" value="class"/>