diff --git a/.apigentools-info b/.apigentools-info
index 792a8851b5e6..ddd3a278fb0d 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-11 12:58:58.679153",
-            "spec_repo_commit": "7307da21"
+            "regenerated": "2025-04-11 15:22:52.291731",
+            "spec_repo_commit": "b50db944"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-04-11 12:58:58.695743",
-            "spec_repo_commit": "7307da21"
+            "regenerated": "2025-04-11 15:22:52.308333",
+            "spec_repo_commit": "b50db944"
         }
     }
 }
\ No newline at end of file
diff --git a/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.frozen b/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.frozen
index 20facfcb199a..625b2e6083cb 100644
--- a/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.frozen
+++ b/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.frozen
@@ -1 +1 @@
-2024-11-04T19:02:20.402Z
\ No newline at end of file
+2025-04-09T20:37:29.894Z
\ No newline at end of file
diff --git a/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.yml b/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.yml
index c152ab9eb9f8..335e4a7e8fe8 100644
--- a/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.yml
+++ b/cassettes/features/v2/incidents/Create-an-incident-type-returns-CREATED-response.yml
@@ -1,11 +1,10 @@
 http_interactions:
-- recorded_at: Mon, 04 Nov 2024 19:02:20 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:29 GMT
   request:
     body:
       encoding: UTF-8
       string: '{"data":{"attributes":{"description":"Any incidents that harm (or have
-        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"Security
-        Incident"},"type":"incident_types"}}'
+        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"132365f074fae59b"},"type":"incident_types"}}'
     headers:
       Accept:
       - application/json
@@ -16,24 +15,23 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"6faef319-c810-435b-bdf3-57efb391e56e","type":"incident_types","attributes":{"createdAt":"2024-11-04T19:02:20.505437063Z","createdBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","description":"Any
+      string: '{"data":{"id":"6de50f7a-b42a-4547-8f80-08c1991cc7e7","type":"incident_types","attributes":{"createdAt":"2025-04-09T20:37:30.180243201Z","createdBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","description":"Any
         incidents that harm (or have the potential to) the confidentiality, integrity,
-        or availability of our data.","is_default":false,"lastModifiedBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","modifiedAt":"2024-11-04T19:02:20.505437063Z","name":"Security
-        Incident","prefix":"IR"}}}'
+        or availability of our data.","is_default":false,"lastModifiedBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","modifiedAt":"2025-04-09T20:37:30.180243275Z","name":"132365f074fae59b","prefix":"IR"},"relationships":{"created_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"google_meet_configuration":{"data":null},"last_modified_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"zoom_configuration":{"data":null}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 04 Nov 2024 19:02:20 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:29 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/incidents/config/types/6faef319-c810-435b-bdf3-57efb391e56e
+    uri: https://api.datadoghq.com/api/v2/incidents/config/types/6de50f7a-b42a-4547-8f80-08c1991cc7e7
   response:
     body:
       encoding: UTF-8
diff --git a/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.frozen b/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.frozen
index 9f5d7a644516..5a8422cf2151 100644
--- a/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.frozen
+++ b/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.frozen
@@ -1 +1 @@
-2024-11-04T19:02:22.569Z
\ No newline at end of file
+2025-04-09T20:37:30.425Z
\ No newline at end of file
diff --git a/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.yml b/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.yml
index 5f9266710258..f220328fe6f2 100644
--- a/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.yml
+++ b/cassettes/features/v2/incidents/Delete-an-incident-type-returns-OK-response.yml
@@ -1,11 +1,10 @@
 http_interactions:
-- recorded_at: Mon, 04 Nov 2024 19:02:22 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body:
       encoding: UTF-8
       string: '{"data":{"attributes":{"description":"Any incidents that harm (or have
-        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"Security
-        Incident"},"type":"incident_types"}}'
+        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"fa473c6f81961a61"},"type":"incident_types"}}'
     headers:
       Accept:
       - application/json
