diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index f5051733337..0f6baca4241 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -27347,6 +27347,7 @@ paths:
         - hosts_read
   /api/v1/integration/aws:
     delete:
+      deprecated: true
       description: Delete a Datadog-AWS integration matching the specified `account_id`
         and `role_name parameters`.
       operationId: DeleteAWSAccount
@@ -27393,6 +27394,7 @@ paths:
         permissions:
         - aws_configurations_manage
     get:
+      deprecated: true
       description: List all Datadog-AWS integrations available in your Datadog organization.
       operationId: ListAWSAccounts
       parameters:
@@ -27443,6 +27445,7 @@ paths:
         permissions:
         - aws_configuration_read
     post:
+      deprecated: true
       description: 'Create a Datadog-Amazon Web Services integration.
 
         Using the `POST` method updates your integration configuration
@@ -27494,6 +27497,7 @@ paths:
         permissions:
         - aws_configurations_manage
     put:
+      deprecated: true
       description: Update a Datadog-Amazon Web Services integration.
       operationId: UpdateAWSAccount
       parameters:
@@ -27563,6 +27567,7 @@ paths:
         - aws_configuration_edit
   /api/v1/integration/aws/available_namespace_rules:
     get:
+      deprecated: true
       description: List all namespace rules for a given Datadog-AWS integration. This
         endpoint takes no arguments.
       operationId: ListAvailableAWSNamespaces
@@ -27708,6 +27713,7 @@ paths:
         - manage_integrations
   /api/v1/integration/aws/filtering:
     delete:
+      deprecated: true
       description: Delete a tag filtering entry.
       operationId: DeleteAWSTagFilter
       requestBody:
@@ -27749,6 +27755,7 @@ paths:
         permissions:
         - aws_configuration_edit
     get:
+      deprecated: true
       description: Get all AWS tag filters.
       operationId: ListAWSTagFilters
       parameters:
@@ -27787,6 +27794,7 @@ paths:
         permissions:
         - aws_configuration_read
     post:
+      deprecated: true
       description: Set an AWS tag filter.
       operationId: CreateAWSTagFilter
       requestBody:
@@ -27832,6 +27840,7 @@ paths:
         - aws_configuration_edit
   /api/v1/integration/aws/generate_new_external_id:
     put:
+      deprecated: true
       description: Generate a new AWS external ID for a given AWS account ID and role
         name pair.
       operationId: CreateNewAWSExternalID
@@ -27917,6 +27926,7 @@ paths:
         permissions:
         - aws_configuration_edit
     get:
+      deprecated: true
       description: List all Datadog-AWS Logs integrations configured in your Datadog
         account.
       operationId: ListAWSLogsIntegrations
@@ -28058,6 +28068,7 @@ paths:
         - aws_configuration_read
   /api/v1/integration/aws/logs/services:
     get:
+      deprecated: true
       description: Get the list of current AWS services that Datadog offers automatic
         log collection. Use returned service IDs with the services parameter for the
         Enable an AWS service log collection API endpoint.
@@ -28100,6 +28111,7 @@ paths:
         permissions:
         - aws_configuration_read
     post:
+      deprecated: true
       description: Enable automatic log collection for a list of services. This should
         be run after running `CreateAWSLambdaARN` to save the configuration.
       operationId: EnableAWSLogServices
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 21a2d895b20..f4b9ba788f1 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -55263,9 +55263,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_read
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
     post:
       description: Create a new AWS Account Integration Config.
       operationId: CreateAWSAccount
@@ -55298,9 +55295,6 @@ paths:
         operator: OR
         permissions:
         - aws_configurations_manage
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
   /api/v2/integration/aws/accounts/{aws_account_config_id}:
     delete:
       description: Delete an AWS Account Integration Config by config ID.
@@ -55325,9 +55319,6 @@ paths:
         operator: OR
         permissions:
         - aws_configurations_manage
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
     get:
       description: Get an AWS Account Integration Config by config ID.
       operationId: GetAWSAccount
@@ -55355,9 +55346,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_read
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
     patch:
       description: Update an AWS Account Integration Config by config ID.
       operationId: UpdateAWSAccount
@@ -55392,9 +55380,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_edit
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
   /api/v2/integration/aws/available_namespaces:
     get:
       description: Get a list of available AWS CloudWatch namespaces that can send
@@ -55418,9 +55403,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_read
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
   /api/v2/integration/aws/generate_new_external_id:
     post:
       description: Generate a new external ID for AWS role-based authentication.
@@ -55443,9 +55425,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_edit
-      x-unstable: '**Note: This endpoint is in Preview. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
   /api/v2/integration/aws/iam_permissions:
     get:
       description: Get all AWS IAM permissions required for the AWS integration.
@@ -55484,9 +55463,6 @@ paths:
         operator: OR
         permissions:
         - aws_configuration_read
