diff --git a/services/merchant-service-net/src/MerchantService.Domain/AggregatesModel/ShopAggregate/ShopValueObjects.cs b/services/merchant-service-net/src/MerchantService.Domain/AggregatesModel/ShopAggregate/ShopValueObjects.cs
index 3b21880a..2b4d5bdc 100644
--- a/services/merchant-service-net/src/MerchantService.Domain/AggregatesModel/ShopAggregate/ShopValueObjects.cs
+++ b/services/merchant-service-net/src/MerchantService.Domain/AggregatesModel/ShopAggregate/ShopValueObjects.cs
@@ -247,7 +247,7 @@ public record ShopFeatures
     /// </summary>
     public static ShopFeatures ForCategory(BusinessCategory category) => category.Id switch
     {
-        1 => new ShopFeatures // FoodBeverage
+        1 or 11 or 12 => new ShopFeatures // FoodBeverage, Cafe, Restaurant
         {
             HasInventory = true,
             HasTables = true,
@@ -259,16 +259,25 @@ public record ShopFeatures
             HasInventory = true,
             HasShipping = true
         },
-        4 or 5 or 6 or 8 => new ShopFeatures // Healthcare, Beauty, Education, Services
+        4 or 6 or 8 => new ShopFeatures // Healthcare, Education, Services
         {
             HasBooking = true
         },
-        7 => new ShopFeatures // Entertainment
+        5 => new ShopFeatures // Beauty (Thẩm mỹ viện — cần cả booking lẫn sản phẩm)
         {
             HasBooking = true,
             HasInventory = true
         },
-        _ => new ShopFeatures // Other
+        7 or 13 => new ShopFeatures // Entertainment, Karaoke
+        {
+            HasBooking = true,
+            HasInventory = true
+        },
+        14 => new ShopFeatures // Spa
+        {
+            HasBooking = true
+        },
+        _ => new ShopFeatures // Other / Hybrid
         {
             HasInventory = true,
             HasBooking = true