@@ -16,24 +15,23 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"dbf7f2e1-8f37-4624-9762-6e744db257aa","type":"incident_types","attributes":{"createdAt":"2024-11-04T19:02:22.674338166Z","createdBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","description":"Any
+      string: '{"data":{"id":"dc0ba7fa-64c9-46bd-a93d-1249070b52b6","type":"incident_types","attributes":{"createdAt":"2025-04-09T20:37:30.487313985Z","createdBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","description":"Any
         incidents that harm (or have the potential to) the confidentiality, integrity,
-        or availability of our data.","is_default":false,"lastModifiedBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","modifiedAt":"2024-11-04T19:02:22.674338166Z","name":"Security
-        Incident","prefix":"IR"}}}'
+        or availability of our data.","is_default":false,"lastModifiedBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","modifiedAt":"2025-04-09T20:37:30.487314108Z","name":"fa473c6f81961a61","prefix":"IR"},"relationships":{"created_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"google_meet_configuration":{"data":null},"last_modified_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"zoom_configuration":{"data":null}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 04 Nov 2024 19:02:22 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/incidents/config/types/dbf7f2e1-8f37-4624-9762-6e744db257aa
+    uri: https://api.datadoghq.com/api/v2/incidents/config/types/dc0ba7fa-64c9-46bd-a93d-1249070b52b6
   response:
     body:
       encoding: UTF-8
@@ -42,20 +40,22 @@ http_interactions:
     status:
       code: 204
       message: No Content
-- recorded_at: Mon, 04 Nov 2024 19:02:22 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/incidents/config/types/dbf7f2e1-8f37-4624-9762-6e744db257aa
+    uri: https://api.datadoghq.com/api/v2/incidents/config/types/dc0ba7fa-64c9-46bd-a93d-1249070b52b6
   response:
     body:
       encoding: UTF-8
-      string: ''
-    headers: {}
+      string: '{"errors":[{"status":"404","title":"Not Found"}]}'
+    headers:
+      Content-Type:
+      - application/vnd.api+json
     status:
-      code: 204
-      message: No Content
+      code: 404
+      message: Not Found
 recorded_with: VCR 6.0.0
diff --git a/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.frozen b/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.frozen
index e31291537b63..4993d8134367 100644
--- a/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.frozen
+++ b/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.frozen
@@ -1 +1 @@
-2024-11-04T19:02:38.662Z
\ No newline at end of file
+2025-04-09T20:37:30.806Z
\ No newline at end of file
diff --git a/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.yml b/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.yml
index d6702e8f7037..833fc6eb2c41 100644
--- a/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.yml
+++ b/cassettes/features/v2/incidents/Update-an-incident-type-returns-OK-response.yml
@@ -1,11 +1,10 @@
 http_interactions:
-- recorded_at: Mon, 04 Nov 2024 19:02:38 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body:
       encoding: UTF-8
       string: '{"data":{"attributes":{"description":"Any incidents that harm (or have
-        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"Security
-        Incident"},"type":"incident_types"}}'
+        the potential to) the confidentiality, integrity, or availability of our data.","is_default":false,"name":"fbd30183c4400dd8"},"type":"incident_types"}}'
     headers:
       Accept:
       - application/json
@@ -16,49 +15,47 @@ http_interactions:
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"366ac7cc-9884-4a7f-a751-9d885f3136ed","type":"incident_types","attributes":{"createdAt":"2024-11-04T19:02:38.74682603Z","createdBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","description":"Any
+      string: '{"data":{"id":"b8bf5b6b-3c89-4df8-a689-ee9f4655113c","type":"incident_types","attributes":{"createdAt":"2025-04-09T20:37:31.105820953Z","createdBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","description":"Any
         incidents that harm (or have the potential to) the confidentiality, integrity,
-        or availability of our data.","is_default":false,"lastModifiedBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","modifiedAt":"2024-11-04T19:02:38.74682603Z","name":"Security
-        Incident","prefix":"IR"}}}'
+        or availability of our data.","is_default":false,"lastModifiedBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","modifiedAt":"2025-04-09T20:37:31.105821027Z","name":"fbd30183c4400dd8","prefix":"IR"},"relationships":{"created_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"google_meet_configuration":{"data":null},"last_modified_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"zoom_configuration":{"data":null}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 201
       message: Created
-- recorded_at: Mon, 04 Nov 2024 19:02:38 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body:
       encoding: UTF-8
-      string: '{"data":{"attributes":{"name":"Security Incident-updated"},"id":"366ac7cc-9884-4a7f-a751-9d885f3136ed","type":"incident_types"}}'
+      string: '{"data":{"attributes":{"name":"fbd30183c4400dd8-updated"},"id":"b8bf5b6b-3c89-4df8-a689-ee9f4655113c","type":"incident_types"}}'
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
     method: PATCH
-    uri: https://api.datadoghq.com/api/v2/incidents/config/types/366ac7cc-9884-4a7f-a751-9d885f3136ed
+    uri: https://api.datadoghq.com/api/v2/incidents/config/types/b8bf5b6b-3c89-4df8-a689-ee9f4655113c
   response:
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"366ac7cc-9884-4a7f-a751-9d885f3136ed","type":"incident_types","attributes":{"createdAt":"2024-11-04T19:02:38.746826Z","createdBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","description":"Any
+      string: '{"data":{"id":"b8bf5b6b-3c89-4df8-a689-ee9f4655113c","type":"incident_types","attributes":{"createdAt":"2025-04-09T20:37:31.105821Z","createdBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","description":"Any
         incidents that harm (or have the potential to) the confidentiality, integrity,
-        or availability of our data.","is_default":false,"lastModifiedBy":"3ad549bf-eba0-11e9-a77a-0705486660d0","modifiedAt":"2024-11-04T19:02:38.837509595Z","name":"Security
-        Incident-updated","prefix":"IR"}}}'
+        or availability of our data.","is_default":false,"lastModifiedBy":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","modifiedAt":"2025-04-09T20:37:31.295207Z","name":"fbd30183c4400dd8-updated","prefix":"IR"},"relationships":{"created_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"google_meet_configuration":{"data":null},"last_modified_by_user":{"data":{"id":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","type":"users"}},"zoom_configuration":{"data":null}}}}'
     headers:
       Content-Type:
       - application/vnd.api+json
     status:
       code: 200
       message: OK
