diff --git a/notes-service/pom.xml b/notes-service/pom.xml
index 135f8b294..95e0da208 100644
--- a/notes-service/pom.xml
+++ b/notes-service/pom.xml
@@ -122,10 +122,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>com.jcabi</groupId>
-        <artifactId>jcabi-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/AttachmentEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/AttachmentEntity.java
index 21f9426f0..f57a29846 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/AttachmentEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/AttachmentEntity.java
@@ -16,11 +16,17 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
 import java.util.Date;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -28,9 +34,7 @@
  * Jun 23, 2015
  */
 @MappedSuperclass
-@ExoEntity
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public class AttachmentEntity {
+public abstract class AttachmentEntity {
 
   @Id
   @Column(name = "ATTACHMENT_ID")
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/BasePageEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/BasePageEntity.java
index cdc8ef652..45d566fb7 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/BasePageEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/BasePageEntity.java
@@ -16,11 +16,11 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
 import java.util.Date;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
+
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -28,8 +28,6 @@
  * Jun 23, 2015  
  */
 @MappedSuperclass
-@ExoEntity
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class BasePageEntity {
 
   @Column(name = "AUTHOR")
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageAttachmentEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageAttachmentEntity.java
index 882d7afa0..7e0e3ae41 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageAttachmentEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageAttachmentEntity.java
@@ -16,9 +16,13 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS
@@ -27,7 +31,6 @@
  * Jun 23, 2015
  */
 @Entity(name = "WikiDraftPageAttachmentEntity")
-@ExoEntity
 @Table(name = "WIKI_DRAFT_ATTACHMENTS")
 @NamedQueries({
     @NamedQuery(name = "draftAttachment.getAllIds", query = "SELECT a.id FROM WikiDraftPageAttachmentEntity a ORDER BY a.id")
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageEntity.java
index 1739ba12d..9c4db99a1 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/DraftPageEntity.java
@@ -21,8 +21,6 @@
 
 import java.util.List;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -44,7 +42,6 @@
  * Jun 23, 2015
  */
 @Entity(name = "WikiDraftPageEntity")
-@ExoEntity
 @Table(name = "WIKI_DRAFT_PAGES")
 @NamedQueries({
         @NamedQuery(name = "wikiDraftPage.findDraftPages", query = "SELECT d FROM WikiDraftPageEntity d ORDER BY d.updatedDate DESC"),
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/EmotionIconEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/EmotionIconEntity.java
index 44eb020b5..179e637c3 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/EmotionIconEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/EmotionIconEntity.java
@@ -1,11 +1,16 @@
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 @Entity(name = "WikiEmotionIconEntity")
-@ExoEntity
 @Table(name = "WIKI_EMOTION_ICONS")
 @NamedQueries({
         @NamedQuery(name = "emotionIcon.getEmotionIconByName", query = "SELECT e FROM WikiEmotionIconEntity e WHERE e.name = :name")
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageAttachmentEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageAttachmentEntity.java
index d4131da81..e66fb8be4 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageAttachmentEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageAttachmentEntity.java
@@ -16,9 +16,13 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS
@@ -27,7 +31,6 @@
  * Jun 23, 2015
  */
 @Entity(name = "WikiPageAttachmentEntity")
-@ExoEntity
 @Table(name = "WIKI_PAGE_ATTACHMENTS")
 @NamedQueries({
     @NamedQuery(name = "pageAttachment.getAllIds", query = "SELECT a.id FROM WikiPageAttachmentEntity a ORDER BY a.id"),
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
index 1fe23bbb1..63b669647 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
@@ -19,14 +19,29 @@
 
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -34,7 +49,6 @@
  * 7/16/15
  */
 @Entity(name = "WikiPageEntity")
-@ExoEntity
 @Table(name = "WIKI_PAGES")
 @NamedQueries({
     @NamedQuery(name = "wikiPage.getAllIds", query = "SELECT p.id FROM WikiPageEntity p  WHERE p.deleted = false ORDER BY p.id"),
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageMoveEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageMoveEntity.java
index de06e257c..12e073272 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageMoveEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageMoveEntity.java
@@ -16,11 +16,19 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
 import java.util.Date;
-import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS
@@ -29,7 +37,6 @@
  * Jun 23, 2015
  */
 @Entity(name = "WikiPageMoveEntity")
-@ExoEntity
 @Table(name = "WIKI_PAGE_MOVES")
 @NamedQueries({
         @NamedQuery(name = "wikiPageMove.getPreviousPage", query = "SELECT p FROM WikiPageMoveEntity p WHERE p.wikiType = :wikiType AND p.wikiOwner = :wikiOwner AND p.pageName = :pageName")
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageVersionEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageVersionEntity.java
index c9147de6f..0009d869a 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageVersionEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageVersionEntity.java
@@ -19,9 +19,17 @@
 
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS
@@ -30,7 +38,6 @@
  * 7/16/15
  */
 @Entity(name = "WikiPageVersionEntity")
-@ExoEntity
 @Table(name = "WIKI_PAGE_VERSIONS")
 @NamedQueries({
         @NamedQuery(name = "wikiPageVersion.getLastversionNumberOfPage", query = "SELECT max(p.versionNumber) FROM WikiPageVersionEntity p WHERE p.page.id = :pageId"),
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PermissionEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PermissionEntity.java
index 132f11ff2..48651f375 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PermissionEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PermissionEntity.java
@@ -19,14 +19,13 @@
 
 package org.exoplatform.wiki.jpa.entity;
 
+import org.exoplatform.wiki.model.PermissionType;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-import org.exoplatform.wiki.model.PermissionType;
-
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -34,7 +33,6 @@
  * Jun 26, 2015  
  */
 @Embeddable
-@ExoEntity
 public class PermissionEntity {
   /**
    * User or Group
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/TemplateEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/TemplateEntity.java
index b143ad791..e88d62666 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/TemplateEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/TemplateEntity.java
@@ -19,9 +19,17 @@
 
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS
@@ -30,7 +38,6 @@
  * 7/16/15
  */
 @Entity(name = "WikiTemplateEntity")
-@ExoEntity
 @Table(name = "WIKI_TEMPLATES")
 @NamedQueries({
         @NamedQuery(name = "template.getTemplatesOfWiki", query = "SELECT t FROM WikiTemplateEntity t JOIN t.wiki w WHERE w.type = :type AND w.owner = :owner"),
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/WikiEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/WikiEntity.java
index 5783cdf68..ed7a77bc4 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/WikiEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/WikiEntity.java
@@ -16,11 +16,22 @@
  */
 package org.exoplatform.wiki.jpa.entity;
 
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
 import java.util.List;
 
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -28,7 +39,6 @@
  * Jun 23, 2015
  */
 @Entity(name = "WikiWikiEntity")
-@ExoEntity
 @Table(name = "WIKI_WIKIS")
 @NamedQueries({
         @NamedQuery(name = "wiki.getAllIds", query = "SELECT w.id FROM WikiWikiEntity w ORDER BY w.id"),
diff --git a/notes-service/src/main/resources/jpa-entities.idx b/notes-service/src/main/resources/jpa-entities.idx
new file mode 100644
index 000000000..83cae9d1c
--- /dev/null
+++ b/notes-service/src/main/resources/jpa-entities.idx
@@ -0,0 +1,12 @@
+org.exoplatform.wiki.jpa.entity.AttachmentEntity
+org.exoplatform.wiki.jpa.entity.PageMoveEntity
+org.exoplatform.wiki.jpa.entity.DraftPageAttachmentEntity
+org.exoplatform.wiki.jpa.entity.WikiEntity
+org.exoplatform.wiki.jpa.entity.PageEntity
+org.exoplatform.wiki.jpa.entity.PageVersionEntity
+org.exoplatform.wiki.jpa.entity.PageAttachmentEntity
+org.exoplatform.wiki.jpa.entity.BasePageEntity
+org.exoplatform.wiki.jpa.entity.TemplateEntity
+org.exoplatform.wiki.jpa.entity.PermissionEntity
+org.exoplatform.wiki.jpa.entity.DraftPageEntity
+org.exoplatform.wiki.jpa.entity.EmotionIconEntity