From efda32751367c3e83881e3a9089fd7da4e1d3455 Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Wed, 12 Aug 2026 10:01:35 +0000
Subject: [PATCH] Regenerate client from commit 4256aa4 of spec repo

---
 .generator/schemas/v2/openapi.yaml            | 144 +++++++-
 .../PatchDORADeploymentByVersion.java         |  47 +++
 .../com/datadog/api/client/ApiClient.java     |   1 +
 .../api/client/v2/api/DoraMetricsApi.java     | 155 +++++++++
 ...RADeploymentPatchByVersionRemediation.java | 326 ++++++++++++++++++
 ...ploymentPatchByVersionRemediationByID.java | 127 +++++++
 ...entPatchByVersionRemediationByVersion.java | 132 +++++++
 .../DORADeploymentPatchByVersionRequest.java  | 151 ++++++++
 ...oymentPatchByVersionRequestAttributes.java | 272 +++++++++++++++
 ...RADeploymentPatchByVersionRequestData.java | 191 ++++++++++
 .../model/DORADeploymentPatchRemediation.java |  40 ++-
 .../DORADeploymentPatchRequestAttributes.java |   3 +-
 ...th_metadata_deserializes_successfully.json |   2 +-
 ...your_organization_returns_OK_response.json |   2 +-
 ...te_API_key_returns_Forbidden_response.json |   2 +-
 .../Validate_API_key_returns_OK_response.json |   2 +-
 ...ount_config_returns_Conflict_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...nt_config_returns_No_Content_response.json |   2 +-
 ...unt_config_returns_Not_Found_response.json |   4 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Archive_case_returns_OK_response.json  |   2 +-
 ...ign_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Assign_case_returns_OK_response.json   |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ..._a_historical_job_returns_OK_response.json |   2 +-
 ...ent_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Comment_case_returns_OK_response.json  |   2 +-
 ...eturns_AWS_CCM_Config_object_response.json |   2 +-
 ..._CCM_config_returns_Conflict_response.json |   4 +-
 ...options_enabled_successfully_response.json |   2 +-
 ..._Connection_returns_Conflict_response.json |   4 +-
 ...te_Org_Connection_returns_OK_response.json |   2 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...should_save_match_returns_OK_response.json |   4 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...m_framework_returns_Conflict_response.json |   6 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...e_a_dataset_returns_Conflict_response.json |   4 +-
 .../Create_a_dataset_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...ncident_type_returns_CREATED_response.json |   2 +-
 ...ase_type_returns_Bad_Request_response.json |   2 +-
 ..._a_case_type_returns_CREATED_response.json |   2 +-
 ...ication_rule_returns_Created_response.json |   2 +-
 ...ion_template_returns_Created_response.json |   2 +-
 ...with_a_permission_returns_OK_response.json |   2 +-
 .../v2/Delete_App_returns_OK_response.json    |   2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |   2 +-
 ...te_Org_Connection_returns_OK_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ete_Scanning_Rule_returns_OK_response.json |   4 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ...case_type_returns_NotContent_response.json |   2 +-
 ...elete_a_case_type_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   6 +-
 ...a_dataset_returns_No_Content_response.json |   2 +-
 ...Delete_a_pipeline_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...tegration_returns_No_Content_response.json |   2 +-
 ...ntegration_returns_Not_Found_response.json |   2 +-
 ...nnotation_returns_No_Content_response.json |   2 +-
 ...cessfully_deleted_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ..._comment_returns_Bad_Request_response.json |   2 +-
 ...e_comment_returns_No_Content_response.json |   2 +-
 ...se_comment_returns_Not_Found_response.json |   2 +-
 ..._from_case_returns_Not_Found_response.json |   2 +-
 ...tribute_from_case_returns_OK_response.json |   2 +-
 ...s_config_returns_Bad_Request_response.json |   2 +-
 ...es_config_returns_No_Content_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 .../Delete_datastore_returns_OK_response.json |   2 +-
 ..._template_returns_No_Content_response.json |   2 +-
 .../Edit_a_dataset_returns_OK_response.json   |   2 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...sk_by_id_returns_Bad_Request_response.json |   2 +-
 ...S_On_Demand_tasks_returns_OK_response.json |   2 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../v2/Get_App_returns_Gone_response.json     |   2 +-
 .../v2/Get_App_returns_OK_response.json       |   2 +-
 ..._GCP_scan_options_returns_OK_response.json |   2 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...t_a_job_s_details_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...gle_dataset_by_ID_returns_OK_response.json |   2 +-
 ...specific_pipeline_returns_OK_response.json |   2 +-
 ...nfig_of_case_type_returns_OK_response.json |   2 +-
 .../Get_all_datasets_returns_OK_response.json |   2 +-
 ...D_returns_AWS_Account_object_response.json |   2 +-
 ...onfig_ID_returns_Bad_Request_response.json |   2 +-
 ..._Successfully_got_a_workflow_response.json |   2 +-
 ...ations_for_a_page_returns_OK_response.json |   2 +-
 .../v2/Get_datastore_returns_OK_response.json |   2 +-
 ...notification_rule_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 ...details_of_a_case_returns_OK_response.json |   2 +-
 ...king_issue_returns_Not_Found_response.json |   2 +-
 ...or_tracking_issue_returns_OK_response.json |   2 +-
 ...mission_to_a_role_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...S_on_demand_tasks_returns_OK_response.json |   2 +-
 ...List_App_Versions_returns_OK_response.json |   2 +-
 ..._GCP_scan_options_returns_OK_response.json |   2 +-
 ...t_Scanning_Groups_returns_OK_response.json |   6 +-
 .../List_annotations_returns_OK_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...otification_rules_returns_OK_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...ssions_for_a_role_returns_OK_response.json |   2 +-
 .../List_pipelines_returns_OK_response.json   |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 .../List_workflows_returns_OK_response.json   |   2 +-
 ...p_Version_returns_No_Content_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ...n_Options_returns_No_Content_response.json |   2 +-
 ...an_Options_returns_Not_Found_response.json |   2 +-
 ..._Options_returns_Bad_Request_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 ...options_enabled_successfully_response.json |   2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |   2 +-
 ...options_enabled_successfully_response.json |   2 +-
 .../Publish_App_returns_Created_response.json |   2 +-
 ...r_Groups_returns_Bad_Request_response.json |   4 +-
 .../Reorder_Groups_returns_OK_response.json   |   6 +-
 ...Revoke_permission_returns_OK_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../Unarchive_case_returns_OK_response.json   |   2 +-
 ...ign_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Unassign_case_returns_OK_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 .../v2/Unpublish_App_returns_OK_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ...n_options_returns_No_Content_response.json |   2 +-
 ...an_options_returns_Not_Found_response.json |   2 +-
 ...te_Status_returns_No_Content_response.json |   2 +-
 ..._Protection_Level_returns_OK_response.json |   2 +-
 ...ce_Status_returns_No_Content_response.json |   2 +-
 ...date_App_returns_Bad_Request_response.json |   2 +-
 .../v2/Update_App_returns_OK_response.json    |   2 +-
 ..._options_returns_Bad_Request_response.json |   2 +-
 ...nnection_returns_Bad_Request_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ing_Rule_returns_Bad_Request_response.json |   4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...tom_Rule_returns_Bad_Request_response.json |   2 +-
 ...a_WAF_Custom_Rule_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...n_filter_returns_Bad_Request_response.json |   2 +-
 ...pipeline_returns_Bad_Request_response.json |   2 +-
 ...Update_a_pipeline_returns_OK_response.json |   2 +-
 ...n_filter_returns_Bad_Request_response.json |   2 +-
 ...ion_filter_returns_Not_Found_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...r_with_trace_rate_returns_OK_response.json |   2 +-
 ..._filters_returns_Bad_Request_response.json |   2 +-
 ...on_filters_returns_Not_Found_response.json |   2 +-
 ...e_a_role_returns_Bad_Request_response.json |   2 +-
 ...ate_a_role_returns_Not_found_response.json |   2 +-
 .../v2/Update_a_role_returns_OK_response.json |   2 +-
 ...n_returns_AWS_Account_object_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...ate_an_annotation_returns_OK_response.json |   2 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...cessfully_updated_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ...e_case_attributes_returns_OK_response.json |   2 +-
 ...ttribute_returns_Bad_Request_response.json |   2 +-
 ..._custom_attribute_returns_OK_response.json |   2 +-
 ...priority_returns_Bad_Request_response.json |   2 +-
 ...ate_case_priority_returns_OK_response.json |   2 +-
 ...e_status_returns_Bad_Request_response.json |   2 +-
 ...pdate_case_status_returns_OK_response.json |   2 +-
 ...se_title_returns_Bad_Request_response.json |   2 +-
 ...Update_case_title_returns_OK_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 ...notification_rule_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 .../api/client/v2/api/dora_metrics.feature    |  27 ++
 .../com/datadog/api/client/v2/api/undo.json   |   6 +
 197 files changed, 1820 insertions(+), 214 deletions(-)
 create mode 100644 examples/v2/dora-metrics/PatchDORADeploymentByVersion.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediation.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByID.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByVersion.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequest.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestData.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index a15050b8f12..bf83e44268f 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -29827,15 +29827,109 @@ components:
         - service
         - started_at
       type: object
