diff --git a/.apigentools-info b/.apigentools-info
index a777fbf825..f5524d01fe 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-27 17:12:13.841874",
-            "spec_repo_commit": "ed439f7c"
+            "regenerated": "2025-05-28 13:02:46.527315",
+            "spec_repo_commit": "2024b158"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-27 17:12:13.857049",
-            "spec_repo_commit": "ed439f7c"
+            "regenerated": "2025-05-28 13:02:46.542946",
+            "spec_repo_commit": "2024b158"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 5c41dee7d8..b4b7935172 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -3989,6 +3989,7 @@ components:
       description: The ID of the AWS account.
       example: '123456789012'
       type: string
+      x-model-simple-name: AccountId
     AwsCURConfig:
       description: AWS CUR config.
       properties:
@@ -4223,6 +4224,7 @@ components:
           example: QUEUED
           type: string
       type: object
+      x-model-simple-name: OnDemandAttributes
     AwsOnDemandCreateAttributes:
       description: Attributes for the AWS on demand task.
       properties:
@@ -4234,6 +4236,7 @@ components:
       required:
       - arn
       type: object
+      x-model-simple-name: OnDemandCreateAttributes
     AwsOnDemandCreateData:
       description: Object for a single AWS on demand task.
       properties:
@@ -4245,6 +4248,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: OnDemandCreateData
     AwsOnDemandCreateRequest:
       description: Request object that includes the on demand task to submit.
       properties:
@@ -4253,6 +4257,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: OnDemandCreateRequest
     AwsOnDemandData:
       description: Single AWS on demand task.
       properties:
@@ -4265,6 +4270,7 @@ components:
         type:
           $ref: '#/components/schemas/AwsOnDemandType'
       type: object
+      x-model-simple-name: OnDemandData
     AwsOnDemandListResponse:
       description: Response object that includes a list of AWS on demand tasks.
       properties:
@@ -4274,12 +4280,14 @@ components:
             $ref: '#/components/schemas/AwsOnDemandData'
           type: array
       type: object
+      x-model-simple-name: OnDemandListResponse
     AwsOnDemandResponse:
       description: Response object that includes an AWS on demand task.
       properties:
         data:
           $ref: '#/components/schemas/AwsOnDemandData'
       type: object
+      x-model-simple-name: OnDemandResponse
     AwsOnDemandType:
       default: aws_resource
       description: The type of the on demand task. The value should always be `aws_resource`.
@@ -4289,6 +4297,7 @@ components:
       type: string
       x-enum-varnames:
       - AWS_RESOURCE
+      x-model-simple-name: OnDemandType
     AwsScanOptionsAttributes:
       description: Attributes for the AWS scan options.
       properties:
@@ -4310,6 +4319,7 @@ components:
           example: true
           type: boolean
       type: object
+      x-model-simple-name: ScanOptionsAttributes
     AwsScanOptionsCreateAttributes:
       description: Attributes for the AWS scan options to create.
       properties:
@@ -4336,6 +4346,7 @@ components:
       - vuln_containers_os
       - vuln_host_os
       type: object
+      x-model-simple-name: ScanOptionsCreateAttributes
     AwsScanOptionsCreateData:
       description: Object for the scan options of a single AWS account.
       properties:
@@ -4350,6 +4361,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: ScanOptionsCreateData
     AwsScanOptionsCreateRequest:
       description: Request object that includes the scan options to create.
       properties:
@@ -4358,6 +4370,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: ScanOptionsCreateRequest
     AwsScanOptionsData:
       description: Single AWS Scan Options entry.
       properties:
@@ -4370,6 +4383,7 @@ components:
         type:
           $ref: '#/components/schemas/AwsScanOptionsType'
       type: object
+      x-model-simple-name: ScanOptionsData
     AwsScanOptionsListResponse:
       description: Response object that includes a list of AWS scan options.
       properties:
@@ -4379,12 +4393,14 @@ components:
             $ref: '#/components/schemas/AwsScanOptionsData'
           type: array
       type: object
+      x-model-simple-name: ScanOptionsListResponse
     AwsScanOptionsResponse:
       description: Response object that includes the scan options of an AWS account.
       properties:
         data:
           $ref: '#/components/schemas/AwsScanOptionsData'
       type: object
+      x-model-simple-name: ScanOptionsResponse
     AwsScanOptionsType:
       default: aws_scan_options
       description: The type of the resource. The value should always be `aws_scan_options`.
@@ -4394,6 +4410,7 @@ components:
       type: string
       x-enum-varnames:
       - AWS_SCAN_OPTIONS
+      x-model-simple-name: ScanOptionsType
     AwsScanOptionsUpdateAttributes:
       description: Attributes for the AWS scan options to update.
       properties:
@@ -4415,6 +4432,7 @@ components:
           example: true
           type: boolean
       type: object
+      x-model-simple-name: ScanOptionsUpdateAttributes
     AwsScanOptionsUpdateData:
       description: Object for the scan options of a single AWS account.
       properties:
@@ -4429,6 +4447,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: ScanOptionsUpdateData
     AwsScanOptionsUpdateRequest:
       description: Request object that includes the scan options to update.
       properties:
@@ -4437,6 +4456,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: ScanOptionsUpdateRequest
     AzureStorageDestination:
       description: The `azure_storage` destination forwards logs to an Azure Blob
         Storage container.