diff --git a/.apigentools-info b/.apigentools-info
index 6365c4d1d570..7061396b0763 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-02 19:55:31.957447",
-            "spec_repo_commit": "1cc45c45"
+            "regenerated": "2025-04-02 20:49:29.894380",
+            "spec_repo_commit": "9ea284b5"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-02 19:55:31.973220",
-            "spec_repo_commit": "1cc45c45"
+            "regenerated": "2025-04-02 20:49:29.913373",
+            "spec_repo_commit": "9ea284b5"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 1072d1213efc..b5a66e5d9755 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -12431,6 +12431,11 @@ components:
       additionalProperties: false
       description: The definition of Entity V3 Datastore Spec object.
       properties:
+        componentOf:
+          description: A list of components the datastore is a part of
+          items:
+            type: string
+          type: array
         lifecycle:
           description: The lifecycle state of the datastore.
           minLength: 1
@@ -12629,6 +12634,11 @@ components:
       additionalProperties: false
       description: The definition of Entity V3 Queue Spec object.
       properties:
+        componentOf:
+          description: A list of components the queue is a part of
+          items:
+            type: string
+          type: array
         lifecycle:
           description: The lifecycle state of the queue.
           minLength: 1
@@ -12694,6 +12704,11 @@ components:
       additionalProperties: false
       description: The definition of Entity V3 Service Spec object.
       properties:
+        componentOf:
+          description: A list of components the service is a part of
+          items:
+            type: string
+          type: array
         dependsOn:
           description: A list of components the service depends on.
           items:
diff --git a/examples/v2/software-catalog/UpsertCatalogEntity.ts b/examples/v2/software-catalog/UpsertCatalogEntity.ts
index 05a2b1d7a37b..f88add2e298e 100644
--- a/examples/v2/software-catalog/UpsertCatalogEntity.ts
+++ b/examples/v2/software-catalog/UpsertCatalogEntity.ts
@@ -61,6 +61,7 @@ const params: v2.SoftwareCatalogApiUpsertCatalogEntityRequest = {
       tags: ["this:tag", "that:tag"],
     },
     spec: {
+      componentOf: [],
       dependsOn: [],
       languages: [],
     },
diff --git a/features/v2/software_catalog.feature b/features/v2/software_catalog.feature
index 282607a38344..fd8e62bad35d 100644
--- a/features/v2/software_catalog.feature
+++ b/features/v2/software_catalog.feature
@@ -10,14 +10,14 @@ Feature: Software Catalog
   @generated @skip @team:DataDog/service-catalog
   Scenario: Create or update entities returns "ACCEPTED" response
     Given new "UpsertCatalogEntity" request
-    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}}
+    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
     When the request is sent
     Then the response status is 202 ACCEPTED
 
   @generated @skip @team:DataDog/service-catalog
   Scenario: Create or update entities returns "Bad Request" response
     Given new "UpsertCatalogEntity" request
-    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}}
+    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
     When the request is sent
     Then the response status is 400 Bad Request
 
diff --git a/packages/datadog-api-client-v2/models/EntityV3DatastoreSpec.ts b/packages/datadog-api-client-v2/models/EntityV3DatastoreSpec.ts
index 2454b2d22dd4..22ed98e4a9b9 100644
--- a/packages/datadog-api-client-v2/models/EntityV3DatastoreSpec.ts
+++ b/packages/datadog-api-client-v2/models/EntityV3DatastoreSpec.ts
@@ -10,6 +10,10 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * The definition of Entity V3 Datastore Spec object.
  */
 export class EntityV3DatastoreSpec {
+  /**
+   * A list of components the datastore is a part of
+   */
+  "componentOf"?: Array<string>;
   /**
    * The lifecycle state of the datastore.
    */
@@ -32,6 +36,10 @@ export class EntityV3DatastoreSpec {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    componentOf: {
+      baseName: "componentOf",
+      type: "Array<string>",
+    },
     lifecycle: {
       baseName: "lifecycle",
       type: "string",
diff --git a/packages/datadog-api-client-v2/models/EntityV3QueueSpec.ts b/packages/datadog-api-client-v2/models/EntityV3QueueSpec.ts
index 4227218e14e9..16f2b86259e1 100644
--- a/packages/datadog-api-client-v2/models/EntityV3QueueSpec.ts
+++ b/packages/datadog-api-client-v2/models/EntityV3QueueSpec.ts
@@ -10,6 +10,10 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * The definition of Entity V3 Queue Spec object.
  */
 export class EntityV3QueueSpec {
+  /**
+   * A list of components the queue is a part of
+   */
+  "componentOf"?: Array<string>;
   /**
    * The lifecycle state of the queue.
    */
@@ -32,6 +36,10 @@ export class EntityV3QueueSpec {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    componentOf: {
+      baseName: "componentOf",
+      type: "Array<string>",
+    },
     lifecycle: {
       baseName: "lifecycle",
       type: "string",
diff --git a/packages/datadog-api-client-v2/models/EntityV3ServiceSpec.ts b/packages/datadog-api-client-v2/models/EntityV3ServiceSpec.ts
index dd6599d73ce7..243fca5b692e 100644
--- a/packages/datadog-api-client-v2/models/EntityV3ServiceSpec.ts
+++ b/packages/datadog-api-client-v2/models/EntityV3ServiceSpec.ts
@@ -10,6 +10,10 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * The definition of Entity V3 Service Spec object.
  */
 export class EntityV3ServiceSpec {
+  /**
+   * A list of components the service is a part of
+   */
+  "componentOf"?: Array<string>;
   /**
    * A list of components the service depends on.
    */
@@ -40,6 +44,10 @@ export class EntityV3ServiceSpec {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    componentOf: {
+      baseName: "componentOf",
+      type: "Array<string>",
+    },
     dependsOn: {
       baseName: "dependsOn",
       type: "Array<string>",