-- recorded_at: Mon, 04 Nov 2024 19:02:38 GMT
+- recorded_at: Wed, 09 Apr 2025 20:37:30 GMT
   request:
     body: null
     headers:
       Accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/incidents/config/types/366ac7cc-9884-4a7f-a751-9d885f3136ed
+    uri: https://api.datadoghq.com/api/v2/incidents/config/types/b8bf5b6b-3c89-4df8-a689-ee9f4655113c
   response:
     body:
       encoding: UTF-8
diff --git a/examples/v2/incidents/CreateIncidentType.rb b/examples/v2/incidents/CreateIncidentType.rb
index d5ec652ff99d..92ac9466a05c 100644
--- a/examples/v2/incidents/CreateIncidentType.rb
+++ b/examples/v2/incidents/CreateIncidentType.rb
@@ -11,7 +11,7 @@
     attributes: DatadogAPIClient::V2::IncidentTypeAttributes.new({
       description: "Any incidents that harm (or have the potential to) the confidentiality, integrity, or availability of our data.",
       is_default: false,
-      name: "Security Incident",
+      name: "8d4bbb66dccf2456",
     }),
     type: DatadogAPIClient::V2::IncidentTypeType::INCIDENT_TYPES,
   }),
diff --git a/features/v2/given.json b/features/v2/given.json
index 96c49b616686..6fabc6026aed 100644
--- a/features/v2/given.json
+++ b/features/v2/given.json
@@ -196,7 +196,7 @@
     "parameters": [
       {
         "name": "body",
-        "value": "{\n  \"data\": {\n    \"attributes\": {\n      \"name\": \"Security Incident\",\n      \"description\": \"Any incidents that harm (or have the potential to) the confidentiality, integrity, or availability of our data.\",\n      \"is_default\": false\n    },\n    \"type\": \"incident_types\"\n  }\n}"
+        "value": "{\n  \"data\": {\n    \"attributes\": {\n      \"name\": \"{{ unique_hash }}\",\n      \"description\": \"Any incidents that harm (or have the potential to) the confidentiality, integrity, or availability of our data.\",\n      \"is_default\": false\n    },\n    \"type\": \"incident_types\"\n  }\n}"
       }
     ],
     "step": "there is a valid \"incident_type\" in the system",
diff --git a/features/v2/incidents.feature b/features/v2/incidents.feature
index 29cbc1286371..637485c4109d 100644
--- a/features/v2/incidents.feature
+++ b/features/v2/incidents.feature
@@ -134,7 +134,7 @@ Feature: Incidents
   Scenario: Create an incident type returns "CREATED" response
     Given operation "CreateIncidentType" enabled
     And new "CreateIncidentType" request
-    And body with value {"data": {"attributes": {"description": "Any incidents that harm (or have the potential to) the confidentiality, integrity, or availability of our data.", "is_default": false, "name": "Security Incident"}, "type": "incident_types"}}
+    And body with value {"data": {"attributes": {"description": "Any incidents that harm (or have the potential to) the confidentiality, integrity, or availability of our data.", "is_default": false, "name": "{{ unique_hash }}"}, "type": "incident_types"}}
     When the request is sent
     Then the response status is 201 CREATED