diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java
index 6bfd05e..cc3e6a0 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java
@@ -6,8 +6,8 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 @Getter
 @Entity
@@ -29,21 +29,20 @@ public class MenuGroup extends BaseEntity {
     private Integer sortOrder;
 
     @OneToMany(mappedBy = "menuGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Menu> menus = new ArrayList<>();
+    private Set<Menu> menus = new HashSet<>();
 
-    private MenuGroup(String uri, String name, Integer sortOrder, List<Menu> menus) {
+    private MenuGroup(String uri, String name, Integer sortOrder) {
         this.uri = uri;
         this.name = name;
         this.sortOrder = sortOrder;
-        this.menus = menus;
     }
 
     public static MenuGroup createOf(String uri, String name, Integer sortOrder) {
-        return new MenuGroup(uri, name, sortOrder, new ArrayList<>());
+        return new MenuGroup(uri, name, sortOrder);
     }
 
     public static MenuGroup updateOf(String uri, String name, Integer sortOrder) {
-        return new MenuGroup(uri, name, sortOrder, new ArrayList<>());
+        return new MenuGroup(uri, name, sortOrder);
     }
 
     public void update(MenuGroup entity) {
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java
index da32dae..a2f2c90 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java
@@ -5,7 +5,6 @@ import com.bpgroup.poc.admin.domain.menu.entity.Menu;
 import com.bpgroup.poc.admin.domain.role.RoleMenuType;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -31,13 +30,12 @@ public class RoleMenu extends BaseEntity {
     @Column(name = "role_menu_type", nullable = false)
     private RoleMenuType roleMenuType;
 
-    public RoleMenu(Role role, Menu menu, RoleMenuType roleMenuType) {
+    private RoleMenu(Role role, Menu menu, RoleMenuType roleMenuType) {
         this.role = role;
         this.menu = menu;
         this.roleMenuType = roleMenuType;
     }
 
-    @Builder
     public static RoleMenu createOf(Role role, Menu menu, RoleMenuType roleMenuType) {
         return new RoleMenu(role, menu, roleMenuType);
     }
diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java
index ea6015c..94a8e14 100644
--- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java
+++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java
@@ -152,19 +152,19 @@ class RoleServiceTest extends MariaDBTestEnv {
         flushAndClear();
 
         roleMenuRepository.save(
-                RoleMenu.builder()
-                        .role(saveRole)
-                        .menu(saveMenu1)
-                        .roleMenuType(RoleMenuType.MANAGER)
-                        .build()
+                RoleMenu.createOf(
+                        saveRole,
+                        saveMenu1,
+                        RoleMenuType.MANAGER
+                )
         );
 
         roleMenuRepository.save(
-                RoleMenu.builder()
-                        .role(saveRole)
-                        .menu(saveMenu2)
-                        .roleMenuType(RoleMenuType.MANAGER)
-                        .build()
+                RoleMenu.createOf(
+                        saveRole,
+                        saveMenu2,
+                        RoleMenuType.MANAGER
+                )
         );
         flushAndClear();
 
@@ -191,19 +191,19 @@ class RoleServiceTest extends MariaDBTestEnv {
         flushAndClear();
 
         roleMenuRepository.save(
-                RoleMenu.builder()
-                        .role(saveRole)
-                        .menu(saveMenu1)
-                        .roleMenuType(RoleMenuType.MANAGER)
-                        .build()
+                RoleMenu.createOf(
+                        saveRole,
+                        saveMenu1,
+                        RoleMenuType.MANAGER
+                )
         );
 
         roleMenuRepository.save(
-                RoleMenu.builder()
-                        .role(saveRole)
-                        .menu(saveMenu2)
-                        .roleMenuType(RoleMenuType.MANAGER)
-                        .build()
+                RoleMenu.createOf(
+                        saveRole,
+                        saveMenu2,
+                        RoleMenuType.MANAGER
+                )
         );
 
         // when