diff --git a/.apigentools-info b/.apigentools-info
index 62262d17a9b4..2da94ff26d78 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-13 19:38:20.922353",
-            "spec_repo_commit": "6eb36f2b"
+            "regenerated": "2025-06-16 08:24:51.425950",
+            "spec_repo_commit": "b2c4e7e8"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-13 19:38:20.939768",
-            "spec_repo_commit": "6eb36f2b"
+            "regenerated": "2025-06-16 08:24:51.442050",
+            "spec_repo_commit": "b2c4e7e8"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 3bb674967f6e..b0dcc5958574 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -11095,6 +11095,17 @@ components:
       - version
       - name
       type: object
+    DORACustomTags:
+      description: A list of user-defined tags. The tags must follow the `key:value`
+        pattern. Up to 100 may be added per event.
+      example:
+      - language:java
+      - department:engineering
+      items:
+        description: Tags in the form of `key:value`.
+        type: string
+      nullable: true
+      type: array
     DORADeploymentRequest:
       description: Request to create a DORA deployment event.
       properties:
@@ -11106,6 +11117,8 @@ components:
     DORADeploymentRequestAttributes:
       description: Attributes to create a DORA deployment event.
       properties:
+        custom_tags:
+          $ref: '#/components/schemas/DORACustomTags'
         env:
           description: Environment name to where the service was deployed.
           example: staging
@@ -11208,6 +11221,8 @@ components:
     DORAFailureRequestAttributes:
       description: Attributes to create a DORA failure event.
       properties:
+        custom_tags:
+          $ref: '#/components/schemas/DORACustomTags'
         env:
           description: Environment name that was impacted by the failure.
           example: staging
diff --git a/examples/v2/dora-metrics/CreateDORAFailure.ts b/examples/v2/dora-metrics/CreateDORAFailure.ts
index db5ed9e215f6..e65dd03969c8 100644
--- a/examples/v2/dora-metrics/CreateDORAFailure.ts
+++ b/examples/v2/dora-metrics/CreateDORAFailure.ts
@@ -11,6 +11,7 @@ const params: v2.DORAMetricsApiCreateDORAFailureRequest = {
   body: {
     data: {
       attributes: {
+        customTags: ["language:java", "department:engineering"],
         env: "staging",
         finishedAt: 1693491984000000000,
         git: {
diff --git a/examples/v2/dora-metrics/CreateDORAIncident.ts b/examples/v2/dora-metrics/CreateDORAIncident.ts
index c7d3472f2dfe..c73bb2195b8c 100644
--- a/examples/v2/dora-metrics/CreateDORAIncident.ts
+++ b/examples/v2/dora-metrics/CreateDORAIncident.ts
@@ -11,6 +11,7 @@ const params: v2.DORAMetricsApiCreateDORAIncidentRequest = {
   body: {
     data: {
       attributes: {
+        customTags: ["language:java", "department:engineering"],
         env: "staging",
         finishedAt: 1693491984000000000,
         git: {
diff --git a/features/v2/dora_metrics.feature b/features/v2/dora_metrics.feature
index 2a8112dd62e3..acc8230e3616 100644
--- a/features/v2/dora_metrics.feature
+++ b/features/v2/dora_metrics.feature
@@ -79,7 +79,7 @@ Feature: DORA Metrics
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Send a deployment event for DORA Metrics returns "OK - but delayed due to incident" response
     Given new "CreateDORADeployment" request
-    And body with value {"data": {"attributes": {"env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "service": "shopist", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
+    And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "service": "shopist", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
@@ -100,7 +100,7 @@ Feature: DORA Metrics
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Send a failure event for DORA Metrics returns "OK - but delayed due to incident" response
     Given new "CreateDORAFailure" request
-    And body with value {"data": {"attributes": {"env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
+    And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
@@ -114,20 +114,20 @@ Feature: DORA Metrics
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Send an incident event for DORA Metrics returns "Bad Request" response
     Given new "CreateDORAIncident" request
-    And body with value {"data": {"attributes": {"env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
+    And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Send an incident event for DORA Metrics returns "OK - but delayed due to incident" response
     Given new "CreateDORAIncident" request
-    And body with value {"data": {"attributes": {"env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
+    And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Send an incident event for DORA Metrics returns "OK" response
     Given new "CreateDORAIncident" request
-    And body with value {"data": {"attributes": {"env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
+    And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 200 OK
diff --git a/packages/datadog-api-client-v2/models/DORADeploymentRequestAttributes.ts b/packages/datadog-api-client-v2/models/DORADeploymentRequestAttributes.ts
index 107e72a8c7ff..3f270a6d56f3 100644
--- a/packages/datadog-api-client-v2/models/DORADeploymentRequestAttributes.ts
+++ b/packages/datadog-api-client-v2/models/DORADeploymentRequestAttributes.ts
@@ -11,6 +11,10 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * Attributes to create a DORA deployment event.
  */
 export class DORADeploymentRequestAttributes {
+  /**
+   * A list of user-defined tags. The tags must follow the `key:value` pattern. Up to 100 may be added per event.
+   */
+  "customTags"?: Array<string>;
   /**
    * Environment name to where the service was deployed.
    */
@@ -60,6 +64,10 @@ export class DORADeploymentRequestAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    customTags: {
+      baseName: "custom_tags",
+      type: "Array<string>",
+    },
     env: {
       baseName: "env",
       type: "string",
diff --git a/packages/datadog-api-client-v2/models/DORAFailureRequestAttributes.ts b/packages/datadog-api-client-v2/models/DORAFailureRequestAttributes.ts
index fe822150a99a..fe3b69209889 100644
--- a/packages/datadog-api-client-v2/models/DORAFailureRequestAttributes.ts
+++ b/packages/datadog-api-client-v2/models/DORAFailureRequestAttributes.ts
@@ -11,6 +11,10 @@ import { AttributeTypeMap } from "../../datadog-api-client-common/util";
  * Attributes to create a DORA failure event.
  */
 export class DORAFailureRequestAttributes {
+  /**
+   * A list of user-defined tags. The tags must follow the `key:value` pattern. Up to 100 may be added per event.
+   */
+  "customTags"?: Array<string>;
   /**
    * Environment name that was impacted by the failure.
    */
@@ -68,6 +72,10 @@ export class DORAFailureRequestAttributes {
    * @ignore
    */
   static readonly attributeTypeMap: AttributeTypeMap = {
+    customTags: {
+      baseName: "custom_tags",
+      type: "Array<string>",
+    },
     env: {
       baseName: "env",
       type: "string",