diff --git a/.apigentools-info b/.apigentools-info
index c101efcadd7..272a8324d77 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-02 09:33:55.421652",
-            "spec_repo_commit": "77cf469a"
+            "regenerated": "2025-05-06 15:05:58.407196",
+            "spec_repo_commit": "d0ee626b"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-02 09:33:55.439532",
-            "spec_repo_commit": "77cf469a"
+            "regenerated": "2025-05-06 15:05:58.424393",
+            "spec_repo_commit": "d0ee626b"
         }
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/com/datadog/api/client/v1/api/metrics.feature b/src/test/resources/com/datadog/api/client/v1/api/metrics.feature
index 112cf9cc0a1..12886d42386 100644
--- a/src/test/resources/com/datadog/api/client/v1/api/metrics.feature
+++ b/src/test/resources/com/datadog/api/client/v1/api/metrics.feature
@@ -14,7 +14,7 @@ Feature: Metrics
     Given a valid "apiKeyAuth" key in the system
     And an instance of "Metrics" API
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Edit metric metadata returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateMetricMetadata" request
@@ -23,7 +23,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Edit metric metadata returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateMetricMetadata" request
@@ -32,7 +32,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Edit metric metadata returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateMetricMetadata" request
@@ -41,7 +41,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Get active metrics list returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListActiveMetrics" request
@@ -49,7 +49,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Get active metrics list returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListActiveMetrics" request
@@ -57,7 +57,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Get metric metadata returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetMetricMetadata" request
@@ -65,7 +65,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Get metric metadata returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "GetMetricMetadata" request
@@ -73,7 +73,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Query timeseries points returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryMetrics" request
@@ -83,7 +83,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Query timeseries points returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryMetrics" request
@@ -95,7 +95,7 @@ Feature: Metrics
     And the response "status" is equal to "ok"
     And the response "query" is equal to "system.cpu.idle{*}"
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Search metrics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListMetrics" request
@@ -103,7 +103,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
   Scenario: Search metrics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListMetrics" request
@@ -119,7 +119,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 202 Payload accepted
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake
   Scenario: Submit deflate metrics returns "Payload accepted" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "type": "gauge", "points": [[{{ timestamp("now") }}, 1.1]], "tags": ["test:{{ unique_alnum }}"]}]}
@@ -155,28 +155,28 @@ Feature: Metrics
     When the request is sent
     Then the response status is 408 Request timeout
 
-  @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Bad Request" response
     Given new "SubmitMetrics" request
     And body with value "invalid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @skip-validation @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Payload accepted" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "type": "gauge", "points": [[{{ timestamp("now") }}, 1.1]], "tags": ["test:{{ unique_alnum }}"]}]}
     When the request is sent
     Then the response status is 202 Payload accepted
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Payload too large" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "points": [[1475317847.0, 0.7]]}]}
     When the request is sent
     Then the response status is 413 Payload too large
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Request timeout" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "points": [[1475317847.0, 0.7]]}]}
diff --git a/src/test/resources/com/datadog/api/client/v2/api/metrics.feature b/src/test/resources/com/datadog/api/client/v2/api/metrics.feature
index b69e8dc104c..e412ab01368 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/metrics.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/metrics.feature
@@ -320,14 +320,14 @@ Feature: Metrics
     And the response "data.type" is equal to "scalar_response"
     And the response "data.attributes.columns[0].name" is equal to "a"
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Bad Request" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "points": [{"timestamp": 1475317847, "value": 0.7}], "resources": [{"name": "dummyhost", "type": "host"}]}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Payload accepted" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "type": 0, "points": [{"timestamp": {{ timestamp('now') }}, "value": 0.7}], "resources": [{"name": "dummyhost", "type": "host"}]}]}
@@ -335,21 +335,21 @@ Feature: Metrics
     Then the response status is 202 Payload accepted
     And the response "errors" has length 0
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Payload too large" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "points": [{"timestamp": 1475317847, "value": 0.7}], "resources": [{"name": "dummyhost", "type": "host"}]}]}
     When the request is sent
     Then the response status is 413 Payload too large
 
-  @generated @skip @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @generated @skip @team:DataDog/metrics-intake
   Scenario: Submit metrics returns "Request timeout" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "points": [{"timestamp": 1475317847, "value": 0.7}], "resources": [{"name": "dummyhost", "type": "host"}]}]}
     When the request is sent
     Then the response status is 408 Request timeout
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake @team:DataDog/metrics-query
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake
   Scenario: Submit metrics with compression returns "Payload accepted" response
     Given new "SubmitMetrics" request
     And body with value {"series": [{"metric": "system.load.1", "type": 0, "points": [{"timestamp": {{ timestamp('now') }}, "value": 0.7}]}]}