diff --git a/.apigentools-info b/.apigentools-info
index da8c0215a1f..b1b9de8f4a8 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-06-08 21:02:44.638617",
-            "spec_repo_commit": "5b401dab"
+            "regenerated": "2023-06-09 14:55:30.022772",
+            "spec_repo_commit": "b6c7aa0b"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-06-08 21:02:44.654400",
-            "spec_repo_commit": "5b401dab"
+            "regenerated": "2023-06-09 14:55:30.037081",
+            "spec_repo_commit": "b6c7aa0b"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index cf9fdd6d2f9..5948fba8976 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -16761,6 +16761,7 @@ components:
         iot_device_count:
           description: The total number of IoT devices during a given hour.
           format: int64
+          nullable: true
           type: integer
         org_name:
           description: The organization name.
@@ -16888,6 +16889,7 @@ components:
         retention:
           description: The retention period in days or "custom" for all custom retention
             usage.
+          nullable: true
           type: string
       type: object
     UsageLogsByRetentionResponse:
@@ -17012,6 +17014,7 @@ components:
         host_count:
           description: Contains the number of active NPM hosts.
           format: int64
+          nullable: true
           type: integer
         hour:
           description: The hour for the usage.
diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageIoTHour.java b/src/main/java/com/datadog/api/client/v1/model/UsageIoTHour.java
index dbd6cd86a2f..e9fb2235f6b 100644
--- a/src/main/java/com/datadog/api/client/v1/model/UsageIoTHour.java
+++ b/src/main/java/com/datadog/api/client/v1/model/UsageIoTHour.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.time.OffsetDateTime;
 import java.util.Objects;