-      x-unstable: '**Note: This endpoint is in public beta. If you have any feedback,
-
-        contact [Datadog support](https://docs.datadoghq.com/help/).**'
   /api/v2/integration/gcp/accounts:
     get:
       description: List all GCP STS-enabled service accounts configured in your Datadog
diff --git a/examples/v2/aws-integration/CreateAWSAccount.java b/examples/v2/aws-integration/CreateAWSAccount.java
index fd4310d3237..999b0112426 100644
--- a/examples/v2/aws-integration/CreateAWSAccount.java
+++ b/examples/v2/aws-integration/CreateAWSAccount.java
@@ -24,7 +24,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.createAWSAccount", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     AWSAccountCreateRequest body =
diff --git a/examples/v2/aws-integration/CreateAWSAccount_1716720881.java b/examples/v2/aws-integration/CreateAWSAccount_1716720881.java
index e80e80ff0d9..7e6b2e8df3f 100644
--- a/examples/v2/aws-integration/CreateAWSAccount_1716720881.java
+++ b/examples/v2/aws-integration/CreateAWSAccount_1716720881.java
@@ -24,7 +24,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.createAWSAccount", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     AWSAccountCreateRequest body =
diff --git a/examples/v2/aws-integration/CreateNewAWSExternalID.java b/examples/v2/aws-integration/CreateNewAWSExternalID.java
index f67211e5ed9..a7b846fbcbc 100644
--- a/examples/v2/aws-integration/CreateNewAWSExternalID.java
+++ b/examples/v2/aws-integration/CreateNewAWSExternalID.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.createNewAWSExternalID", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     try {
diff --git a/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.java b/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.java
index 975598f3430..cae202688f2 100644
--- a/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.java
+++ b/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.createNewAWSExternalID", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     try {
diff --git a/examples/v2/aws-integration/DeleteAWSAccount.java b/examples/v2/aws-integration/DeleteAWSAccount.java
index b2797ab97c3..30da5072c91 100644
--- a/examples/v2/aws-integration/DeleteAWSAccount.java
+++ b/examples/v2/aws-integration/DeleteAWSAccount.java
@@ -7,7 +7,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.deleteAWSAccount", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     // there is a valid "aws_account_v2" in the system
diff --git a/examples/v2/aws-integration/GetAWSAccount.java b/examples/v2/aws-integration/GetAWSAccount.java
index bd3fccc67df..9d1a1fc91bf 100644
--- a/examples/v2/aws-integration/GetAWSAccount.java
+++ b/examples/v2/aws-integration/GetAWSAccount.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.getAWSAccount", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     // there is a valid "aws_account_v2" in the system
diff --git a/examples/v2/aws-integration/ListAWSAccounts.java b/examples/v2/aws-integration/ListAWSAccounts.java
index 9e0ef915841..7103a714efa 100644
--- a/examples/v2/aws-integration/ListAWSAccounts.java
+++ b/examples/v2/aws-integration/ListAWSAccounts.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.listAWSAccounts", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     try {
diff --git a/examples/v2/aws-integration/ListAWSNamespaces.java b/examples/v2/aws-integration/ListAWSNamespaces.java
index 8c8a84abaa8..ad745830eff 100644
--- a/examples/v2/aws-integration/ListAWSNamespaces.java
+++ b/examples/v2/aws-integration/ListAWSNamespaces.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.listAWSNamespaces", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     try {
diff --git a/examples/v2/aws-integration/ListAWSNamespaces_3031307873.java b/examples/v2/aws-integration/ListAWSNamespaces_3031307873.java
index 796119cc50d..d823829875f 100644
--- a/examples/v2/aws-integration/ListAWSNamespaces_3031307873.java
+++ b/examples/v2/aws-integration/ListAWSNamespaces_3031307873.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.listAWSNamespaces", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     try {
diff --git a/examples/v2/aws-integration/UpdateAWSAccount.java b/examples/v2/aws-integration/UpdateAWSAccount.java
index 8d797511cab..03ac7a3a4da 100644
--- a/examples/v2/aws-integration/UpdateAWSAccount.java
+++ b/examples/v2/aws-integration/UpdateAWSAccount.java
@@ -24,7 +24,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.updateAWSAccount", true);
     AwsIntegrationApi apiInstance = new AwsIntegrationApi(defaultClient);
 
     // there is a valid "aws_account_v2" in the system
diff --git a/examples/v2/aws-logs-integration/ListAWSLogsServices.java b/examples/v2/aws-logs-integration/ListAWSLogsServices.java
index 4cfbe95e1ec..e7c3f216116 100644
--- a/examples/v2/aws-logs-integration/ListAWSLogsServices.java
+++ b/examples/v2/aws-logs-integration/ListAWSLogsServices.java
@@ -8,7 +8,6 @@
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.listAWSLogsServices", true);
     AwsLogsIntegrationApi apiInstance = new AwsLogsIntegrationApi(defaultClient);
 
     try {
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 73c504434d1..0e136cf69f7 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -746,14 +746,6 @@ public class ApiClient {
           put("v2.updateIncidentNotificationTemplate", false);
           put("v2.updateIncidentTodo", false);
           put("v2.updateIncidentType", false);
-          put("v2.createAWSAccount", false);
-          put("v2.createNewAWSExternalID", false);
-          put("v2.deleteAWSAccount", false);
-          put("v2.getAWSAccount", false);
-          put("v2.listAWSAccounts", false);
-          put("v2.listAWSNamespaces", false);
-          put("v2.updateAWSAccount", false);
-          put("v2.listAWSLogsServices", false);
           put("v2.createMonitorUserTemplate", false);
           put("v2.deleteMonitorUserTemplate", false);
           put("v2.getMonitorUserTemplate", false);
diff --git a/src/main/java/com/datadog/api/client/v1/api/AwsIntegrationApi.java b/src/main/java/com/datadog/api/client/v1/api/AwsIntegrationApi.java
index a9e05bff881..21d3bacf08d 100644
--- a/src/main/java/com/datadog/api/client/v1/api/AwsIntegrationApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/AwsIntegrationApi.java
@@ -63,7 +63,9 @@ public void setApiClient(ApiClient apiClient) {
    * @param body AWS Request Object (required)
    * @return AWSAccountCreateResponse
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public AWSAccountCreateResponse createAWSAccount(AWSAccount body) throws ApiException {
     return createAWSAccountWithHttpInfo(body).getData();
   }
@@ -75,7 +77,9 @@ public AWSAccountCreateResponse createAWSAccount(AWSAccount body) throws ApiExce
    *
    * @param body AWS Request Object (required)
    * @return CompletableFuture<AWSAccountCreateResponse>
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<AWSAccountCreateResponse> createAWSAccountAsync(AWSAccount body) {
     return createAWSAccountWithHttpInfoAsync(body)
         .thenApply(
@@ -102,7 +106,10 @@ public CompletableFuture<AWSAccountCreateResponse> createAWSAccountAsync(AWSAcco
    *       <tr><td> 409 </td><td> Conflict Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<AWSAccountCreateResponse> createAWSAccountWithHttpInfo(AWSAccount body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -144,7 +151,9 @@ public ApiResponse<AWSAccountCreateResponse> createAWSAccountWithHttpInfo(AWSAcc
    *
    * @param body AWS Request Object (required)
    * @return CompletableFuture&lt;ApiResponse&lt;AWSAccountCreateResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<AWSAccountCreateResponse>> createAWSAccountWithHttpInfoAsync(
       AWSAccount body) {
     Object localVarPostBody = body;
@@ -340,7 +349,9 @@ public ApiResponse<AWSEventBridgeCreateResponse> createAWSEventBridgeSourceWithH
    *     </code>, and <code>custom</code>. (required)
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object createAWSTagFilter(AWSTagFilterCreateRequest body) throws ApiException {
     return createAWSTagFilterWithHttpInfo(body).getData();
   }
@@ -355,7 +366,9 @@ public Object createAWSTagFilter(AWSTagFilterCreateRequest body) throws ApiExcep
    *     elb</code>, <code>lambda</code>, <code>network_elb</code>, <code>rds</code>, <code>sqs
    *     </code>, and <code>custom</code>. (required)
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> createAWSTagFilterAsync(AWSTagFilterCreateRequest body) {
     return createAWSTagFilterWithHttpInfoAsync(body)
         .thenApply(
@@ -382,7 +395,10 @@ public CompletableFuture<Object> createAWSTagFilterAsync(AWSTagFilterCreateReque
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<Object> createAWSTagFilterWithHttpInfo(AWSTagFilterCreateRequest body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -427,7 +443,9 @@ public ApiResponse<Object> createAWSTagFilterWithHttpInfo(AWSTagFilterCreateRequ
    *     elb</code>, <code>lambda</code>, <code>network_elb</code>, <code>rds</code>, <code>sqs
    *     </code>, and <code>custom</code>. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<Object>> createAWSTagFilterWithHttpInfoAsync(
       AWSTagFilterCreateRequest body) {
     Object localVarPostBody = body;
@@ -483,7 +501,9 @@ public CompletableFuture<ApiResponse<Object>> createAWSTagFilterWithHttpInfoAsyn
    *     integration configuration info</a>. (required)
    * @return AWSAccountCreateResponse
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public AWSAccountCreateResponse createNewAWSExternalID(AWSAccount body) throws ApiException {
     return createNewAWSExternalIDWithHttpInfo(body).getData();
   }
@@ -498,7 +518,9 @@ public AWSAccountCreateResponse createNewAWSExternalID(AWSAccount body) throws A
    *     href="https://docs.datadoghq.com/integrations/amazon_web_services/#setup">Datadog AWS
    *     integration configuration info</a>. (required)
    * @return CompletableFuture&lt;AWSAccountCreateResponse&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<AWSAccountCreateResponse> createNewAWSExternalIDAsync(AWSAccount body) {
     return createNewAWSExternalIDWithHttpInfoAsync(body)
         .thenApply(
@@ -525,7 +547,10 @@ public CompletableFuture<AWSAccountCreateResponse> createNewAWSExternalIDAsync(A
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<AWSAccountCreateResponse> createNewAWSExternalIDWithHttpInfo(AWSAccount body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -570,7 +595,9 @@ public ApiResponse<AWSAccountCreateResponse> createNewAWSExternalIDWithHttpInfo(
    *     href="https://docs.datadoghq.com/integrations/amazon_web_services/#setup">Datadog AWS
    *     integration configuration info</a>. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;AWSAccountCreateResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<AWSAccountCreateResponse>>
       createNewAWSExternalIDWithHttpInfoAsync(AWSAccount body) {
     Object localVarPostBody = body;
@@ -623,7 +650,9 @@ public ApiResponse<AWSAccountCreateResponse> createNewAWSExternalIDWithHttpInfo(
    * @param body AWS request object (required)
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object deleteAWSAccount(AWSAccountDeleteRequest body) throws ApiException {
     return deleteAWSAccountWithHttpInfo(body).getData();
   }
@@ -635,7 +664,9 @@ public Object deleteAWSAccount(AWSAccountDeleteRequest body) throws ApiException
    *
    * @param body AWS request object (required)
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> deleteAWSAccountAsync(AWSAccountDeleteRequest body) {
     return deleteAWSAccountWithHttpInfoAsync(body)
         .thenApply(
@@ -661,7 +692,10 @@ public CompletableFuture<Object> deleteAWSAccountAsync(AWSAccountDeleteRequest b
    *       <tr><td> 409 </td><td> Conflict Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<Object> deleteAWSAccountWithHttpInfo(AWSAccountDeleteRequest body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -703,7 +737,9 @@ public ApiResponse<Object> deleteAWSAccountWithHttpInfo(AWSAccountDeleteRequest
    *
    * @param body AWS request object (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<Object>> deleteAWSAccountWithHttpInfoAsync(
       AWSAccountDeleteRequest body) {
     Object localVarPostBody = body;
@@ -897,7 +933,9 @@ public ApiResponse<AWSEventBridgeDeleteResponse> deleteAWSEventBridgeSourceWithH
    *     namespace. (required)
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object deleteAWSTagFilter(AWSTagFilterDeleteRequest body) throws ApiException {
     return deleteAWSTagFilterWithHttpInfo(body).getData();
   }
@@ -910,7 +948,9 @@ public Object deleteAWSTagFilter(AWSTagFilterDeleteRequest body) throws ApiExcep
    * @param body Delete a tag filtering entry for a given AWS account and <code>dd-aws</code>
    *     namespace. (required)
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> deleteAWSTagFilterAsync(AWSTagFilterDeleteRequest body) {
     return deleteAWSTagFilterWithHttpInfoAsync(body)
         .thenApply(
@@ -935,7 +975,10 @@ public CompletableFuture<Object> deleteAWSTagFilterAsync(AWSTagFilterDeleteReque
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<Object> deleteAWSTagFilterWithHttpInfo(AWSTagFilterDeleteRequest body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -978,7 +1021,9 @@ public ApiResponse<Object> deleteAWSTagFilterWithHttpInfo(AWSTagFilterDeleteRequ
    * @param body Delete a tag filtering entry for a given AWS account and <code>dd-aws</code>
    *     namespace. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<Object>> deleteAWSTagFilterWithHttpInfoAsync(
       AWSTagFilterDeleteRequest body) {
     Object localVarPostBody = body;
@@ -1030,7 +1075,9 @@ public CompletableFuture<ApiResponse<Object>> deleteAWSTagFilterWithHttpInfoAsyn
    *
    * @return List&lt;String&gt;
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public List<String> listAvailableAWSNamespaces() throws ApiException {
     return listAvailableAWSNamespacesWithHttpInfo().getData();
   }
@@ -1041,7 +1088,9 @@ public List<String> listAvailableAWSNamespaces() throws ApiException {
    * <p>See {@link #listAvailableAWSNamespacesWithHttpInfoAsync}.
    *
    * @return CompletableFuture&lt;List&lt;String&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<List<String>> listAvailableAWSNamespacesAsync() {
     return listAvailableAWSNamespacesWithHttpInfoAsync()
         .thenApply(
@@ -1063,7 +1112,10 @@ public CompletableFuture<List<String>> listAvailableAWSNamespacesAsync() {
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<List<String>> listAvailableAWSNamespacesWithHttpInfo() throws ApiException {
     Object localVarPostBody = null;
     // create path and map variables
@@ -1097,7 +1149,9 @@ public ApiResponse<List<String>> listAvailableAWSNamespacesWithHttpInfo() throws
    * <p>See {@link #listAvailableAWSNamespacesWithHttpInfo}.
    *
    * @return CompletableFuture&lt;ApiResponse&lt;List&lt;String&gt;&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<List<String>>>
       listAvailableAWSNamespacesWithHttpInfoAsync() {
     Object localVarPostBody = null;
@@ -1182,7 +1236,9 @@ public ListAWSAccountsOptionalParameters accessKeyId(String accessKeyId) {
    *
    * @return AWSAccountListResponse
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public AWSAccountListResponse listAWSAccounts() throws ApiException {
     return listAWSAccountsWithHttpInfo(new ListAWSAccountsOptionalParameters()).getData();
   }
@@ -1193,7 +1249,9 @@ public AWSAccountListResponse listAWSAccounts() throws ApiException {
    * <p>See {@link #listAWSAccountsWithHttpInfoAsync}.
    *
    * @return CompletableFuture&lt;AWSAccountListResponse&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<AWSAccountListResponse> listAWSAccountsAsync() {
     return listAWSAccountsWithHttpInfoAsync(new ListAWSAccountsOptionalParameters())
         .thenApply(
@@ -1210,7 +1268,9 @@ public CompletableFuture<AWSAccountListResponse> listAWSAccountsAsync() {
    * @param parameters Optional parameters for the request.
    * @return AWSAccountListResponse
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public AWSAccountListResponse listAWSAccounts(ListAWSAccountsOptionalParameters parameters)
       throws ApiException {
     return listAWSAccountsWithHttpInfo(parameters).getData();
@@ -1223,7 +1283,9 @@ public AWSAccountListResponse listAWSAccounts(ListAWSAccountsOptionalParameters
    *
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;AWSAccountListResponse&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<AWSAccountListResponse> listAWSAccountsAsync(
       ListAWSAccountsOptionalParameters parameters) {
     return listAWSAccountsWithHttpInfoAsync(parameters)
@@ -1248,7 +1310,10 @@ public CompletableFuture<AWSAccountListResponse> listAWSAccountsAsync(
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<AWSAccountListResponse> listAWSAccountsWithHttpInfo(
       ListAWSAccountsOptionalParameters parameters) throws ApiException {
     Object localVarPostBody = null;
@@ -1292,7 +1357,9 @@ public ApiResponse<AWSAccountListResponse> listAWSAccountsWithHttpInfo(
    *
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;ApiResponse&lt;AWSAccountListResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<AWSAccountListResponse>> listAWSAccountsWithHttpInfoAsync(
       ListAWSAccountsOptionalParameters parameters) {
     Object localVarPostBody = null;
@@ -1456,7 +1523,9 @@ public ApiResponse<AWSEventBridgeListResponse> listAWSEventBridgeSourcesWithHttp
    * @param accountId Only return AWS filters that matches this <code>account_id</code>. (required)
    * @return AWSTagFilterListResponse
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public AWSTagFilterListResponse listAWSTagFilters(String accountId) throws ApiException {
     return listAWSTagFiltersWithHttpInfo(accountId).getData();
   }
@@ -1468,7 +1537,9 @@ public AWSTagFilterListResponse listAWSTagFilters(String accountId) throws ApiEx
    *
    * @param accountId Only return AWS filters that matches this <code>account_id</code>. (required)
    * @return CompletableFuture&lt;AWSTagFilterListResponse&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<AWSTagFilterListResponse> listAWSTagFiltersAsync(String accountId) {
     return listAWSTagFiltersWithHttpInfoAsync(accountId)
         .thenApply(
@@ -1492,7 +1563,10 @@ public CompletableFuture<AWSTagFilterListResponse> listAWSTagFiltersAsync(String
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<AWSTagFilterListResponse> listAWSTagFiltersWithHttpInfo(String accountId)
       throws ApiException {
     Object localVarPostBody = null;
@@ -1537,7 +1611,9 @@ public ApiResponse<AWSTagFilterListResponse> listAWSTagFiltersWithHttpInfo(Strin
    *
    * @param accountId Only return AWS filters that matches this <code>account_id</code>. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;AWSTagFilterListResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<AWSTagFilterListResponse>>
       listAWSTagFiltersWithHttpInfoAsync(String accountId) {
     Object localVarPostBody = null;
@@ -1636,7 +1712,9 @@ public UpdateAWSAccountOptionalParameters accessKeyId(String accessKeyId) {
    * @param body AWS request object (required)
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object updateAWSAccount(AWSAccount body) throws ApiException {
     return updateAWSAccountWithHttpInfo(body, new UpdateAWSAccountOptionalParameters()).getData();
   }
@@ -1648,7 +1726,9 @@ public Object updateAWSAccount(AWSAccount body) throws ApiException {
    *
    * @param body AWS request object (required)
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> updateAWSAccountAsync(AWSAccount body) {
     return updateAWSAccountWithHttpInfoAsync(body, new UpdateAWSAccountOptionalParameters())
         .thenApply(
@@ -1666,7 +1746,9 @@ public CompletableFuture<Object> updateAWSAccountAsync(AWSAccount body) {
    * @param parameters Optional parameters for the request.
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object updateAWSAccount(AWSAccount body, UpdateAWSAccountOptionalParameters parameters)
       throws ApiException {
     return updateAWSAccountWithHttpInfo(body, parameters).getData();
@@ -1680,7 +1762,9 @@ public Object updateAWSAccount(AWSAccount body, UpdateAWSAccountOptionalParamete
    * @param body AWS request object (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> updateAWSAccountAsync(
       AWSAccount body, UpdateAWSAccountOptionalParameters parameters) {
     return updateAWSAccountWithHttpInfoAsync(body, parameters)
@@ -1707,7 +1791,10 @@ public CompletableFuture<Object> updateAWSAccountAsync(
    *       <tr><td> 409 </td><td> Conflict Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<Object> updateAWSAccountWithHttpInfo(
       AWSAccount body, UpdateAWSAccountOptionalParameters parameters) throws ApiException {
     Object localVarPostBody = body;
@@ -1758,7 +1845,9 @@ public ApiResponse<Object> updateAWSAccountWithHttpInfo(
    * @param body AWS request object (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<Object>> updateAWSAccountWithHttpInfoAsync(
       AWSAccount body, UpdateAWSAccountOptionalParameters parameters) {
     Object localVarPostBody = body;
diff --git a/src/main/java/com/datadog/api/client/v1/api/AwsLogsIntegrationApi.java b/src/main/java/com/datadog/api/client/v1/api/AwsLogsIntegrationApi.java
index 2b00861275f..f44c3b5b872 100644
--- a/src/main/java/com/datadog/api/client/v1/api/AwsLogsIntegrationApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/AwsLogsIntegrationApi.java
@@ -606,7 +606,9 @@ public CompletableFuture<ApiResponse<Object>> deleteAWSLambdaARNWithHttpInfoAsyn
    * @param body Enable AWS Log Services request body. (required)
    * @return Object
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public Object enableAWSLogServices(AWSLogsServicesRequest body) throws ApiException {
     return enableAWSLogServicesWithHttpInfo(body).getData();
   }
@@ -618,7 +620,9 @@ public Object enableAWSLogServices(AWSLogsServicesRequest body) throws ApiExcept
    *
    * @param body Enable AWS Log Services request body. (required)
    * @return CompletableFuture&lt;Object&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<Object> enableAWSLogServicesAsync(AWSLogsServicesRequest body) {
     return enableAWSLogServicesWithHttpInfoAsync(body)
         .thenApply(
@@ -643,7 +647,10 @@ public CompletableFuture<Object> enableAWSLogServicesAsync(AWSLogsServicesReques
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<Object> enableAWSLogServicesWithHttpInfo(AWSLogsServicesRequest body)
       throws ApiException {
     Object localVarPostBody = body;
@@ -685,7 +692,9 @@ public ApiResponse<Object> enableAWSLogServicesWithHttpInfo(AWSLogsServicesReque
    *
    * @param body Enable AWS Log Services request body. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<Object>> enableAWSLogServicesWithHttpInfoAsync(
       AWSLogsServicesRequest body) {
     Object localVarPostBody = body;
@@ -737,7 +746,9 @@ public CompletableFuture<ApiResponse<Object>> enableAWSLogServicesWithHttpInfoAs
    *
    * @return List&lt;AWSLogsListResponse&gt;
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public List<AWSLogsListResponse> listAWSLogsIntegrations() throws ApiException {
     return listAWSLogsIntegrationsWithHttpInfo().getData();
   }
@@ -748,7 +759,9 @@ public List<AWSLogsListResponse> listAWSLogsIntegrations() throws ApiException {
    * <p>See {@link #listAWSLogsIntegrationsWithHttpInfoAsync}.
    *
    * @return CompletableFuture&lt;List&lt;AWSLogsListResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<List<AWSLogsListResponse>> listAWSLogsIntegrationsAsync() {
     return listAWSLogsIntegrationsWithHttpInfoAsync()
         .thenApply(
@@ -771,7 +784,10 @@ public CompletableFuture<List<AWSLogsListResponse>> listAWSLogsIntegrationsAsync
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<List<AWSLogsListResponse>> listAWSLogsIntegrationsWithHttpInfo()
       throws ApiException {
     Object localVarPostBody = null;
@@ -806,7 +822,9 @@ public ApiResponse<List<AWSLogsListResponse>> listAWSLogsIntegrationsWithHttpInf
    * <p>See {@link #listAWSLogsIntegrationsWithHttpInfo}.
    *
    * @return CompletableFuture&lt;ApiResponse&lt;List&lt;AWSLogsListResponse&gt;&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<List<AWSLogsListResponse>>>
       listAWSLogsIntegrationsWithHttpInfoAsync() {
     Object localVarPostBody = null;
@@ -849,7 +867,9 @@ public ApiResponse<List<AWSLogsListResponse>> listAWSLogsIntegrationsWithHttpInf
    *
    * @return List&lt;AWSLogsListServicesResponse&gt;
    * @throws ApiException if fails to make API call
+   * @deprecated
    */
+  @Deprecated
   public List<AWSLogsListServicesResponse> listAWSLogsServices() throws ApiException {
     return listAWSLogsServicesWithHttpInfo().getData();
   }
@@ -860,7 +880,9 @@ public List<AWSLogsListServicesResponse> listAWSLogsServices() throws ApiExcepti
    * <p>See {@link #listAWSLogsServicesWithHttpInfoAsync}.
    *
    * @return CompletableFuture&lt;List&lt;AWSLogsListServicesResponse&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<List<AWSLogsListServicesResponse>> listAWSLogsServicesAsync() {
     return listAWSLogsServicesWithHttpInfoAsync()
         .thenApply(
@@ -884,7 +906,10 @@ public CompletableFuture<List<AWSLogsListServicesResponse>> listAWSLogsServicesA
    *       <tr><td> 403 </td><td> Authentication Error </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
+   *
+   * @deprecated
    */
+  @Deprecated
   public ApiResponse<List<AWSLogsListServicesResponse>> listAWSLogsServicesWithHttpInfo()
       throws ApiException {
     Object localVarPostBody = null;
@@ -919,7 +944,9 @@ public ApiResponse<List<AWSLogsListServicesResponse>> listAWSLogsServicesWithHtt
    * <p>See {@link #listAWSLogsServicesWithHttpInfo}.
    *
    * @return CompletableFuture&lt;ApiResponse&lt;List&lt;AWSLogsListServicesResponse&gt;&gt;&gt;
+   * @deprecated
    */
+  @Deprecated
   public CompletableFuture<ApiResponse<List<AWSLogsListServicesResponse>>>
       listAWSLogsServicesWithHttpInfoAsync() {
     Object localVarPostBody = null;
diff --git a/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java b/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
index 383941ce40a..c2a33e6fcc9 100644
--- a/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/AwsIntegrationApi.java
@@ -98,13 +98,6 @@ public CompletableFuture<AWSAccountResponse> createAWSAccountAsync(AWSAccountCre
    */
   public ApiResponse<AWSAccountResponse> createAWSAccountWithHttpInfo(AWSAccountCreateRequest body)
       throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "createAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = body;
 
     // verify the required parameter 'body' is set
@@ -147,16 +140,6 @@ public ApiResponse<AWSAccountResponse> createAWSAccountWithHttpInfo(AWSAccountCr
    */
   public CompletableFuture<ApiResponse<AWSAccountResponse>> createAWSAccountWithHttpInfoAsync(
       AWSAccountCreateRequest body) {
-    // Check if unstable operation is enabled
-    String operationId = "createAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSAccountResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = body;
 
     // verify the required parameter 'body' is set
@@ -242,13 +225,6 @@ public CompletableFuture<AWSNewExternalIDResponse> createNewAWSExternalIDAsync()
    */
   public ApiResponse<AWSNewExternalIDResponse> createNewAWSExternalIDWithHttpInfo()
       throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "createNewAWSExternalID";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/generate_new_external_id";
@@ -284,16 +260,6 @@ public ApiResponse<AWSNewExternalIDResponse> createNewAWSExternalIDWithHttpInfo(
    */
   public CompletableFuture<ApiResponse<AWSNewExternalIDResponse>>
       createNewAWSExternalIDWithHttpInfoAsync() {
-    // Check if unstable operation is enabled
-    String operationId = "createNewAWSExternalID";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSNewExternalIDResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/generate_new_external_id";
@@ -383,13 +349,6 @@ public CompletableFuture<Void> deleteAWSAccountAsync(String awsAccountConfigId)
    */
   public ApiResponse<Void> deleteAWSAccountWithHttpInfo(String awsAccountConfigId)
       throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "deleteAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
 
     // verify the required parameter 'awsAccountConfigId' is set
@@ -439,16 +398,6 @@ public ApiResponse<Void> deleteAWSAccountWithHttpInfo(String awsAccountConfigId)
    */
   public CompletableFuture<ApiResponse<Void>> deleteAWSAccountWithHttpInfoAsync(
       String awsAccountConfigId) {
-    // Check if unstable operation is enabled
-    String operationId = "deleteAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
 
     // verify the required parameter 'awsAccountConfigId' is set
@@ -553,13 +502,6 @@ public CompletableFuture<AWSAccountResponse> getAWSAccountAsync(String awsAccoun
    */
   public ApiResponse<AWSAccountResponse> getAWSAccountWithHttpInfo(String awsAccountConfigId)
       throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "getAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
 
     // verify the required parameter 'awsAccountConfigId' is set
@@ -609,16 +551,6 @@ public ApiResponse<AWSAccountResponse> getAWSAccountWithHttpInfo(String awsAccou
    */
   public CompletableFuture<ApiResponse<AWSAccountResponse>> getAWSAccountWithHttpInfoAsync(
       String awsAccountConfigId) {
-    // Check if unstable operation is enabled
-    String operationId = "getAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSAccountResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
 
     // verify the required parameter 'awsAccountConfigId' is set
@@ -871,13 +803,6 @@ public CompletableFuture<AWSAccountsResponse> listAWSAccountsAsync(
    */
   public ApiResponse<AWSAccountsResponse> listAWSAccountsWithHttpInfo(
       ListAWSAccountsOptionalParameters parameters) throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSAccounts";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
     String awsAccountId = parameters.awsAccountId;
     // create path and map variables
@@ -918,16 +843,6 @@ public ApiResponse<AWSAccountsResponse> listAWSAccountsWithHttpInfo(
    */
   public CompletableFuture<ApiResponse<AWSAccountsResponse>> listAWSAccountsWithHttpInfoAsync(
       ListAWSAccountsOptionalParameters parameters) {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSAccounts";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSAccountsResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
     String awsAccountId = parameters.awsAccountId;
     // create path and map variables
@@ -1007,13 +922,6 @@ public CompletableFuture<AWSNamespacesResponse> listAWSNamespacesAsync() {
    *     </table>
    */
   public ApiResponse<AWSNamespacesResponse> listAWSNamespacesWithHttpInfo() throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSNamespaces";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/available_namespaces";
@@ -1049,16 +957,6 @@ public ApiResponse<AWSNamespacesResponse> listAWSNamespacesWithHttpInfo() throws
    */
   public CompletableFuture<ApiResponse<AWSNamespacesResponse>>
       listAWSNamespacesWithHttpInfoAsync() {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSNamespaces";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSNamespacesResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/available_namespaces";
@@ -1154,13 +1052,6 @@ public CompletableFuture<AWSAccountResponse> updateAWSAccountAsync(
    */
   public ApiResponse<AWSAccountResponse> updateAWSAccountWithHttpInfo(
       String awsAccountConfigId, AWSAccountUpdateRequest body) throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "updateAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = body;
 
     // verify the required parameter 'awsAccountConfigId' is set
@@ -1217,16 +1108,6 @@ public ApiResponse<AWSAccountResponse> updateAWSAccountWithHttpInfo(
    */
   public CompletableFuture<ApiResponse<AWSAccountResponse>> updateAWSAccountWithHttpInfoAsync(
       String awsAccountConfigId, AWSAccountUpdateRequest body) {
-    // Check if unstable operation is enabled
-    String operationId = "updateAWSAccount";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSAccountResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = body;
 
     // verify the required parameter 'awsAccountConfigId' is set
diff --git a/src/main/java/com/datadog/api/client/v2/api/AwsLogsIntegrationApi.java b/src/main/java/com/datadog/api/client/v2/api/AwsLogsIntegrationApi.java
index cb66b6bc36d..f2bb2ea8be9 100644
--- a/src/main/java/com/datadog/api/client/v2/api/AwsLogsIntegrationApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/AwsLogsIntegrationApi.java
@@ -86,13 +86,6 @@ public CompletableFuture<AWSLogsServicesResponse> listAWSLogsServicesAsync() {
    */
   public ApiResponse<AWSLogsServicesResponse> listAWSLogsServicesWithHttpInfo()
       throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSLogsServices";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/logs/services";
@@ -128,16 +121,6 @@ public ApiResponse<AWSLogsServicesResponse> listAWSLogsServicesWithHttpInfo()
    */
   public CompletableFuture<ApiResponse<AWSLogsServicesResponse>>
       listAWSLogsServicesWithHttpInfoAsync() {
-    // Check if unstable operation is enabled
-    String operationId = "listAWSLogsServices";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<AWSLogsServicesResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
     Object localVarPostBody = null;
     // create path and map variables
     String localVarPath = "/api/v2/integration/aws/logs/services";
diff --git a/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature b/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
index e0f1d4d7267..a672cfebe7f 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/aws_integration.feature
@@ -11,32 +11,28 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Create an AWS account returns "AWS Account object" response
-    Given operation "CreateAWSAccount" enabled
-    And new "CreateAWSAccount" request
+    Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
   @team:DataDog/aws-integrations
   Scenario: Create an AWS integration returns "AWS Account object" response
-    Given operation "CreateAWSAccount" enabled
-    And new "CreateAWSAccount" request
+    Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
   @team:DataDog/aws-integrations
   Scenario: Create an AWS integration returns "Bad Request" response
-    Given operation "CreateAWSAccount" enabled
-    And new "CreateAWSAccount" request
+    Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws-invalid", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @team:DataDog/aws-integrations
   Scenario: Create an AWS integration returns "Conflict" response
-    Given operation "CreateAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
@@ -44,16 +40,14 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Delete an AWS integration returns "Bad Request" response
-    Given operation "DeleteAWSAccount" enabled
-    And new "DeleteAWSAccount" request
+    Given new "DeleteAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "not-a-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @team:DataDog/aws-integrations
   Scenario: Delete an AWS integration returns "No Content" response
-    Given operation "DeleteAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "DeleteAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
     When the request is sent
@@ -61,8 +55,7 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Delete an AWS integration returns "Not Found" response
-    Given operation "DeleteAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "DeleteAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
     When the request is sent
@@ -70,15 +63,13 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Generate a new external ID returns "AWS External ID object" response
-    Given operation "CreateNewAWSExternalID" enabled
-    And new "CreateNewAWSExternalID" request
+    Given new "CreateNewAWSExternalID" request
     When the request is sent
     Then the response status is 200 AWS External ID object
 
   @team:DataDog/aws-integrations
   Scenario: Generate new external ID returns "AWS External ID object" response
-    Given operation "CreateNewAWSExternalID" enabled
-    And new "CreateNewAWSExternalID" request
+    Given new "CreateNewAWSExternalID" request
     When the request is sent
     Then the response status is 200 AWS External ID object
 
@@ -90,8 +81,7 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Get an AWS integration by config ID returns "AWS Account object" response
-    Given operation "GetAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "GetAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
     When the request is sent
@@ -99,45 +89,39 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Get an AWS integration by config ID returns "Bad Request" response
-    Given operation "GetAWSAccount" enabled
-    And new "GetAWSAccount" request
+    Given new "GetAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "not-a-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @team:DataDog/aws-integrations
   Scenario: Get an AWS integration by config ID returns "Not Found" response
-    Given operation "GetAWSAccount" enabled
-    And new "GetAWSAccount" request
+    Given new "GetAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
     When the request is sent
     Then the response status is 404 Not Found
 
   @team:DataDog/aws-integrations
   Scenario: List all AWS integrations returns "AWS Accounts List object" response
-    Given operation "ListAWSAccounts" enabled
-    And new "ListAWSAccounts" request
+    Given new "ListAWSAccounts" request
     When the request is sent
     Then the response status is 200 AWS Accounts List object
 
   @team:DataDog/aws-integrations
   Scenario: List available namespaces returns "AWS Namespaces List object" response
-    Given operation "ListAWSNamespaces" enabled
-    And new "ListAWSNamespaces" request
+    Given new "ListAWSNamespaces" request
     When the request is sent
     Then the response status is 200 AWS Namespaces List object
 
   @team:DataDog/aws-integrations
   Scenario: List namespaces returns "AWS Namespaces List object" response
-    Given operation "ListAWSNamespaces" enabled
-    And new "ListAWSNamespaces" request
+    Given new "ListAWSNamespaces" request
     When the request is sent
     Then the response status is 200 AWS Namespaces List object
 
   @team:DataDog/aws-integrations
   Scenario: Update an AWS integration returns "AWS Account object" response
-    Given operation "UpdateAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
@@ -146,8 +130,7 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Update an AWS integration returns "Bad Request" response
-    Given operation "UpdateAWSAccount" enabled
-    And there is a valid "aws_account_v2" in the system
+    Given there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id"
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
@@ -156,8 +139,7 @@ Feature: AWS Integration
 
   @team:DataDog/aws-integrations
   Scenario: Update an AWS integration returns "Not Found" response
-    Given operation "UpdateAWSAccount" enabled
-    And new "UpdateAWSAccount" request
+    Given new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
diff --git a/src/test/resources/com/datadog/api/client/v2/api/aws_logs_integration.feature b/src/test/resources/com/datadog/api/client/v2/api/aws_logs_integration.feature
index 7dcfb894ae9..0dc915e5794 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/aws_logs_integration.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/aws_logs_integration.feature
@@ -10,7 +10,6 @@ Feature: AWS Logs Integration
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
     And an instance of "AWSLogsIntegration" API
-    And operation "ListAWSLogsServices" enabled
     And new "ListAWSLogsServices" request
     When the request is sent
     Then the response status is 200 AWS Logs Services List object