diff --git a/.generated-info b/.generated-info
index dd5463082c65..18a0784c4edb 100644
--- a/.generated-info
+++ b/.generated-info
@@ -1,4 +1,4 @@
 {
-  "spec_repo_commit": "f2ae7eb",
-  "generated": "2025-07-17 19:53:16.203"
+  "spec_repo_commit": "20279f4",
+  "generated": "2025-07-18 10:22:50.343"
 }
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 725b65b41ac9..ee3c8b9b9714 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/lib/datadog_api_client/v2/models/entity_v3_api.rb b/lib/datadog_api_client/v2/models/entity_v3_api.rb
index 41b741dc52a9..27494757ce43 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_api.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_api.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3API
     include BaseGenericModel
 
-    # 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.
     attr_reader :api_version
 
     # Datadog product integrations for the API entity.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_api_version.rb b/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
index 152114532d9c..f18f6ef24361 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
@@ -17,10 +17,13 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # 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.
   class EntityV3APIVersion
     include BaseEnumModel
 
     V3 = "v3".freeze
+    V2_2 = "v2.2".freeze
+    V2_1 = "v2.1".freeze
+    V2 = "v2".freeze
   end
 end
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datastore.rb b/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
index 1d158f349a98..7193bfee4d05 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3Datastore
     include BaseGenericModel
 
-    # 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.
     attr_reader :api_version
 
     # Datadog product integrations for the datastore entity.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_queue.rb b/lib/datadog_api_client/v2/models/entity_v3_queue.rb
index 2e227adb5014..15d0c679cd74 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_queue.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_queue.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3Queue
     include BaseGenericModel
 
-    # 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.
     attr_reader :api_version
 
     # Datadog product integrations for the datastore entity.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_service.rb b/lib/datadog_api_client/v2/models/entity_v3_service.rb
index 13bb13cb8f98..a82513baee01 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_service.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_service.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3Service
     include BaseGenericModel
 
-    # 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.
     attr_reader :api_version
 
     # Datadog product integrations for the service entity.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_system.rb b/lib/datadog_api_client/v2/models/entity_v3_system.rb
index 0c57ad7b2f63..f618a1862bac 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_system.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_system.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3System
     include BaseGenericModel
 
-    # 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.
     attr_reader :api_version
 
     # Datadog product integrations for the service entity.