+import org.openapitools.jackson.nullable.JsonNullable;
 
 /** IoT usage for a given organization for a given hour. */
 @JsonPropertyOrder({
@@ -28,7 +29,7 @@ public class UsageIoTHour {
   private OffsetDateTime hour;
 
   public static final String JSON_PROPERTY_IOT_DEVICE_COUNT = "iot_device_count";
-  private Long iotDeviceCount;
+  private JsonNullable<Long> iotDeviceCount = JsonNullable.<Long>undefined();
 
   public static final String JSON_PROPERTY_ORG_NAME = "org_name";
   private String orgName;
@@ -58,7 +59,7 @@ public void setHour(OffsetDateTime hour) {
   }
 
   public UsageIoTHour iotDeviceCount(Long iotDeviceCount) {
-    this.iotDeviceCount = iotDeviceCount;
+    this.iotDeviceCount = JsonNullable.<Long>of(iotDeviceCount);
     return this;
   }
 
@@ -68,16 +69,26 @@ public UsageIoTHour iotDeviceCount(Long iotDeviceCount) {
    * @return iotDeviceCount
    */
   @jakarta.annotation.Nullable
+  @JsonIgnore
+  public Long getIotDeviceCount() {
+    return iotDeviceCount.orElse(null);
+  }
+
   @JsonProperty(JSON_PROPERTY_IOT_DEVICE_COUNT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Long getIotDeviceCount() {
+  public JsonNullable<Long> getIotDeviceCount_JsonNullable() {
     return iotDeviceCount;
   }
 
-  public void setIotDeviceCount(Long iotDeviceCount) {
+  @JsonProperty(JSON_PROPERTY_IOT_DEVICE_COUNT)
+  public void setIotDeviceCount_JsonNullable(JsonNullable<Long> iotDeviceCount) {
     this.iotDeviceCount = iotDeviceCount;
   }
 
+  public void setIotDeviceCount(Long iotDeviceCount) {
+    this.iotDeviceCount = JsonNullable.<Long>of(iotDeviceCount);
+  }
+
   public UsageIoTHour orgName(String orgName) {
     this.orgName = orgName;
     return this;
diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageLogsByRetentionHour.java b/src/main/java/com/datadog/api/client/v1/model/UsageLogsByRetentionHour.java
index a731d286bf9..56b15c3b90b 100644
--- a/src/main/java/com/datadog/api/client/v1/model/UsageLogsByRetentionHour.java
+++ b/src/main/java/com/datadog/api/client/v1/model/UsageLogsByRetentionHour.java
@@ -46,7 +46,7 @@ public class UsageLogsByRetentionHour {
   private JsonNullable<Long> rehydratedIndexedEventsCount = JsonNullable.<Long>undefined();
 
   public static final String JSON_PROPERTY_RETENTION = "retention";
-  private String retention;
+  private JsonNullable<String> retention = JsonNullable.<String>undefined();
 
   public UsageLogsByRetentionHour indexedEventsCount(Long indexedEventsCount) {
     this.indexedEventsCount = JsonNullable.<Long>of(indexedEventsCount);
@@ -185,7 +185,7 @@ public void setRehydratedIndexedEventsCount(Long rehydratedIndexedEventsCount) {
   }
 
   public UsageLogsByRetentionHour retention(String retention) {
-    this.retention = retention;
+    this.retention = JsonNullable.<String>of(retention);
     return this;
   }
 
@@ -195,16 +195,26 @@ public UsageLogsByRetentionHour retention(String retention) {
    * @return retention
    */
   @jakarta.annotation.Nullable
+  @JsonIgnore
+  public String getRetention() {
+    return retention.orElse(null);
+  }
+
   @JsonProperty(JSON_PROPERTY_RETENTION)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getRetention() {
+  public JsonNullable<String> getRetention_JsonNullable() {
     return retention;
   }
 
-  public void setRetention(String retention) {
+  @JsonProperty(JSON_PROPERTY_RETENTION)
+  public void setRetention_JsonNullable(JsonNullable<String> retention) {
     this.retention = retention;
   }
 
+  public void setRetention(String retention) {
+    this.retention = JsonNullable.<String>of(retention);
+  }
+
   /** Return true if this UsageLogsByRetentionHour object is equal to o. */
   @Override
   public boolean equals(Object o) {
diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageNetworkHostsHour.java b/src/main/java/com/datadog/api/client/v1/model/UsageNetworkHostsHour.java
index f7787544fae..4d304eb2656 100644
--- a/src/main/java/com/datadog/api/client/v1/model/UsageNetworkHostsHour.java
+++ b/src/main/java/com/datadog/api/client/v1/model/UsageNetworkHostsHour.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.time.OffsetDateTime;
 import java.util.Objects;
+import org.openapitools.jackson.nullable.JsonNullable;
 
 /** Number of active NPM hosts for each hour for a given organization. */
 @JsonPropertyOrder({
@@ -25,7 +26,7 @@
 public class UsageNetworkHostsHour {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_HOST_COUNT = "host_count";
-  private Long hostCount;
+  private JsonNullable<Long> hostCount = JsonNullable.<Long>undefined();
 
   public static final String JSON_PROPERTY_HOUR = "hour";
   private OffsetDateTime hour;
@@ -37,7 +38,7 @@ public class UsageNetworkHostsHour {
   private String publicId;
 
   public UsageNetworkHostsHour hostCount(Long hostCount) {
-    this.hostCount = hostCount;
+    this.hostCount = JsonNullable.<Long>of(hostCount);
     return this;
   }
 
@@ -47,16 +48,26 @@ public UsageNetworkHostsHour hostCount(Long hostCount) {
    * @return hostCount
    */
   @jakarta.annotation.Nullable
+  @JsonIgnore
+  public Long getHostCount() {
+    return hostCount.orElse(null);
+  }
+
   @JsonProperty(JSON_PROPERTY_HOST_COUNT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Long getHostCount() {
+  public JsonNullable<Long> getHostCount_JsonNullable() {
     return hostCount;
   }
 
-  public void setHostCount(Long hostCount) {
+  @JsonProperty(JSON_PROPERTY_HOST_COUNT)
+  public void setHostCount_JsonNullable(JsonNullable<Long> hostCount) {
     this.hostCount = hostCount;
   }
 
+  public void setHostCount(Long hostCount) {
+    this.hostCount = JsonNullable.<Long>of(hostCount);
+  }
+
   public UsageNetworkHostsHour hour(OffsetDateTime hour) {
     this.hour = hour;
     return this;
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 907a2641363..1489fb9e00e 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-ee2d9f9e4f02"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
   }
 ]
\ 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 d03bf9ca97e..45e484f0b48 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-ee2d9f9e4f01"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
index acedc012d64..4f55fd48470 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
index 52af42b6bb5..75696feb97f 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
   },
   {
     "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 0168d0442ae..908cab25f26 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-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
   },
   {
     "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 2236d2e23a5..94195cc3fa6 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-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json
index 99ef53d9ce7..22c45d1ce03 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0685"
+    "id": "74945625-c01a-a598-e538-65a53ceb0688"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json
index 135cc1ef131..9aead012302 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0688"
+    "id": "74945625-c01a-a598-e538-65a53ceb0686"
   },
   {
     "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 feb6f26376a..7bc9e82cb8d 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-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
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 aef010d0da5..dd4f788d328 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-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json
index b77c52ec7fd..5c70f34f720 100644
--- a/src/test/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0687"
+    "id": "74945625-c01a-a598-e538-65a53ceb0689"
   },
   {
     "httpRequest": {
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 66b5649b3b7..7d3c6535ff1 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-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index 7c020bbd2c5..8b5185d00c4 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   }
 ]
\ No newline at end of file
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 fccadae11ee..adf37d2a1f1 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-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
   },
   {
     "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 06155248802..bef78152d63 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-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json
index 26fc7553875..b838117ca4b 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index fb7dfecaa5c..246f6016cf0 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "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 ef0345587d6..3d0ff2153be 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-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "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 9f4bc20b64f..9f17ccd407a 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-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
   },
   {
     "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 db418d57e9f..d75053c9fd1 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-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
   },
   {
     "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 65fa0acf37c..152c30485ef 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-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_OK_response.json
index 12efdbc7fd6..df86c6c9def 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0686"
+    "id": "74945625-c01a-a598-e538-65a53ceb0685"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_Unprocessable_Entity_response.json b/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_Unprocessable_Entity_response.json
index a65071b2d07..4d1a473cd6b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_Unprocessable_Entity_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_RUM_application_returns_Unprocessable_Entity_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0689"
+    "id": "74945625-c01a-a598-e538-65a53ceb0687"
   },
   {
     "httpRequest": {
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 73305cd59ef..1722bd3d627 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-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
index cda844130b2..8dfccd844be 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "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 f5af311afeb..a79813863cc 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-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "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 3e8008f2657..56f57e28636 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-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "httpRequest": {