+    DORADeploymentPatchByVersionRemediation:
+      description: Remediation details for the deployment. Optional, but required to calculate failed deployment recovery time. Specify either `id` or `version` to identify the remediation deployment, but not both.
+      oneOf:
+        - $ref: "#/components/schemas/DORADeploymentPatchByVersionRemediationByID"
+        - $ref: "#/components/schemas/DORADeploymentPatchByVersionRemediationByVersion"
+    DORADeploymentPatchByVersionRemediationByID:
+      additionalProperties: false
+      description: Remediation details identified by the ID of the remediation deployment.
+      properties:
+        id:
+          description: The ID of the remediation deployment.
+          example: eG42zNIkVjM
+          type: string
+        type:
+          $ref: "#/components/schemas/DORADeploymentPatchRemediationType"
+      required:
+        - id
+        - type
+      type: object
+    DORADeploymentPatchByVersionRemediationByVersion:
+      additionalProperties: false
+      description: Remediation details identified by the version of the remediation deployment, matched against the same service and environment as the failed deployment.
+      properties:
+        type:
+          $ref: "#/components/schemas/DORADeploymentPatchRemediationType"
+        version:
+          description: The version of the remediation deployment.
+          example: v1.2.4
+          type: string
+      required:
+        - version
+        - type
+      type: object
+    DORADeploymentPatchByVersionRequest:
+      description: Request to patch a DORA deployment event identified by service, environment, and version.
+      example:
+        data:
+          attributes:
+            change_failure: true
+            env: "production"
+            remediation:
+              type: "rollback"
+              version: "v1.2.2"
+            service: "my-service"
+            version: "v1.2.3"
+          type: "dora_deployment_patch_request"
+      properties:
+        data:
+          $ref: "#/components/schemas/DORADeploymentPatchByVersionRequestData"
+      required:
+        - data
+      type: object
+    DORADeploymentPatchByVersionRequestAttributes:
+      description: Attributes for patching a DORA deployment event identified by service, environment, and version.
+      properties:
+        change_failure:
+          description: Indicates whether the deployment resulted in a change failure.
+          example: true
+          type: boolean
+        env:
+          description: The environment the deployment was performed in.
+          example: prod
+          type: string
+        remediation:
+          $ref: "#/components/schemas/DORADeploymentPatchByVersionRemediation"
+        service:
+          description: The name of the service that was deployed.
+          example: my-service
+          type: string
+        version:
+          description: "The version deployed. This can be seen in the Service Catalog or in the APM Deployment Tracking."
+          example: v1.2.3
+          type: string
+      required:
+        - service
+        - env
+        - version
+        - change_failure
+      type: object
+    DORADeploymentPatchByVersionRequestData:
+      description: The JSON:API data for patching a deployment identified by service, environment, and version.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/DORADeploymentPatchByVersionRequestAttributes"
+        type:
+          $ref: "#/components/schemas/DORADeploymentPatchRequestDataType"
+      required:
+        - type
+        - attributes
+      type: object
     DORADeploymentPatchRemediation:
-      description: Remediation details for the deployment. Optional, but required to calculate failed deployment recovery time.
+      description: Remediation details for the deployment. Optional, but required to calculate failed deployment recovery time. Specify either `id` or `version` to identify the remediation deployment, but not both.
       properties:
         id:
-          description: The ID of the remediation deployment. Required when the failed deployment must be linked to a remediation deployment.
+          description: The ID of the remediation deployment. Use this or `version` to identify the remediation deployment, but not both.
           example: eG42zNIkVjM
           type: string
         type:
           $ref: "#/components/schemas/DORADeploymentPatchRemediationType"
+        version:
+          description: The version of the remediation deployment, matched against the same service and environment as the failed deployment. Use this or `id` to identify the remediation deployment, but not both.
+          example: v1.2.4
+          type: string
       type: object
     DORADeploymentPatchRemediationType:
       description: The type of remediation action taken. Required when the failed deployment must be linked to a remediation deployment.
@@ -140896,6 +140990,52 @@ paths:
         permissions:
           - dora_metrics_write
   /api/v2/dora/deployments:
+    patch:
+      description: |-
+        Update a deployment's change failure status, identifying the deployment by its service, environment, and version instead of its ID. Use this to mark a deployment as a change failure or back to stable. You can optionally include remediation details to enable failed deployment recovery time calculation. If multiple deployments match the given service, environment, and version, the most recently finished one is updated.
+      operationId: PatchDORADeploymentByVersion
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      change_failure: true
+                      env: production
+                      service: my-service
+                      version: v1.2.3
+                    type: dora_deployment_patch_request
+            schema:
+              $ref: "#/components/schemas/DORADeploymentPatchByVersionRequest"
+        required: true
+      responses:
+        "202":
+          description: Accepted
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "403":
+          $ref: "#/components/responses/NotAuthorizedResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: Patch a deployment event by version
+      tags: ["DORA Metrics"]
+      x-codegen-request-body-name: body
+      x-permission:
+        operator: OR
+        permissions:
+          - dora_metrics_write
+      x-unstable: |-
+        **Note**: This endpoint is in preview and is subject to change.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
       description: |-
         Use this API endpoint to get a list of deployment events.
