diff --git a/.apigentools-info b/.apigentools-info
index 5c6c0679e77..10a4e30b257 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-01-30 13:13:45.639832",
-            "spec_repo_commit": "833109b8"
+            "regenerated": "2025-01-31 15:03:13.227560",
+            "spec_repo_commit": "b01f90f4"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-01-30 13:13:45.655185",
-            "spec_repo_commit": "833109b8"
+            "regenerated": "2025-01-31 15:03:13.242731",
+            "spec_repo_commit": "b01f90f4"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index c296a76b79a..53917f83cf4 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -5363,8 +5363,7 @@ components:
       - USER
       - SYSTEM
     ChangeEventCustomAttributesChangedResource:
-      description: Object representing a uniquely identified resource. Only the resource
-        type `feature_flag` is supported.
+      description: Object representing a uniquely identified resource.
       properties:
         name:
           description: Resource's name.
@@ -5380,10 +5379,12 @@ components:
       description: Resource's type.
       enum:
       - feature_flag
+      - configuration
       example: feature_flag
       type: string
       x-enum-varnames:
       - FEATURE_FLAG
+      - CONFIGURATION
     ChangeEventCustomAttributesImpactedResourcesItems:
       description: Object representing a uniquely identified resource. Only the resource
         type `service` is supported.
@@ -11239,7 +11240,7 @@ components:
 
             Refer to [Tags docs](https://docs.datadoghq.com/getting_started/tagging/).'
           example:
-          - environment:test
+          - env:test
           items:
             description: A tag.
             type: string
@@ -35963,7 +35964,7 @@ paths:
                       category: change
                       message: payment_processed feature flag has been enabled
                       tags:
-                      - environment:test
+                      - env:test
                       title: payment_processed feature flag updated
                     type: event
             schema:
diff --git a/examples/v2/events/CreateEvent.java b/examples/v2/events/CreateEvent.java
index 4cff9641a37..5e754aac948 100644
--- a/examples/v2/events/CreateEvent.java
+++ b/examples/v2/events/CreateEvent.java
@@ -77,7 +77,7 @@ public static void main(String[] args) {
                                                     "{'datacenter': 'devcycle.us1.prod'}")))))
                             .category(EventCategory.CHANGE)
                             .message("payment_processed feature flag has been enabled")
-                            .tags(Collections.singletonList("environment:test"))
+                            .tags(Collections.singletonList("env:test"))
                             .title("payment_processed feature flag updated"))
                     .type(EventCreateRequestType.EVENT));
 
diff --git a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributes.java b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributes.java
index aa5a9dc7193..1329f7f7bb6 100644
--- a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributes.java
@@ -121,8 +121,7 @@ public ChangeEventCustomAttributes changedResource(
   }
 
   /**
-   * Object representing a uniquely identified resource. Only the resource type <code>feature_flag
-   * </code> is supported.
+   * Object representing a uniquely identified resource.
    *
    * @return changedResource
    */
diff --git a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResource.java b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResource.java
index e9ca6512b76..6d7947796f0 100644
--- a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResource.java
+++ b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResource.java
@@ -17,10 +17,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-/**
- * Object representing a uniquely identified resource. Only the resource type <code>feature_flag
- * </code> is supported.
- */
+/** Object representing a uniquely identified resource. */
 @JsonPropertyOrder({
   ChangeEventCustomAttributesChangedResource.JSON_PROPERTY_NAME,
   ChangeEventCustomAttributesChangedResource.JSON_PROPERTY_TYPE
diff --git a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResourceType.java b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResourceType.java
index 943d658825f..4ffecebad1b 100644
--- a/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResourceType.java
+++ b/src/main/java/com/datadog/api/client/v2/model/ChangeEventCustomAttributesChangedResourceType.java
@@ -26,10 +26,12 @@
 public class ChangeEventCustomAttributesChangedResourceType extends ModelEnum<String> {
 
   private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("feature_flag"));
+      new HashSet<String>(Arrays.asList("feature_flag", "configuration"));
 
   public static final ChangeEventCustomAttributesChangedResourceType FEATURE_FLAG =
       new ChangeEventCustomAttributesChangedResourceType("feature_flag");
+  public static final ChangeEventCustomAttributesChangedResourceType CONFIGURATION =
+      new ChangeEventCustomAttributesChangedResourceType("configuration");
 
   ChangeEventCustomAttributesChangedResourceType(String value) {
     super(value, allowedValues);
diff --git a/src/test/resources/com/datadog/api/client/v2/api/events.feature b/src/test/resources/com/datadog/api/client/v2/api/events.feature
index 61310eb2c6f..a8c1307ac68 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/events.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/events.feature
@@ -53,14 +53,14 @@ Feature: Events
   @generated @skip @team:DataDog/event-management
   Scenario: Post an event returns "Bad request" response
     Given new "CreateEvent" request
-    And body with value {"data": {"attributes": {"attributes": {"author": {"name": "datadog@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "change", "message": "payment_processed feature flag has been enabled", "tags": ["environment:test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
+    And body with value {"data": {"attributes": {"attributes": {"author": {"name": "datadog@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "change", "message": "payment_processed feature flag has been enabled", "tags": ["env:test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
     When the request is sent
     Then the response status is 400 Bad request
 
   @generated @skip @team:DataDog/event-management
   Scenario: Post an event returns "OK" response
     Given new "CreateEvent" request
-    And body with value {"data": {"attributes": {"attributes": {"author": {"name": "datadog@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "change", "message": "payment_processed feature flag has been enabled", "tags": ["environment:test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
+    And body with value {"data": {"attributes": {"attributes": {"author": {"name": "datadog@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "change", "message": "payment_processed feature flag has been enabled", "tags": ["env:test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
     When the request is sent
     Then the response status is 200 OK