diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c74b102..00a81c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ The file format of it is based on [Keep a Changelog](http://keepachangelog.com/e
 For public Changelog covering all changes done to Pipedrive’s API, webhooks and app extensions platforms, see [public Changelog](https://pipedrive.readme.io/docs/changelog) with discussion area in [Developers Community](https://devcommunity.pipedrive.com/c/documentation/changelog/19).
 
 ## [Unreleased]
+### Fixed
+- Fixed incorrect `custom_fields` schema implementations by using the proper shared definition from `custom-fields.yaml`
 
 ## [29.2.1] - 2025-09-03
 ### Added
diff --git a/src/versions/v2/models/add-deal-request.ts b/src/versions/v2/models/add-deal-request.ts
index 443a4f09..82338c8f 100644
--- a/src/versions/v2/models/add-deal-request.ts
+++ b/src/versions/v2/models/add-deal-request.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 
 /**
 * 
@@ -124,9 +121,9 @@ export interface AddDealRequest {
     */
     'label_ids'?: Array<number>;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/add-organization-request.ts b/src/versions/v2/models/add-organization-request.ts
index fa3eeaee..8cff7007 100644
--- a/src/versions/v2/models/add-organization-request.ts
+++ b/src/versions/v2/models/add-organization-request.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { OrganizationItemAddress } from './organization-item-address';
@@ -62,9 +59,9 @@ export interface AddOrganizationRequest {
     */
     'address'?: OrganizationItemAddress;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/deal-item.ts b/src/versions/v2/models/deal-item.ts
index d2ba024b..ef542c5e 100644
--- a/src/versions/v2/models/deal-item.ts
+++ b/src/versions/v2/models/deal-item.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 
 /**
 * 
@@ -174,9 +171,9 @@ export interface DealItem {
     */
     'acv'?: number | null;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/deal-item1.ts b/src/versions/v2/models/deal-item1.ts
index b9ab9e1d..e40e6ab6 100644
--- a/src/versions/v2/models/deal-item1.ts
+++ b/src/versions/v2/models/deal-item1.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 
 /**
 * The deal object
@@ -174,9 +171,9 @@ export interface DealItem1 {
     */
     'acv'?: number | null;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/get-persons-response-all-of-data-inner.ts b/src/versions/v2/models/get-persons-response-all-of-data-inner.ts
index 6679c9fb..3fa76cc7 100644
--- a/src/versions/v2/models/get-persons-response-all-of-data-inner.ts
+++ b/src/versions/v2/models/get-persons-response-all-of-data-inner.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { GetPersonsResponseAllOfDataInnerEmailsInner } from './get-persons-response-all-of-data-inner-emails-inner';
@@ -131,9 +128,9 @@ export interface GetPersonsResponseAllOfDataInner {
     */
     'job_title'?: string;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/index.ts b/src/versions/v2/models/index.ts
index c702ac61..15dc409a 100644
--- a/src/versions/v2/models/index.ts
+++ b/src/versions/v2/models/index.ts
@@ -34,7 +34,6 @@ export * from './base-response';
 export * from './convert-lead-to-deal-request';
 export * from './deal-item';
 export * from './deal-item1';
-export * from './deal-item-custom-fields-value';
 export * from './deal-product-request-body';
 export * from './deal-product-request-body1';
 export * from './delete-activity-response';
diff --git a/src/versions/v2/models/organization-item.ts b/src/versions/v2/models/organization-item.ts
index c13447c4..ff253f45 100644
--- a/src/versions/v2/models/organization-item.ts
+++ b/src/versions/v2/models/organization-item.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { OrganizationItemAddress } from './organization-item-address';
@@ -72,9 +69,9 @@ export interface OrganizationItem {
     */
     'label_ids'?: Array<number>;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/organization-item1.ts b/src/versions/v2/models/organization-item1.ts
index 5730babe..443f8181 100644
--- a/src/versions/v2/models/organization-item1.ts
+++ b/src/versions/v2/models/organization-item1.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { OrganizationItemAddress } from './organization-item-address';
@@ -72,9 +69,9 @@ export interface OrganizationItem1 {
     */
     'label_ids'?: Array<number>;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/update-deal-request.ts b/src/versions/v2/models/update-deal-request.ts
index 007af048..2e5545a0 100644
--- a/src/versions/v2/models/update-deal-request.ts
+++ b/src/versions/v2/models/update-deal-request.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 
 /**
 * 
@@ -124,9 +121,9 @@ export interface UpdateDealRequest {
     */
     'label_ids'?: Array<number>;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/update-organization-request.ts b/src/versions/v2/models/update-organization-request.ts
index caec386e..8348d688 100644
--- a/src/versions/v2/models/update-organization-request.ts
+++ b/src/versions/v2/models/update-organization-request.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { OrganizationItemAddress } from './organization-item-address';
@@ -62,9 +59,9 @@ export interface UpdateOrganizationRequest {
     */
     'address'?: OrganizationItemAddress;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }
 
diff --git a/src/versions/v2/models/upsert-person-response-data-data.ts b/src/versions/v2/models/upsert-person-response-data-data.ts
index 73a4321d..2e87462b 100644
--- a/src/versions/v2/models/upsert-person-response-data-data.ts
+++ b/src/versions/v2/models/upsert-person-response-data-data.ts
@@ -13,9 +13,6 @@
  */
 
 
-// May contain unused imports in some cases
-// @ts-ignore
-import { DealItemCustomFieldsValue } from './deal-item-custom-fields-value';
 // May contain unused imports in some cases
 // @ts-ignore
 import { GetPersonsResponseAllOfDataInnerEmailsInner } from './get-persons-response-all-of-data-inner-emails-inner';
@@ -131,9 +128,9 @@ export interface UpsertPersonResponseDataData {
     */
     'job_title'?: string;
     /**
-    * A map of custom fields with hash-based keys
-    * @type {{ [key: string]: DealItemCustomFieldsValue | undefined; }}
+    * An object where each key represents a custom field. All custom fields are referenced as randomly generated 40-character hashes
+    * @type {{ [key: string]: any | undefined; }}
     */
-    'custom_fields'?: { [key: string]: DealItemCustomFieldsValue | undefined; };
+    'custom_fields'?: { [key: string]: any | undefined; };
 }