diff --git a/boms/bom/pom.xml b/boms/bom/pom.xml
index bc0f87474..40e960eb2 100644
--- a/boms/bom/pom.xml
+++ b/boms/bom/pom.xml
@@ -98,11 +98,13 @@
         <artifactId>hibernate-jpa-2.1-api</artifactId>
         <version>1.0.0.Final</version>
       </dependency>
+      <!--
       <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-envers</artifactId>
-        <version>4.3.5.Final</version>
+        <groupId>javax.persistence</groupId>
+        <artifactId>javax.persistence-api</artifactId>
+        <version>2.2</version>
       </dependency>
+      -->
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
diff --git a/modules/jpa-basic/pom.xml b/modules/jpa-basic/pom.xml
index 8139e3069..cf38664fa 100644
--- a/modules/jpa-basic/pom.xml
+++ b/modules/jpa-basic/pom.xml
@@ -19,6 +19,12 @@
       <groupId>io.oasp.java.modules</groupId>
       <artifactId>oasp4j-basic</artifactId>
     </dependency>
+    <!--
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+    </dependency>
+    -->
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
       <artifactId>hibernate-jpa-2.1-api</artifactId>
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/service/impl/config/WebSecurityBeansConfig.java b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/service/impl/config/WebSecurityBeansConfig.java
index 405a46f12..9dcebb971 100644
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/service/impl/config/WebSecurityBeansConfig.java
+++ b/templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/service/impl/config/WebSecurityBeansConfig.java
@@ -67,9 +67,9 @@ public static DefaultRolesPrefixPostProcessor defaultRolesPrefixPostProcessor()
   }
 
   /**
-   * This method provide a new instance of {@code DelegatingPasswordEncoder}}
+   * This method provide a new instance of {@code DelegatingPasswordEncoder}
    *
-   * @return the newly create {@code DelegatingPasswordEncoder}}
+   * @return the newly create {@code DelegatingPasswordEncoder}
    */
   @Bean
   public PasswordEncoder passwordEncoder() {
diff --git a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties
index ae4cfce1b..0c33d5e32 100644
--- a/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties
+++ b/templates/server/src/main/resources/archetype-resources/core/src/main/resources/application.properties
@@ -59,7 +59,7 @@ spring.batch.job.enabled=false
 
 # Flyway for Database Setup and Migrations
 #if ($dbType == 'mariadb')
-#spring.flyway.locations=classpath:db/migration,classpath:db/type/mysql
+spring.flyway.locations=classpath:db/migration,classpath:db/type/mysql
 #else
 spring.flyway.locations=classpath:db/migration,classpath:db/type/${dbType}
 #end