diff --git a/.generated-info b/.generated-info
index c25d8eb8682..db7079e0a7b 100644
--- a/.generated-info
+++ b/.generated-info
@@ -1,4 +1,4 @@
 {
-  "spec_repo_commit": "f2ae7eb",
-  "generated": "2025-07-17 19:54:48.737"
+  "spec_repo_commit": "20279f4",
+  "generated": "2025-07-18 10:24:19.812"
 }
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 725b65b41ac..ee3c8b9b971 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -13911,14 +13911,21 @@ components:
           type: string
       type: object
     EntityV3APIVersion:
-      description: The schema version of entity type. The field is known as schema-version
-        in the previous version.
+      description: The version of the schema data that was used to populate this entity's
+        data. This could be via the API, Terraform, or YAML file in a repository.
+        The field is known as schema-version in the previous version.
       enum:
       - v3
+      - v2.2
+      - v2.1
+      - v2
       example: v3
       type: string
       x-enum-varnames:
       - V3
+      - V2_2
+      - V2_1
+      - V2
     EntityV3DatadogCodeLocationItem:
       additionalProperties: false
       description: Code location item.
diff --git a/api/datadogV2/model_entity_v3_api.go b/api/datadogV2/model_entity_v3_api.go
index 52c69bf5471..c87409b25f7 100644
--- a/api/datadogV2/model_entity_v3_api.go
+++ b/api/datadogV2/model_entity_v3_api.go
@@ -12,7 +12,7 @@ import (
 
 // EntityV3API Schema for API entities.
 type EntityV3API struct {
-	// The schema version of entity type. The field is known as schema-version in the previous version.
+	// The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 	ApiVersion EntityV3APIVersion `json:"apiVersion"`
 	// Datadog product integrations for the API entity.
 	Datadog *EntityV3APIDatadog `json:"datadog,omitempty"`
diff --git a/api/datadogV2/model_entity_v3_api_version.go b/api/datadogV2/model_entity_v3_api_version.go
index f4381159384..667c8809ac4 100644
--- a/api/datadogV2/model_entity_v3_api_version.go
+++ b/api/datadogV2/model_entity_v3_api_version.go
@@ -10,16 +10,22 @@ import (
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadog"
 )
 
-// EntityV3APIVersion The schema version of entity type. The field is known as schema-version in the previous version.
+// EntityV3APIVersion The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 type EntityV3APIVersion string
 
 // List of EntityV3APIVersion.
 const (
-	ENTITYV3APIVERSION_V3 EntityV3APIVersion = "v3"
+	ENTITYV3APIVERSION_V3   EntityV3APIVersion = "v3"
+	ENTITYV3APIVERSION_V2_2 EntityV3APIVersion = "v2.2"
+	ENTITYV3APIVERSION_V2_1 EntityV3APIVersion = "v2.1"
+	ENTITYV3APIVERSION_V2   EntityV3APIVersion = "v2"
 )
 
 var allowedEntityV3APIVersionEnumValues = []EntityV3APIVersion{
 	ENTITYV3APIVERSION_V3,
+	ENTITYV3APIVERSION_V2_2,
+	ENTITYV3APIVERSION_V2_1,
+	ENTITYV3APIVERSION_V2,
 }
 
 // GetAllowedValues reeturns the list of possible values.
diff --git a/api/datadogV2/model_entity_v3_datastore.go b/api/datadogV2/model_entity_v3_datastore.go
index c25eca08d16..6fade5f17ba 100644
--- a/api/datadogV2/model_entity_v3_datastore.go
+++ b/api/datadogV2/model_entity_v3_datastore.go
@@ -12,7 +12,7 @@ import (
 
 // EntityV3Datastore Schema for datastore entities.
 type EntityV3Datastore struct {
-	// The schema version of entity type. The field is known as schema-version in the previous version.
+	// The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 	ApiVersion EntityV3APIVersion `json:"apiVersion"`
 	// Datadog product integrations for the datastore entity.
 	Datadog *EntityV3DatastoreDatadog `json:"datadog,omitempty"`
diff --git a/api/datadogV2/model_entity_v3_queue.go b/api/datadogV2/model_entity_v3_queue.go
index 40a33dc5987..77e6746bcc0 100644
--- a/api/datadogV2/model_entity_v3_queue.go
+++ b/api/datadogV2/model_entity_v3_queue.go
@@ -12,7 +12,7 @@ import (
 
 // EntityV3Queue Schema for queue entities.
 type EntityV3Queue struct {
-	// The schema version of entity type. The field is known as schema-version in the previous version.
+	// The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 	ApiVersion EntityV3APIVersion `json:"apiVersion"`
 	// Datadog product integrations for the datastore entity.
 	Datadog *EntityV3QueueDatadog `json:"datadog,omitempty"`
diff --git a/api/datadogV2/model_entity_v3_service.go b/api/datadogV2/model_entity_v3_service.go
index 73d85f19b1d..7f50573f67a 100644
--- a/api/datadogV2/model_entity_v3_service.go
+++ b/api/datadogV2/model_entity_v3_service.go
@@ -12,7 +12,7 @@ import (
 
 // EntityV3Service Schema for service entities.
 type EntityV3Service struct {
-	// The schema version of entity type. The field is known as schema-version in the previous version.
+	// The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 	ApiVersion EntityV3APIVersion `json:"apiVersion"`
 	// Datadog product integrations for the service entity.
 	Datadog *EntityV3ServiceDatadog `json:"datadog,omitempty"`
diff --git a/api/datadogV2/model_entity_v3_system.go b/api/datadogV2/model_entity_v3_system.go
index 2ff2aba3eff..aac13993298 100644
--- a/api/datadogV2/model_entity_v3_system.go
+++ b/api/datadogV2/model_entity_v3_system.go
@@ -12,7 +12,7 @@ import (
 
 // EntityV3System Schema for system entities.
 type EntityV3System struct {
-	// The schema version of entity type. The field is known as schema-version in the previous version.
+	// The version of the schema data that was used to populate this entity's data. This could be via the API, Terraform, or YAML file in a repository. The field is known as schema-version in the previous version.
 	ApiVersion EntityV3APIVersion `json:"apiVersion"`
 	// Datadog product integrations for the service entity.
 	Datadog *EntityV3SystemDatadog `json:"datadog,omitempty"`