diff --git a/examples/v2/dora-metrics/PatchDORADeploymentByVersion.java b/examples/v2/dora-metrics/PatchDORADeploymentByVersion.java
new file mode 100644
index 00000000000..28b31863cba
--- /dev/null
+++ b/examples/v2/dora-metrics/PatchDORADeploymentByVersion.java
@@ -0,0 +1,47 @@
+// Patch a deployment event by version returns "Accepted" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.DoraMetricsApi;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRemediation;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRemediationByVersion;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRequest;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRequestAttributes;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRequestData;
+import com.datadog.api.client.v2.model.DORADeploymentPatchRemediationType;
+import com.datadog.api.client.v2.model.DORADeploymentPatchRequestDataType;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.patchDORADeploymentByVersion", true);
+    DoraMetricsApi apiInstance = new DoraMetricsApi(defaultClient);
+
+    DORADeploymentPatchByVersionRequest body =
+        new DORADeploymentPatchByVersionRequest()
+            .data(
+                new DORADeploymentPatchByVersionRequestData()
+                    .attributes(
+                        new DORADeploymentPatchByVersionRequestAttributes()
+                            .changeFailure(true)
+                            .env("production")
+                            .remediation(
+                                new DORADeploymentPatchByVersionRemediation(
+                                    new DORADeploymentPatchByVersionRemediationByVersion()
+                                        .type(DORADeploymentPatchRemediationType.ROLLBACK)
+                                        .version("v1.2.2")))
+                            .service("my-service")
+                            .version("v1.2.3"))
+                    .type(DORADeploymentPatchRequestDataType.DORA_DEPLOYMENT_PATCH_REQUEST));
+
+    try {
+      apiInstance.patchDORADeploymentByVersion(body);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling DoraMetricsApi#patchDORADeploymentByVersion");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 4f71f6beac8..0d8443e0d1a 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -1085,6 +1085,7 @@ public class ApiClient {
           put("v2.triggerDeploymentGatesEvaluation", false);
           put("v2.updateDeploymentGate", false);
           put("v2.updateDeploymentRule", false);
+          put("v2.patchDORADeploymentByVersion", false);
           put("v2.cloneForm", false);
           put("v2.createAndPublishForm", false);
           put("v2.createForm", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/DoraMetricsApi.java b/src/main/java/com/datadog/api/client/v2/api/DoraMetricsApi.java
index e9849140fce..782f53a204b 100644
--- a/src/main/java/com/datadog/api/client/v2/api/DoraMetricsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/DoraMetricsApi.java
@@ -5,6 +5,7 @@
 import com.datadog.api.client.ApiResponse;
 import com.datadog.api.client.Pair;
 import com.datadog.api.client.v2.model.DORADeploymentFetchResponse;
+import com.datadog.api.client.v2.model.DORADeploymentPatchByVersionRequest;
 import com.datadog.api.client.v2.model.DORADeploymentPatchRequest;
 import com.datadog.api.client.v2.model.DORADeploymentRequest;
 import com.datadog.api.client.v2.model.DORADeploymentResponse;
@@ -1442,4 +1443,158 @@ public CompletableFuture<ApiResponse<Void>> patchDORADeploymentWithHttpInfoAsync
         false,
         null);
   }
