diff --git a/clients/package.json b/clients/package.json
index 914440bbee..8d3dfb0e1c 100644
--- a/clients/package.json
+++ b/clients/package.json
@@ -8,7 +8,7 @@
     "lint": "turbo run lint",
     "test": "turbo run test",
     "storybook": "turbo watch storybook",
-    "generate": "cd packages/sdk && pnpm generate",
+    "generate": "pnpm -C packages/api generate",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "preinstall": "npx only-allow pnpm",
     "postinstall": "manypkg check",
@@ -34,4 +34,4 @@
       "INTERNAL_MISMATCH"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/clients/packages/api/src/client/models/index.ts b/clients/packages/api/src/client/models/index.ts
index e1b1d6b1c3..3443d3a826 100644
--- a/clients/packages/api/src/client/models/index.ts
+++ b/clients/packages/api/src/client/models/index.ts
@@ -3855,10 +3855,10 @@ export interface Checkout {
     id: string;
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof Checkout
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * Payment processor used.
      * @type {PaymentProcessor}
@@ -4080,10 +4080,10 @@ export interface Checkout {
 export interface CheckoutConfirmStripe {
     /**
      * 
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutConfirmStripe
      */
-    custom_field_data?: object | null;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; } | null;
     /**
      * 
      * @type {string}
@@ -4878,10 +4878,10 @@ export interface CheckoutPriceCreate {
     metadata?: { [key: string]: MetadataValue1; };
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutPriceCreate
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * 
      * @type {string}
@@ -5075,10 +5075,10 @@ export interface CheckoutProductCreate {
     metadata?: { [key: string]: MetadataValue1; };
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutProductCreate
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * 
      * @type {string}
@@ -5199,10 +5199,10 @@ export interface CheckoutPublic {
     id: string;
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutPublic
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * Payment processor used.
      * @type {PaymentProcessor}
@@ -5433,10 +5433,10 @@ export interface CheckoutPublicConfirmed {
     id: string;
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutPublicConfirmed
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * Payment processor used.
      * @type {PaymentProcessor}
@@ -5687,10 +5687,10 @@ export type CheckoutStatus = typeof CheckoutStatus[keyof typeof CheckoutStatus];
 export interface CheckoutUpdate {
     /**
      * 
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutUpdate
      */
-    custom_field_data?: object | null;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; } | null;
     /**
      * 
      * @type {string}
@@ -5796,10 +5796,10 @@ export interface CheckoutUpdate {
 export interface CheckoutUpdatePublic {
     /**
      * 
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof CheckoutUpdatePublic
      */
-    custom_field_data?: object | null;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; } | null;
     /**
      * 
      * @type {string}
@@ -6368,6 +6368,12 @@ export const CustomFieldCreateTextTypeEnum = {
 } as const;
 export type CustomFieldCreateTextTypeEnum = typeof CustomFieldCreateTextTypeEnum[keyof typeof CustomFieldCreateTextTypeEnum];
 
+/**
+ * @type CustomFieldDataValue
+ * @export
+ */
+export type CustomFieldDataValue = boolean | number | string;
+
 /**
  * Schema for a custom field of type date.
  * @export
@@ -14612,10 +14618,10 @@ export interface Order {
     metadata: { [key: string]: MetadataValue; };
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof Order
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * 
      * @type {string}
@@ -19346,10 +19352,10 @@ export interface Subscription {
     metadata: { [key: string]: MetadataValue; };
     /**
      * Key-value object storing custom field values.
-     * @type {object}
+     * @type {{ [key: string]: CustomFieldDataValue; }}
      * @memberof Subscription
      */
-    custom_field_data?: object;
+    custom_field_data?: { [key: string]: CustomFieldDataValue; };
     /**
      * 
      * @type {SubscriptionCustomer}