diff --git a/.apigentools-info b/.apigentools-info
index e372d38ea2fa..7f7d66e0575a 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-03-20 15:01:21.019349",
-            "spec_repo_commit": "0f5c928e"
+            "regenerated": "2025-03-24 14:58:39.758624",
+            "spec_repo_commit": "764de5f0"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-03-20 15:01:21.035270",
-            "spec_repo_commit": "0f5c928e"
+            "regenerated": "2025-03-24 14:58:39.774537",
+            "spec_repo_commit": "764de5f0"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index aa344b25b5e0..cd3b7d730ba0 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -11936,9 +11936,15 @@ components:
           description: Incident ID.
           type: string
         type:
-          description: Incident description.
-          type: string
+          $ref: '#/components/schemas/EntityResponseIncludedIncidentType'
       type: object
+    EntityResponseIncludedIncidentType:
+      description: Incident description.
+      enum:
+      - incident
+      type: string
+      x-enum-varnames:
+      - INCIDENT
     EntityResponseIncludedOncall:
       description: Included oncall.
       properties:
@@ -11948,9 +11954,15 @@ components:
           description: Oncall ID.
           type: string
         type:
-          description: Oncall type.
-          type: string
+          $ref: '#/components/schemas/EntityResponseIncludedOncallType'
       type: object
+    EntityResponseIncludedOncallType:
+      description: Oncall type.
+      enum:
+      - oncall
+      type: string
+      x-enum-varnames:
+      - ONCALL
     EntityResponseIncludedRawSchema:
       description: Included raw schema.
       properties:
@@ -11960,8 +11972,7 @@ components:
           description: Raw schema ID.
           type: string
         type:
-          description: Raw schema type.
-          type: string
+          $ref: '#/components/schemas/EntityResponseIncludedRawSchemaType'
       type: object
     EntityResponseIncludedRawSchemaAttributes:
       description: Included raw schema attributes.
@@ -11970,6 +11981,13 @@ components:
           description: Schema from user input in base64 encoding.
           type: string
       type: object
+    EntityResponseIncludedRawSchemaType:
+      description: Raw schema type.
+      enum:
+      - rawSchema
+      type: string
+      x-enum-varnames:
+      - RAW_SCHEMA
     EntityResponseIncludedRelatedEntity:
       description: Included related entity.
       properties:
@@ -11981,8 +11999,7 @@ components:
         meta:
           $ref: '#/components/schemas/EntityResponseIncludedRelatedEntityMeta'
         type:
-          description: Related entity.
-          type: string
+          $ref: '#/components/schemas/EntityResponseIncludedRelatedEntityType'
       type: object
     EntityResponseIncludedRelatedEntityAttributes:
       description: Related entity attributes.
@@ -12018,6 +12035,13 @@ components:
           description: Entity relation source.
           type: string
       type: object
+    EntityResponseIncludedRelatedEntityType:
+      description: Related entity.
+      enum:
+      - relatedEntity
+      type: string
+      x-enum-varnames:
+      - RELATED_ENTITY
     EntityResponseIncludedRelatedIncidentAttributes:
       description: Incident attributes.
       properties:
@@ -12075,8 +12099,7 @@ components:
           description: Entity ID.
           type: string
         type:
-          description: Schema type.
-          type: string
+          $ref: '#/components/schemas/EntityResponseIncludedSchemaType'
       type: object
     EntityResponseIncludedSchemaAttributes:
       description: Included schema.
@@ -12084,6 +12107,13 @@ components:
         schema:
           $ref: '#/components/schemas/EntityV3'
       type: object
+    EntityResponseIncludedSchemaType:
+      description: Schema type.
+      enum:
+      - schema
+      type: string
+      x-enum-varnames:
+      - SCHEMA
     EntityResponseMeta:
       description: Entity metadata.
       properties:
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index 580fcd761b7f..4a013bbc8f82 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -1606,17 +1606,22 @@ def overrides
           "v2.entity_meta" => "EntityMeta",
           "v2.entity_relationships" => "EntityRelationships",
           "v2.entity_response_included_incident" => "EntityResponseIncludedIncident",
+          "v2.entity_response_included_incident_type" => "EntityResponseIncludedIncidentType",
           "v2.entity_response_included_oncall" => "EntityResponseIncludedOncall",
+          "v2.entity_response_included_oncall_type" => "EntityResponseIncludedOncallType",
           "v2.entity_response_included_raw_schema" => "EntityResponseIncludedRawSchema",
           "v2.entity_response_included_raw_schema_attributes" => "EntityResponseIncludedRawSchemaAttributes",
+          "v2.entity_response_included_raw_schema_type" => "EntityResponseIncludedRawSchemaType",
           "v2.entity_response_included_related_entity" => "EntityResponseIncludedRelatedEntity",
           "v2.entity_response_included_related_entity_attributes" => "EntityResponseIncludedRelatedEntityAttributes",
           "v2.entity_response_included_related_entity_meta" => "EntityResponseIncludedRelatedEntityMeta",