+
+  /**
+   * Patch a deployment event by version.
+   *
+   * <p>See {@link #patchDORADeploymentByVersionWithHttpInfo}.
+   *
+   * @param body (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void patchDORADeploymentByVersion(DORADeploymentPatchByVersionRequest body)
+      throws ApiException {
+    patchDORADeploymentByVersionWithHttpInfo(body);
+  }
+
+  /**
+   * Patch a deployment event by version.
+   *
+   * <p>See {@link #patchDORADeploymentByVersionWithHttpInfoAsync}.
+   *
+   * @param body (required)
+   * @return CompletableFuture
+   */
+  public CompletableFuture<Void> patchDORADeploymentByVersionAsync(
+      DORADeploymentPatchByVersionRequest body) {
+    return patchDORADeploymentByVersionWithHttpInfoAsync(body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Update a deployment's change failure status, identifying the deployment by its service,
+   * environment, and version instead of its ID. Use this to mark a deployment as a change failure
+   * or back to stable. You can optionally include remediation details to enable failed deployment
+   * recovery time calculation. If multiple deployments match the given service, environment, and
+   * version, the most recently finished one is updated.
+   *
+   * @param body (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 202 </td><td> Accepted </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Not Authorized </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Void> patchDORADeploymentByVersionWithHttpInfo(
+      DORADeploymentPatchByVersionRequest body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "patchDORADeploymentByVersion";
+    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
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling patchDORADeploymentByVersion");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/dora/deployments";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.DoraMetricsApi.patchDORADeploymentByVersion",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "PATCH",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Patch a deployment event by version.
+   *
+   * <p>See {@link #patchDORADeploymentByVersionWithHttpInfo}.
+   *
+   * @param body (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Void>> patchDORADeploymentByVersionWithHttpInfoAsync(
+      DORADeploymentPatchByVersionRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "patchDORADeploymentByVersion";
+    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 = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'body' when calling patchDORADeploymentByVersion"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/dora/deployments";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.DoraMetricsApi.patchDORADeploymentByVersion",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "PATCH",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediation.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediation.java
new file mode 100644
index 00000000000..c7c15ba2cac
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediation.java
@@ -0,0 +1,326 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.datadog.api.client.AbstractOpenApiSchema;
+import com.datadog.api.client.JSON;
+import com.datadog.api.client.UnparsedObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import jakarta.ws.rs.core.GenericType;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+@JsonDeserialize(
+    using =
+        DORADeploymentPatchByVersionRemediation.DORADeploymentPatchByVersionRemediationDeserializer
+            .class)
+@JsonSerialize(
+    using =
+        DORADeploymentPatchByVersionRemediation.DORADeploymentPatchByVersionRemediationSerializer
+            .class)
+public class DORADeploymentPatchByVersionRemediation extends AbstractOpenApiSchema {
+  private static final Logger log =
+      Logger.getLogger(DORADeploymentPatchByVersionRemediation.class.getName());
+
+  @JsonIgnore public boolean unparsed = false;
+
+  public static class DORADeploymentPatchByVersionRemediationSerializer
+      extends StdSerializer<DORADeploymentPatchByVersionRemediation> {
+    public DORADeploymentPatchByVersionRemediationSerializer(
+        Class<DORADeploymentPatchByVersionRemediation> t) {
+      super(t);
+    }
+
+    public DORADeploymentPatchByVersionRemediationSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        DORADeploymentPatchByVersionRemediation value,
+        JsonGenerator jgen,
+        SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.getActualInstance());
+    }
+  }
+
+  public static class DORADeploymentPatchByVersionRemediationDeserializer
+      extends StdDeserializer<DORADeploymentPatchByVersionRemediation> {
+    public DORADeploymentPatchByVersionRemediationDeserializer() {
+      this(DORADeploymentPatchByVersionRemediation.class);
+    }
+
+    public DORADeploymentPatchByVersionRemediationDeserializer(Class<?> vc) {
+      super(vc);
+    }
+
+    @Override
+    public DORADeploymentPatchByVersionRemediation deserialize(
+        JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+      JsonNode tree = jp.readValueAsTree();
+      Object deserialized = null;
+      Object tmp = null;
+      boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS);
+      int match = 0;
+      JsonToken token = tree.traverse(jp.getCodec()).nextToken();
+      // deserialize DORADeploymentPatchByVersionRemediationByID
+      try {
+        boolean attemptParsing = true;
+        // ensure that we respect type coercion as set on the client ObjectMapper
+        if (DORADeploymentPatchByVersionRemediationByID.class.equals(Integer.class)
+            || DORADeploymentPatchByVersionRemediationByID.class.equals(Long.class)
+            || DORADeploymentPatchByVersionRemediationByID.class.equals(Float.class)
+            || DORADeploymentPatchByVersionRemediationByID.class.equals(Double.class)
+            || DORADeploymentPatchByVersionRemediationByID.class.equals(Boolean.class)
+            || DORADeploymentPatchByVersionRemediationByID.class.equals(String.class)) {
+          attemptParsing = typeCoercion;
+          if (!attemptParsing) {
+            attemptParsing |=
+                ((DORADeploymentPatchByVersionRemediationByID.class.equals(Integer.class)
+                        || DORADeploymentPatchByVersionRemediationByID.class.equals(Long.class))
+                    && token == JsonToken.VALUE_NUMBER_INT);
+            attemptParsing |=
+                ((DORADeploymentPatchByVersionRemediationByID.class.equals(Float.class)
+                        || DORADeploymentPatchByVersionRemediationByID.class.equals(Double.class))
+                    && (token == JsonToken.VALUE_NUMBER_FLOAT
+                        || token == JsonToken.VALUE_NUMBER_INT));
+            attemptParsing |=
+                (DORADeploymentPatchByVersionRemediationByID.class.equals(Boolean.class)
+                    && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
+            attemptParsing |=
+                (DORADeploymentPatchByVersionRemediationByID.class.equals(String.class)
+                    && token == JsonToken.VALUE_STRING);
+          }
+        }
+        if (attemptParsing) {
+          tmp =
+              tree.traverse(jp.getCodec())
+                  .readValueAs(DORADeploymentPatchByVersionRemediationByID.class);
+          // TODO: there is no validation against JSON schema constraints
+          // (min, max, enum, pattern...), this does not perform a strict JSON
+          // validation, which means the 'match' count may be higher than it should be.
+          if (!((DORADeploymentPatchByVersionRemediationByID) tmp).unparsed) {
+            deserialized = tmp;
+            match++;
+          }
+          log.log(
+              Level.FINER,
+              "Input data matches schema 'DORADeploymentPatchByVersionRemediationByID'");
+        }
+      } catch (Exception e) {
+        // deserialization failed, continue
+        log.log(
+            Level.FINER,
+            "Input data does not match schema 'DORADeploymentPatchByVersionRemediationByID'",
+            e);
+      }
+
+      // deserialize DORADeploymentPatchByVersionRemediationByVersion
+      try {
+        boolean attemptParsing = true;
+        // ensure that we respect type coercion as set on the client ObjectMapper
+        if (DORADeploymentPatchByVersionRemediationByVersion.class.equals(Integer.class)
+            || DORADeploymentPatchByVersionRemediationByVersion.class.equals(Long.class)
+            || DORADeploymentPatchByVersionRemediationByVersion.class.equals(Float.class)
+            || DORADeploymentPatchByVersionRemediationByVersion.class.equals(Double.class)
+            || DORADeploymentPatchByVersionRemediationByVersion.class.equals(Boolean.class)
+            || DORADeploymentPatchByVersionRemediationByVersion.class.equals(String.class)) {
+          attemptParsing = typeCoercion;
+          if (!attemptParsing) {
+            attemptParsing |=
+                ((DORADeploymentPatchByVersionRemediationByVersion.class.equals(Integer.class)
+                        || DORADeploymentPatchByVersionRemediationByVersion.class.equals(
+                            Long.class))
+                    && token == JsonToken.VALUE_NUMBER_INT);
+            attemptParsing |=
+                ((DORADeploymentPatchByVersionRemediationByVersion.class.equals(Float.class)
+                        || DORADeploymentPatchByVersionRemediationByVersion.class.equals(
+                            Double.class))
+                    && (token == JsonToken.VALUE_NUMBER_FLOAT
+                        || token == JsonToken.VALUE_NUMBER_INT));
+            attemptParsing |=
+                (DORADeploymentPatchByVersionRemediationByVersion.class.equals(Boolean.class)
+                    && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
+            attemptParsing |=
+                (DORADeploymentPatchByVersionRemediationByVersion.class.equals(String.class)
+                    && token == JsonToken.VALUE_STRING);
+          }
+        }
+        if (attemptParsing) {
+          tmp =
+              tree.traverse(jp.getCodec())
+                  .readValueAs(DORADeploymentPatchByVersionRemediationByVersion.class);
+          // TODO: there is no validation against JSON schema constraints
+          // (min, max, enum, pattern...), this does not perform a strict JSON
+          // validation, which means the 'match' count may be higher than it should be.
+          if (!((DORADeploymentPatchByVersionRemediationByVersion) tmp).unparsed) {
+            deserialized = tmp;
+            match++;
+          }
+          log.log(
+              Level.FINER,
+              "Input data matches schema 'DORADeploymentPatchByVersionRemediationByVersion'");
+        }
+      } catch (Exception e) {
+        // deserialization failed, continue
+        log.log(
+            Level.FINER,
+            "Input data does not match schema 'DORADeploymentPatchByVersionRemediationByVersion'",
+            e);
+      }
+
+      DORADeploymentPatchByVersionRemediation ret = new DORADeploymentPatchByVersionRemediation();
+      if (match == 1) {
+        ret.setActualInstance(deserialized);
+      } else {
+        Map<String, Object> res =
+            new ObjectMapper()
+                .readValue(
+                    tree.traverse(jp.getCodec()).readValueAsTree().toString(),
+                    new TypeReference<Map<String, Object>>() {});
+        ret.setActualInstance(new UnparsedObject(res));
+      }
+      return ret;
+    }
+
+    /** Handle deserialization of the 'null' value. */
+    @Override
+    public DORADeploymentPatchByVersionRemediation getNullValue(DeserializationContext ctxt)
+        throws JsonMappingException {
+      throw new JsonMappingException(
+          ctxt.getParser(), "DORADeploymentPatchByVersionRemediation cannot be null");
+    }
+  }
+
+  // store a list of schema names defined in oneOf
+  public static final Map<String, GenericType> schemas = new HashMap<String, GenericType>();
+
+  public DORADeploymentPatchByVersionRemediation() {
+    super("oneOf", Boolean.FALSE);
+  }
+
+  public DORADeploymentPatchByVersionRemediation(DORADeploymentPatchByVersionRemediationByID o) {
+    super("oneOf", Boolean.FALSE);
+    setActualInstance(o);
+  }
+
+  public DORADeploymentPatchByVersionRemediation(
+      DORADeploymentPatchByVersionRemediationByVersion o) {
+    super("oneOf", Boolean.FALSE);
+    setActualInstance(o);
+  }
+
+  static {
+    schemas.put(
+        "DORADeploymentPatchByVersionRemediationByID",
+        new GenericType<DORADeploymentPatchByVersionRemediationByID>() {});
+    schemas.put(
+        "DORADeploymentPatchByVersionRemediationByVersion",
+        new GenericType<DORADeploymentPatchByVersionRemediationByVersion>() {});
+    JSON.registerDescendants(
+        DORADeploymentPatchByVersionRemediation.class, Collections.unmodifiableMap(schemas));
+  }
+
+  @Override
+  public Map<String, GenericType> getSchemas() {
+    return DORADeploymentPatchByVersionRemediation.schemas;
+  }
+
+  /**
+   * Set the instance that matches the oneOf child schema, check the instance parameter is valid
+   * against the oneOf child schemas: DORADeploymentPatchByVersionRemediationByID,
+   * DORADeploymentPatchByVersionRemediationByVersion
+   *
+   * <p>It could be an instance of the 'oneOf' schemas. The oneOf child schemas may themselves be a
+   * composed schema (allOf, anyOf, oneOf).
+   */
+  @Override
+  public void setActualInstance(Object instance) {
+    if (JSON.isInstanceOf(
+        DORADeploymentPatchByVersionRemediationByID.class, instance, new HashSet<Class<?>>())) {
+      super.setActualInstance(instance);
+      return;
+    }
+    if (JSON.isInstanceOf(
+        DORADeploymentPatchByVersionRemediationByVersion.class,
+        instance,
+        new HashSet<Class<?>>())) {
+      super.setActualInstance(instance);
+      return;
+    }
+
+    if (JSON.isInstanceOf(UnparsedObject.class, instance, new HashSet<Class<?>>())) {
+      super.setActualInstance(instance);
+      return;
+    }
+    throw new RuntimeException(
+        "Invalid instance type. Must be DORADeploymentPatchByVersionRemediationByID,"
+            + " DORADeploymentPatchByVersionRemediationByVersion");
+  }
+
+  /**
+   * Get the actual instance, which can be the following:
+   * DORADeploymentPatchByVersionRemediationByID, DORADeploymentPatchByVersionRemediationByVersion
+   *
+   * @return The actual instance (DORADeploymentPatchByVersionRemediationByID,
+   *     DORADeploymentPatchByVersionRemediationByVersion)
+   */
+  @Override
+  public Object getActualInstance() {
+    return super.getActualInstance();
+  }
+
+  /**
+   * Get the actual instance of `DORADeploymentPatchByVersionRemediationByID`. If the actual
+   * instance is not `DORADeploymentPatchByVersionRemediationByID`, the ClassCastException will be
+   * thrown.
+   *
+   * @return The actual instance of `DORADeploymentPatchByVersionRemediationByID`
+   * @throws ClassCastException if the instance is not `DORADeploymentPatchByVersionRemediationByID`
+   */
+  public DORADeploymentPatchByVersionRemediationByID
+      getDORADeploymentPatchByVersionRemediationByID() throws ClassCastException {
+    return (DORADeploymentPatchByVersionRemediationByID) super.getActualInstance();
+  }
+
+  /**
+   * Get the actual instance of `DORADeploymentPatchByVersionRemediationByVersion`. If the actual
+   * instance is not `DORADeploymentPatchByVersionRemediationByVersion`, the ClassCastException will
+   * be thrown.
+   *
+   * @return The actual instance of `DORADeploymentPatchByVersionRemediationByVersion`
+   * @throws ClassCastException if the instance is not
+   *     `DORADeploymentPatchByVersionRemediationByVersion`
+   */
+  public DORADeploymentPatchByVersionRemediationByVersion
+      getDORADeploymentPatchByVersionRemediationByVersion() throws ClassCastException {
+    return (DORADeploymentPatchByVersionRemediationByVersion) super.getActualInstance();
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByID.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByID.java
new file mode 100644
index 00000000000..8b47e131733
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByID.java
@@ -0,0 +1,127 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.Objects;
+
+/** Remediation details identified by the ID of the remediation deployment. */
+@JsonPropertyOrder({
+  DORADeploymentPatchByVersionRemediationByID.JSON_PROPERTY_ID,
+  DORADeploymentPatchByVersionRemediationByID.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class DORADeploymentPatchByVersionRemediationByID {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private DORADeploymentPatchRemediationType type;
+
+  public DORADeploymentPatchByVersionRemediationByID() {}
+
+  @JsonCreator
+  public DORADeploymentPatchByVersionRemediationByID(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
+          DORADeploymentPatchRemediationType type) {
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public DORADeploymentPatchByVersionRemediationByID id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The ID of the remediation deployment.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public DORADeploymentPatchByVersionRemediationByID type(DORADeploymentPatchRemediationType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * The type of remediation action taken. Required when the failed deployment must be linked to a
+   * remediation deployment.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public DORADeploymentPatchRemediationType getType() {
+    return type;
+  }
+
+  public void setType(DORADeploymentPatchRemediationType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /** Return true if this DORADeploymentPatchByVersionRemediationByID object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DORADeploymentPatchByVersionRemediationByID doraDeploymentPatchByVersionRemediationById =
+        (DORADeploymentPatchByVersionRemediationByID) o;
+    return Objects.equals(this.id, doraDeploymentPatchByVersionRemediationById.id)
+        && Objects.equals(this.type, doraDeploymentPatchByVersionRemediationById.type);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, type);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DORADeploymentPatchByVersionRemediationByID {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByVersion.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByVersion.java
new file mode 100644
index 00000000000..33b41316160
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRemediationByVersion.java
@@ -0,0 +1,132 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.Objects;
+
+/**
+ * Remediation details identified by the version of the remediation deployment, matched against the
+ * same service and environment as the failed deployment.
+ */
+@JsonPropertyOrder({
+  DORADeploymentPatchByVersionRemediationByVersion.JSON_PROPERTY_TYPE,
+  DORADeploymentPatchByVersionRemediationByVersion.JSON_PROPERTY_VERSION
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class DORADeploymentPatchByVersionRemediationByVersion {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private DORADeploymentPatchRemediationType type;
+
+  public static final String JSON_PROPERTY_VERSION = "version";
+  private String version;
+
+  public DORADeploymentPatchByVersionRemediationByVersion() {}
+
+  @JsonCreator
+  public DORADeploymentPatchByVersionRemediationByVersion(
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
+          DORADeploymentPatchRemediationType type,
+      @JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    this.version = version;
+  }
+
+  public DORADeploymentPatchByVersionRemediationByVersion type(
+      DORADeploymentPatchRemediationType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * The type of remediation action taken. Required when the failed deployment must be linked to a
+   * remediation deployment.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public DORADeploymentPatchRemediationType getType() {
+    return type;
+  }
+
+  public void setType(DORADeploymentPatchRemediationType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  public DORADeploymentPatchByVersionRemediationByVersion version(String version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * The version of the remediation deployment.
+   *
+   * @return version
+   */
+  @JsonProperty(JSON_PROPERTY_VERSION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  /** Return true if this DORADeploymentPatchByVersionRemediationByVersion object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DORADeploymentPatchByVersionRemediationByVersion
+        doraDeploymentPatchByVersionRemediationByVersion =
+            (DORADeploymentPatchByVersionRemediationByVersion) o;
+    return Objects.equals(this.type, doraDeploymentPatchByVersionRemediationByVersion.type)
+        && Objects.equals(this.version, doraDeploymentPatchByVersionRemediationByVersion.version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(type, version);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DORADeploymentPatchByVersionRemediationByVersion {\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequest.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequest.java
new file mode 100644
index 00000000000..731344d84fd
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequest.java
@@ -0,0 +1,151 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Request to patch a DORA deployment event identified by service, environment, and version. */
+@JsonPropertyOrder({DORADeploymentPatchByVersionRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class DORADeploymentPatchByVersionRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private DORADeploymentPatchByVersionRequestData data;
+
+  public DORADeploymentPatchByVersionRequest() {}
+
+  @JsonCreator
+  public DORADeploymentPatchByVersionRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          DORADeploymentPatchByVersionRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public DORADeploymentPatchByVersionRequest data(DORADeploymentPatchByVersionRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * The JSON:API data for patching a deployment identified by service, environment, and version.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public DORADeploymentPatchByVersionRequestData getData() {
+    return data;
+  }
+
+  public void setData(DORADeploymentPatchByVersionRequestData data) {
+    this.data = data;
+    if (data != null) {
+      this.unparsed |= data.unparsed;
+    }
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return DORADeploymentPatchByVersionRequest
+   */
+  @JsonAnySetter
+  public DORADeploymentPatchByVersionRequest putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this DORADeploymentPatchByVersionRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DORADeploymentPatchByVersionRequest doraDeploymentPatchByVersionRequest =
+        (DORADeploymentPatchByVersionRequest) o;
+    return Objects.equals(this.data, doraDeploymentPatchByVersionRequest.data)
+        && Objects.equals(
+            this.additionalProperties, doraDeploymentPatchByVersionRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DORADeploymentPatchByVersionRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestAttributes.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestAttributes.java
new file mode 100644
index 00000000000..8b9915449b4
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestAttributes.java
@@ -0,0 +1,272 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Attributes for patching a DORA deployment event identified by service, environment, and version.
+ */
+@JsonPropertyOrder({
+  DORADeploymentPatchByVersionRequestAttributes.JSON_PROPERTY_CHANGE_FAILURE,
+  DORADeploymentPatchByVersionRequestAttributes.JSON_PROPERTY_ENV,
+  DORADeploymentPatchByVersionRequestAttributes.JSON_PROPERTY_REMEDIATION,
+  DORADeploymentPatchByVersionRequestAttributes.JSON_PROPERTY_SERVICE,
+  DORADeploymentPatchByVersionRequestAttributes.JSON_PROPERTY_VERSION
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class DORADeploymentPatchByVersionRequestAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_CHANGE_FAILURE = "change_failure";
+  private Boolean changeFailure;
+
+  public static final String JSON_PROPERTY_ENV = "env";
+  private String env;
+
+  public static final String JSON_PROPERTY_REMEDIATION = "remediation";
+  private DORADeploymentPatchByVersionRemediation remediation;
+
+  public static final String JSON_PROPERTY_SERVICE = "service";
+  private String service;
+
+  public static final String JSON_PROPERTY_VERSION = "version";
+  private String version;
+
+  public DORADeploymentPatchByVersionRequestAttributes() {}
+
+  @JsonCreator
+  public DORADeploymentPatchByVersionRequestAttributes(
+      @JsonProperty(required = true, value = JSON_PROPERTY_CHANGE_FAILURE) Boolean changeFailure,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ENV) String env,
+      @JsonProperty(required = true, value = JSON_PROPERTY_SERVICE) String service,
+      @JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
+    this.changeFailure = changeFailure;
+    this.env = env;
+    this.service = service;
+    this.version = version;
+  }
+
+  public DORADeploymentPatchByVersionRequestAttributes changeFailure(Boolean changeFailure) {
+    this.changeFailure = changeFailure;
+    return this;
+  }
+
+  /**
+   * Indicates whether the deployment resulted in a change failure.
+   *
+   * @return changeFailure
+   */
+  @JsonProperty(JSON_PROPERTY_CHANGE_FAILURE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public Boolean getChangeFailure() {
+    return changeFailure;
+  }
+
+  public void setChangeFailure(Boolean changeFailure) {
+    this.changeFailure = changeFailure;
+  }
+
+  public DORADeploymentPatchByVersionRequestAttributes env(String env) {
+    this.env = env;
+    return this;
+  }
+
+  /**
+   * The environment the deployment was performed in.
+   *
+   * @return env
+   */
+  @JsonProperty(JSON_PROPERTY_ENV)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getEnv() {
+    return env;
+  }
+
+  public void setEnv(String env) {
+    this.env = env;
+  }
+
+  public DORADeploymentPatchByVersionRequestAttributes remediation(
+      DORADeploymentPatchByVersionRemediation remediation) {
+    this.remediation = remediation;
+    this.unparsed |= remediation.unparsed;
+    return this;
+  }
+
+  /**
+   * Remediation details for the deployment. Optional, but required to calculate failed deployment
+   * recovery time. Specify either <code>id</code> or <code>version</code> to identify the
+   * remediation deployment, but not both.
+   *
+   * @return remediation
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REMEDIATION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public DORADeploymentPatchByVersionRemediation getRemediation() {
+    return remediation;
+  }
+
+  public void setRemediation(DORADeploymentPatchByVersionRemediation remediation) {
+    this.remediation = remediation;
+    if (remediation != null) {
+      this.unparsed |= remediation.unparsed;
+    }
+  }
+
+  public DORADeploymentPatchByVersionRequestAttributes service(String service) {
+    this.service = service;
+    return this;
+  }
+
+  /**
+   * The name of the service that was deployed.
+   *
+   * @return service
+   */
+  @JsonProperty(JSON_PROPERTY_SERVICE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getService() {
+    return service;
+  }
+
+  public void setService(String service) {
+    this.service = service;
+  }
+
+  public DORADeploymentPatchByVersionRequestAttributes version(String version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * The version deployed. This can be seen in the Service Catalog or in the APM Deployment
+   * Tracking.
+   *
+   * @return version
+   */
+  @JsonProperty(JSON_PROPERTY_VERSION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return DORADeploymentPatchByVersionRequestAttributes
+   */
+  @JsonAnySetter
+  public DORADeploymentPatchByVersionRequestAttributes putAdditionalProperty(
+      String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this DORADeploymentPatchByVersionRequestAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DORADeploymentPatchByVersionRequestAttributes doraDeploymentPatchByVersionRequestAttributes =
+        (DORADeploymentPatchByVersionRequestAttributes) o;
+    return Objects.equals(
+            this.changeFailure, doraDeploymentPatchByVersionRequestAttributes.changeFailure)
+        && Objects.equals(this.env, doraDeploymentPatchByVersionRequestAttributes.env)
+        && Objects.equals(
+            this.remediation, doraDeploymentPatchByVersionRequestAttributes.remediation)
+        && Objects.equals(this.service, doraDeploymentPatchByVersionRequestAttributes.service)
+        && Objects.equals(this.version, doraDeploymentPatchByVersionRequestAttributes.version)
+        && Objects.equals(
+            this.additionalProperties,
+            doraDeploymentPatchByVersionRequestAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(changeFailure, env, remediation, service, version, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DORADeploymentPatchByVersionRequestAttributes {\n");
+    sb.append("    changeFailure: ").append(toIndentedString(changeFailure)).append("\n");
+    sb.append("    env: ").append(toIndentedString(env)).append("\n");
+    sb.append("    remediation: ").append(toIndentedString(remediation)).append("\n");
+    sb.append("    service: ").append(toIndentedString(service)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestData.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestData.java
new file mode 100644
index 00000000000..2469b9d891b
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchByVersionRequestData.java
@@ -0,0 +1,191 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** The JSON:API data for patching a deployment identified by service, environment, and version. */
+@JsonPropertyOrder({
+  DORADeploymentPatchByVersionRequestData.JSON_PROPERTY_ATTRIBUTES,
+  DORADeploymentPatchByVersionRequestData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class DORADeploymentPatchByVersionRequestData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private DORADeploymentPatchByVersionRequestAttributes attributes;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private DORADeploymentPatchRequestDataType type =
+      DORADeploymentPatchRequestDataType.DORA_DEPLOYMENT_PATCH_REQUEST;
+
+  public DORADeploymentPatchByVersionRequestData() {}
+
+  @JsonCreator
+  public DORADeploymentPatchByVersionRequestData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          DORADeploymentPatchByVersionRequestAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
+          DORADeploymentPatchRequestDataType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public DORADeploymentPatchByVersionRequestData attributes(
+      DORADeploymentPatchByVersionRequestAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes for patching a DORA deployment event identified by service, environment, and
+   * version.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public DORADeploymentPatchByVersionRequestAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(DORADeploymentPatchByVersionRequestAttributes attributes) {
+    this.attributes = attributes;
+    if (attributes != null) {
+      this.unparsed |= attributes.unparsed;
+    }
+  }
+
+  public DORADeploymentPatchByVersionRequestData type(DORADeploymentPatchRequestDataType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * JSON:API type for DORA deployment patch request.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public DORADeploymentPatchRequestDataType getType() {
+    return type;
+  }
+
+  public void setType(DORADeploymentPatchRequestDataType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return DORADeploymentPatchByVersionRequestData
+   */
+  @JsonAnySetter
+  public DORADeploymentPatchByVersionRequestData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this DORADeploymentPatchByVersionRequestData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DORADeploymentPatchByVersionRequestData doraDeploymentPatchByVersionRequestData =
+        (DORADeploymentPatchByVersionRequestData) o;
+    return Objects.equals(this.attributes, doraDeploymentPatchByVersionRequestData.attributes)
+        && Objects.equals(this.type, doraDeploymentPatchByVersionRequestData.type)
+        && Objects.equals(
+            this.additionalProperties,
+            doraDeploymentPatchByVersionRequestData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DORADeploymentPatchByVersionRequestData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRemediation.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRemediation.java
index 5ed11346ec4..f807fd81135 100644
--- a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRemediation.java
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRemediation.java
@@ -18,11 +18,13 @@
 
 /**
  * Remediation details for the deployment. Optional, but required to calculate failed deployment
- * recovery time.
+ * recovery time. Specify either <code>id</code> or <code>version</code> to identify the remediation
+ * deployment, but not both.
  */
 @JsonPropertyOrder({
   DORADeploymentPatchRemediation.JSON_PROPERTY_ID,
-  DORADeploymentPatchRemediation.JSON_PROPERTY_TYPE
+  DORADeploymentPatchRemediation.JSON_PROPERTY_TYPE,
+  DORADeploymentPatchRemediation.JSON_PROPERTY_VERSION
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
@@ -34,14 +36,17 @@ public class DORADeploymentPatchRemediation {
   public static final String JSON_PROPERTY_TYPE = "type";
   private DORADeploymentPatchRemediationType type;
 
+  public static final String JSON_PROPERTY_VERSION = "version";
+  private String version;
+
   public DORADeploymentPatchRemediation id(String id) {
     this.id = id;
     return this;
   }
 
   /**
-   * The ID of the remediation deployment. Required when the failed deployment must be linked to a
-   * remediation deployment.
+   * The ID of the remediation deployment. Use this or <code>version</code> to identify the
+   * remediation deployment, but not both.
    *
    * @return id
    */
@@ -82,6 +87,29 @@ public void setType(DORADeploymentPatchRemediationType type) {
     this.type = type;
   }
 
+  public DORADeploymentPatchRemediation version(String version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * The version of the remediation deployment, matched against the same service and environment as
+   * the failed deployment. Use this or <code>id</code> to identify the remediation deployment, but
+   * not both.
+   *
+   * @return version
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VERSION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
   /**
    * A container for additional, undeclared properties. This is a holder for any undeclared
    * properties as specified with the 'additionalProperties' keyword in the OAS document.
@@ -141,13 +169,14 @@ public boolean equals(Object o) {
         (DORADeploymentPatchRemediation) o;
     return Objects.equals(this.id, doraDeploymentPatchRemediation.id)
         && Objects.equals(this.type, doraDeploymentPatchRemediation.type)
+        && Objects.equals(this.version, doraDeploymentPatchRemediation.version)
         && Objects.equals(
             this.additionalProperties, doraDeploymentPatchRemediation.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, type, additionalProperties);
+    return Objects.hash(id, type, version, additionalProperties);
   }
 
   @Override
@@ -156,6 +185,7 @@ public String toString() {
     sb.append("class DORADeploymentPatchRemediation {\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
         .append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRequestAttributes.java b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRequestAttributes.java
index 9bd2de539cc..248d6d0c34e 100644
--- a/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRequestAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/DORADeploymentPatchRequestAttributes.java
@@ -61,7 +61,8 @@ public DORADeploymentPatchRequestAttributes remediation(
 
   /**
    * Remediation details for the deployment. Optional, but required to calculate failed deployment
-   * recovery time.
+   * recovery time. Specify either <code>id</code> or <code>version</code> to identify the
+   * remediation deployment, but not both.
    *
    * @return remediation
    */
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
index 0b1cdf6a6a8..dbf89c929d7 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
index 91c8275f382..e94edfb7099 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
index 1489fb9e00e..907a2641363 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
index 45e484f0b48..d03bf9ca97e 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
index 30af2a53cea..bb3f69aef75 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index cf63593c8d1..0d38d7d0a6a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
index 6c0150b2bed..490992cbf88 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6e"
+    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index efb480e06b4..a0731b5ad4a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index f2248371931..70fc4d3589b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
index 87cb96a7640..6352d5f0102 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 96ea2f1d661..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 7711ea26b7b..2e4479a46a7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
index 5be48f564e3..1080a831ec7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index a1e750ca5ae..8fcc5731aee 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index c68fcf2371e..a66b20aa83c 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index 51e1a4871f0..4462748bb01 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
index dbfac8750db..4323550909c 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index 010793a6efb..c4e56d41481 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 3e6caee50a0..dfe4106a826 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index 05049df035d..acd1873b7ae 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index 834de428629..46d0a91eab5 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index 58847da9a80..c4e83f2e617 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
index bb3b7dd9f12..31297caa9cd 100644
--- a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 15036e8ce43..713ac84fbc4 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
index e13bca72aa7..8e5c491f456 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 7e70b6729df..60476d2ec8b 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index 563401356dc..a885ab105be 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
index 381c17cef09..064222b84ee 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 95cb4a17509..223e245f710 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
index 086d866ea4d..213894420af 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 29e21b2f628..8602832ff15 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index ef83201b336..6e1acd1d8ab 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
index 18bfaac3c98..95a9b514916 100644
--- a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
index 4db34a7a497..c995fd8ce46 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 7e392b663eb..3af6b797aec 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 09067379e94..75bec16cf03 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index 98400c9266c..df7ec302f17 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
index b8a271f0acf..94ec04c070e 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index 955d0fd03c0..992baa6ee80 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index 6c180fc18ec..ae1a3ad8373 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index 2afada8e889..f572c9f4255 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
index 76a037f2ed4..68588d244c4 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
index e471a481201..92627d59122 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index d00a7c6b966..210fa549f1e 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index 3fbaa0291c3..0dd05116b3f 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index 876d6dad1a0..5e755022579 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c517"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index a3cb24b8701..7ed67796512 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
index d0572cd8b5b..34fc7000a36 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index 608c25497f7..7ede3bf7a7e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index b3b5e533234..493d5b58ad3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
index 9ad725b454a..d14b87aa29b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index 1511b4f762f..c11337e4efa 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index 7919b99b4ff..247c561af22 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
index d13c9cb48d8..7201a9b1026 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e7"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index bf3d084fa30..7905b307aab 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 0c5ca290f7a..92c10c6b507 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
index 91769fdcab4..f01c5129808 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
index 4b854b5aeea..b4f342c7c6b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index 381d1b90a1b..aeb041f1a43 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
index e3bc0c0f6f4..10fbac85dbb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
index a5021c6aada..57e4353994c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6f"
+    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
index 1e8a250a6c6..41d1a8a374c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5e"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
index eebc7eb0437..84afb232908 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa220"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index f83358c4381..366642e3cf7 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index 81032449c02..495b2087065 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index 9df478e5a8c..0f0ba817425 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f09a21c5347..205a02a07fb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index 763ae62b2fb..3018095ac5f 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
index 98d4f2e89be..ff29c917fe1 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index e6d802099c3..2dc635d3a78 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
index a265db54be7..8d1ac6d8c33 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index 9906d02abaf..e1f6cfcce7c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
index ccc4c95513a..3ffceed3185 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index f07d61ea8c9..8871ce2f11d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index f868434d6ac..679ed1419fe 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index e9a88c424e6..dbcf089d3c7 100644
--- a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
index 774e33bf524..5fe868f6988 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index b495f3e998e..b5a3dd39c4e 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
index cbbfed66ca6..0d312e2da5f 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c517"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
index 018b1504a4a..cab40f18769 100644
--- a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
index 90da01d5656..54bbc61f4be 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index 2c9746bfe25..4e428dff41a 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index 313475eb8cc..f414d99275e 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index 4c1dc3043b8..b3366690d8d 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
index 3b4b16a42ec..466d807e187 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
index f6628e0a51d..f19f9fbffe4 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index bf2af7a3b6a..d3568a82564 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
index c6e40d9ebaf..ac29f8cf42e 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 758e4fb66ad..8135aeb994f 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index f6443799769..bd35bd59ea6 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 83cf7035f14..88ec4190fd7 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
index 6352d5f0102..87cb96a7640 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
index 0ad821e051f..c859297de35 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
index dd3dbb8ccdc..402da65263b 100644
--- a/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5c"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index 7f112b2283d..f392f13fc4c 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
index f1ad8103cc5..7b054104c3f 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 06a6f28a5dd..39e1970bef7 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index de8812f83fc..73c41def8f7 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
index e9ddbf352f7..cc6c1703e9a 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fea"
+    "id": "16438026-1168-3bfa-3763-949697b01fe9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
index 6b6dc7ffeef..c0406058bb1 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fe9"
+    "id": "16438026-1168-3bfa-3763-949697b01fea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
index 6204578cebd..d89770a1ae1 100644
--- a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
index 1d634f061da..bbb7fb5acd3 100644
--- a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
index 61e60b91801..f5543674faa 100644
--- a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
index e20ba54d830..d205019fe46 100644
--- a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
index c09bb52e54b..e200ee772e9 100644
--- a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index 481b1a30e15..6b3b2a6c838 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
index 3c5be670c7a..319d097fb29 100644
--- a/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5d"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 25a1f8a4ae0..4e2a1b8a39b 100644
--- a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index dd7ac63f41c..6bdfa4f2dd4 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 4e2a1b8a39b..f0011c849a4 100644
--- a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index cfd81d2cd53..4796b7798ef 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
index 7f8215348d1..be0c8e1fc69 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
index 76dcecf2554..5311db1d440 100644
--- a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
index ce000bd1275..07e1115fd6e 100644
--- a/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa220"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
index 2f8d470d96f..00545442e9b 100644
--- a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
index c48e77cce48..2ebfbdcfa75 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
index 974c53ce63d..1b2ef6880a2 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
index f5b653cadfe..dd398a6ce01 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
index fee9f74e00a..d4bcf1ca8ac 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
index 9c853b6672d..3292c6ddbd0 100644
--- a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
@@ -39,6 +39,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 858d36f9769..ead796b159c 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
index 08f556111f9..199c7919faf 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 25b85370788..1006c4a1b05 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 65827d6fe17..a14340af032 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index 082683417bd..4800a22b262 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index 36212d4ccd2..1350682e4be 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
index 12d7b1413c9..ce5f8f54754 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index 16fe02f0e3b..532d9797705 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index 43bd12d9e6f..17ba6301b30 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index 9db02a24e96..d51ad920076 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 25c50b5140f..00e0a12ca8e 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
index 3af8cd28dc9..f9fb078423e 100644
--- a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index 5aa2107af10..f9c3486386c 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
index 2ebfbdcfa75..c48e77cce48 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 1b2ef6880a2..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
index dd398a6ce01..f5b653cadfe 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
index 0dc68979e43..c88181217f7 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
index 1bce83b22aa..0ebe7b69e0c 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
index 8ca9f7aa49b..074f57f01e1 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index 2f5527dcba5..fc4262bb582 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 385920ba074..561057ced5c 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
index bd889c4d7e5..e0d488678ae 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 970a0b596df..fb4c1dc2d43 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index 6eb2cd0ff45..eeceb81999e 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index 4166beafba3..b7c00ffb4b3 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index 7a985fbb55d..deabdcc756c 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
index ffe3aefae73..36d9e528f82 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
index 72e65a80efe..7b5287a216a 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index cf8ae047cfb..08144afbd3b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
index 3d963f1eb76..c3918bef3d9 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
index 7ecba1161be..5c938dd3d90 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 7ee7239080c..5486c5522b1 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index f86ae381a6a..e93ced0b7aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
index f8e2615c3f8..170166752c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index 3e2885f919c..cd4b267d68f 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
index b10dcca96b8..a39d900e784 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index 9e6921507b6..f7ba5a0c135 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
index 170166752c7..f8e2615c3f8 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index 32c22376aa7..a0d5f9cc2e9 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index 3f8fd3d4235..ae720284ecf 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
index 44d8b94bc74..d401147456f 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index e47e6cdfe12..6f8a3b3ff88 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index b3d0c2aebe2..833d5ca5043 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
index 33dc2f3e857..40507e5e527 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5b"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
index 817f25be2e6..59be0a3c587 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index 46a869f107a..54863c2d61a 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
index 7bd770826d4..108754699d0 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index 871a3a0a358..88be588dd3c 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index 0587c45a38b..71dda223fa7 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index c2b2cab762b..ecd3802ebc2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index dcfef467346..e5adeb7069b 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index 6350054ba83..97fe7113a03 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 93248ee0fac..73fbdd658a2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index f5efb75d9f2..4d0529dbc46 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index 373bfe7f04c..40f7af7c478 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 6a26767c151..1463cb0e2aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
index a293ad3ef40..1336c15aee4 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
index dccf8c5d8b8..4b4aaa2bc5d 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index 0589d7fba5e..92e2e3d0445 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/dora_metrics.feature b/src/test/resources/com/datadog/api/client/v2/api/dora_metrics.feature
index d0dc8943ad9..a8249df9a71 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/dora_metrics.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/dora_metrics.feature
@@ -148,6 +148,33 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/ci-app-backend
+  Scenario: Patch a deployment event by version returns "Accepted" response
+    Given a valid "appKeyAuth" key in the system
+    And operation "PatchDORADeploymentByVersion" enabled
+    And new "PatchDORADeploymentByVersion" request
+    And body with value {"data": {"attributes": {"change_failure": true, "env": "production", "remediation": {"type": "rollback", "version": "v1.2.2"}, "service": "my-service", "version": "v1.2.3"}, "type": "dora_deployment_patch_request"}}
+    When the request is sent
+    Then the response status is 202 Accepted
+
+  @generated @skip @team:DataDog/ci-app-backend
+  Scenario: Patch a deployment event by version returns "Bad Request" response
+    Given a valid "appKeyAuth" key in the system
+    And operation "PatchDORADeploymentByVersion" enabled
+    And new "PatchDORADeploymentByVersion" request
+    And body with value {"data": {"attributes": {"change_failure": true, "env": "production", "remediation": {"type": "rollback", "version": "v1.2.2"}, "service": "my-service", "version": "v1.2.3"}, "type": "dora_deployment_patch_request"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @skip @team:DataDog/ci-app-backend
+  Scenario: Patch a deployment event by version with a missing version returns "Bad Request" response
+    Given a valid "appKeyAuth" key in the system
+    And operation "PatchDORADeploymentByVersion" enabled
+    And new "PatchDORADeploymentByVersion" request
+    And body with value {"data": {"attributes": {"change_failure": true, "env": "production", "service": "my-service"}, "type": "dora_deployment_patch_request"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
   @generated @skip @team:DataDog/ci-app-backend
   Scenario: Patch a deployment event returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index 2b932a0a328..df961ee10c8 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -2386,6 +2386,12 @@
       "type": "idempotent"
     }
   },
+  "PatchDORADeploymentByVersion": {
+    "tag": "DORA Metrics",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
   "ListDORADeployments": {
     "tag": "DORA Metrics",
     "undo": {