diff --git a/packages/cli/oas/medusa-oas-cli/redocly/redocly-config.yaml b/packages/cli/oas/medusa-oas-cli/redocly/redocly-config.yaml
index 38b152b8fe..f30a7e8999 100644
--- a/packages/cli/oas/medusa-oas-cli/redocly/redocly-config.yaml
+++ b/packages/cli/oas/medusa-oas-cli/redocly/redocly-config.yaml
@@ -29,10 +29,12 @@ decorators:
         - AdminProduct
       AdminProduct:
         - AdminProduct
+        - BaseProductOption
       AdminStockLocation:
         - AdminFulfillmentSet
       OrderChange:
         - Order
+        - Return
       StoreShippingOption:
         - StoreShippingOption
       AdminServiceZone:
@@ -44,6 +46,67 @@ decorators:
         - AdminTaxRate
       AdminInventoryLevel:
         - AdminInventoryItem
+      AdminCustomerGroup:
+        - AdminCustomer
+      AdminOrderLineItem:
+        - BaseOrderItemDetail
+      AdminProductVariant:
+        - AdminProduct
+      BaseCapture:
+        - BasePayment
+      BaseCartLineItem:
+        - BaseLineItemTaxLine
+      BaseLineItemAdjustment:
+        - BaseCartLineItem
+      BaseOrderChangeAction:
+        - AdminOrderChange
+      BaseOrderLineItemTaxLine:
+        - BaseOrderLineItem
+      BaseOrderShippingMethodTaxLine:
+        - BaseOrderShippingMethod
+      BasePayment:
+        - BasePaymentSession
+        - BasePaymentCollection
+      BasePaymentSession:
+        - BasePaymentCollection
+      BaseProductOptionValue:
+        - BaseProductOption
+      BaseShippingMethodTaxLine:
+        - BaseCartShippingMethod
+      OrderChangeAction:
+        - OrderChange
+      OrderLineItemTaxLine:
+        - OrderLineItem
+      OrderShippingMethodTaxLine:
+        - OrderShippingMethod
+      StoreCartLineItem:
+        - StoreCart
+      StoreCollection:
+        - StoreProduct
+      StoreProductCategory:
+        - StoreProductCategory
+      BaseCart:
+        - BaseCartLineItem
+      BaseOrderLineItemAdjustment:
+        - BaseOrderLineItem
+      BaseOrderShippingMethodAdjustment:
+        - BaseOrderShippingMethod
+      BaseRefund:
+        - BasePayment
+      BaseShippingMethodAdjustment:
+        - BaseCartShippingMethod
+      Order:
+        - OrderChange
+      OrderClaim:
+        - Return
+      OrderLineItemAdjustment:
+        - OrderLineItem
+      OrderShippingMethodAdjustment:
+        - OrderShippingMethod
+      BaseProductOption:
+        - BaseProduct
+      OrderItem:
+        - OrderLineItem
 theme:
   openapi:
     theme:
diff --git a/packages/cli/oas/medusa-oas-cli/src/command-oas.ts b/packages/cli/oas/medusa-oas-cli/src/command-oas.ts
index a31e2faeb0..cf214df3f1 100644
--- a/packages/cli/oas/medusa-oas-cli/src/command-oas.ts
+++ b/packages/cli/oas/medusa-oas-cli/src/command-oas.ts
@@ -16,7 +16,7 @@ import { isFile } from "./utils/fs-utils"
  */
 // Medusa core package directory
 const medusaPackagePath = path.dirname(
-  require.resolve("@medusajs/medusa/package.json")
+  require.resolve("@medusajs/medusa")
 )
 const basePath = path.resolve(__dirname, "../")