+          "v2.entity_response_included_related_entity_type" => "EntityResponseIncludedRelatedEntityType",
           "v2.entity_response_included_related_incident_attributes" => "EntityResponseIncludedRelatedIncidentAttributes",
           "v2.entity_response_included_related_oncall_attributes" => "EntityResponseIncludedRelatedOncallAttributes",
           "v2.entity_response_included_related_oncall_escalation_item" => "EntityResponseIncludedRelatedOncallEscalationItem",
           "v2.entity_response_included_schema" => "EntityResponseIncludedSchema",
           "v2.entity_response_included_schema_attributes" => "EntityResponseIncludedSchemaAttributes",
+          "v2.entity_response_included_schema_type" => "EntityResponseIncludedSchemaType",
           "v2.entity_response_meta" => "EntityResponseMeta",
           "v2.entity_to_incidents" => "EntityToIncidents",
           "v2.entity_to_oncalls" => "EntityToOncalls",
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_incident.rb b/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
index 5b0026eb1763..11fd9f5f3dd5 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
@@ -48,7 +48,7 @@ def self.openapi_types
       {
         :'attributes' => :'EntityResponseIncludedRelatedIncidentAttributes',
         :'id' => :'String',
-        :'type' => :'String'
+        :'type' => :'EntityResponseIncludedIncidentType'
       }
     end
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_incident_type.rb b/lib/datadog_api_client/v2/models/entity_response_included_incident_type.rb
new file mode 100644
index 000000000000..c6068b4afdce
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/entity_response_included_incident_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Incident description.
+  class EntityResponseIncludedIncidentType
+    include BaseEnumModel
+
+    INCIDENT = "incident".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_oncall.rb b/lib/datadog_api_client/v2/models/entity_response_included_oncall.rb
index b2727305949f..71c0af50d420 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_oncall.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_oncall.rb
@@ -48,7 +48,7 @@ def self.openapi_types
       {
         :'attributes' => :'EntityResponseIncludedRelatedOncallAttributes',
         :'id' => :'String',
-        :'type' => :'String'
+        :'type' => :'EntityResponseIncludedOncallType'
       }
     end
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_oncall_type.rb b/lib/datadog_api_client/v2/models/entity_response_included_oncall_type.rb
new file mode 100644
index 000000000000..36900d37d531
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/entity_response_included_oncall_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Oncall type.
+  class EntityResponseIncludedOncallType
+    include BaseEnumModel
+
+    ONCALL = "oncall".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
index feeb7872ae86..bfa91d0f74fd 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
@@ -48,7 +48,7 @@ def self.openapi_types
       {
         :'attributes' => :'EntityResponseIncludedRawSchemaAttributes',
         :'id' => :'String',
-        :'type' => :'String'
+        :'type' => :'EntityResponseIncludedRawSchemaType'
       }
     end
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_raw_schema_type.rb b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema_type.rb
new file mode 100644
index 000000000000..3ca9c513e8ef
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Raw schema type.
+  class EntityResponseIncludedRawSchemaType
+    include BaseEnumModel
+
+    RAW_SCHEMA = "rawSchema".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_related_entity.rb b/lib/datadog_api_client/v2/models/entity_response_included_related_entity.rb
index 24133753e1cc..67e9933b6ced 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_related_entity.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_related_entity.rb
@@ -53,7 +53,7 @@ def self.openapi_types
         :'attributes' => :'EntityResponseIncludedRelatedEntityAttributes',
         :'id' => :'String',
         :'meta' => :'EntityResponseIncludedRelatedEntityMeta',
-        :'type' => :'String'
+        :'type' => :'EntityResponseIncludedRelatedEntityType'
       }
     end
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_related_entity_type.rb b/lib/datadog_api_client/v2/models/entity_response_included_related_entity_type.rb
new file mode 100644
index 000000000000..4e10ae88c746
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/entity_response_included_related_entity_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Related entity.
+  class EntityResponseIncludedRelatedEntityType
+    include BaseEnumModel
+
+    RELATED_ENTITY = "relatedEntity".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_schema.rb b/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
index 3f552b7acca2..a7a60611f451 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
@@ -48,7 +48,7 @@ def self.openapi_types
       {
         :'attributes' => :'EntityResponseIncludedSchemaAttributes',
         :'id' => :'String',
-        :'type' => :'String'
+        :'type' => :'EntityResponseIncludedSchemaType'
       }
     end
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_schema_type.rb b/lib/datadog_api_client/v2/models/entity_response_included_schema_type.rb
new file mode 100644
index 000000000000..618acb7c4e9a
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/entity_response_included_schema_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # Schema type.
+  class EntityResponseIncludedSchemaType
+    include BaseEnumModel
+
+    SCHEMA = "schema".freeze
+  end
+end