diff --git a/account-service/src/main/java/com/drinkool/models/UserModel.java b/account-service/src/main/java/com/drinkool/models/UserModel.java
index d19ed1d..99493cb 100644
--- a/account-service/src/main/java/com/drinkool/models/UserModel.java
+++ b/account-service/src/main/java/com/drinkool/models/UserModel.java
@@ -1,8 +1,8 @@
 package com.drinkool.models;
 
+import com.drinkool.entities.BaseEntity;
 import com.drinkool.utils.PhoneValidator;
 import com.password4j.Password;
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import jakarta.persistence.*;
 import jakarta.transaction.*;
 import jakarta.ws.rs.BadRequestException;
@@ -11,7 +11,7 @@ import java.util.UUID;
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "users")
-public abstract class UserModel extends PanacheEntity {
+public abstract class UserModel extends BaseEntity {
 
 	@Column(nullable = false)
 	public String name;
diff --git a/lib/src/main/java/com/drinkool/entities/BaseEntity.java b/lib/src/main/java/com/drinkool/entities/BaseEntity.java
new file mode 100644
index 0000000..a1c66a0
--- /dev/null
+++ b/lib/src/main/java/com/drinkool/entities/BaseEntity.java
@@ -0,0 +1,14 @@
+package com.drinkool.entities;
+
+import jakarta.persistence.*;
+import java.util.UUID;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+
+@Entity
+public abstract class BaseEntity extends PanacheEntityBase {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.UUID)
+	public UUID id;
+}
diff --git a/lib/src/main/java/com/drinkool/models/ReviewModel.java b/lib/src/main/java/com/drinkool/models/ReviewModel.java
index e7da336..acca3c4 100644
--- a/lib/src/main/java/com/drinkool/models/ReviewModel.java
+++ b/lib/src/main/java/com/drinkool/models/ReviewModel.java
@@ -1,11 +1,11 @@
 package com.drinkool.models;
 
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import com.drinkool.entities.BaseEntity;
 import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @MappedSuperclass
-public class ReviewModel extends PanacheEntity {
+public class ReviewModel extends BaseEntity {
 
 	@Column
 	public int rating;