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 12886d42386..578439f7acb 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
@@ -111,7 +111,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-aggregation
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake-edge
   Scenario: Submit deflate distribution points returns "Payload accepted" response
     Given new "SubmitDistributionPoints" request
     And body with value {"series": [{"metric": "system.load.1.dist", "points": [[{{ timestamp("now") }}, [1.0, 2.0]]]}]}
@@ -127,28 +127,28 @@ 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-aggregation
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake-edge
   Scenario: Submit distribution points returns "Bad Request" response
     Given new "SubmitDistributionPoints" request
     And body with value {"series": [{"metric": "system.load.1.dist", "points": [[1475317847.0, 1.0]]}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-aggregation
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/metrics-intake-edge
   Scenario: Submit distribution points returns "Payload accepted" response
     Given new "SubmitDistributionPoints" request
     And body with value {"series": [{"metric": "system.load.1.dist", "points": [[{{ timestamp("now") }}, [1.0, 2.0]]]}]}
     When the request is sent
     Then the response status is 202 Payload accepted
 
-  @generated @skip @team:DataDog/metrics-aggregation
+  @generated @skip @team:DataDog/metrics-intake-edge
   Scenario: Submit distribution points returns "Payload too large" response
     Given new "SubmitDistributionPoints" request
     And body with value {"series": [{"metric": "system.load.1", "points": [[1475317847.0, [1.0, 2.0]]]}]}
     When the request is sent
     Then the response status is 413 Payload too large
 
-  @generated @skip @team:DataDog/metrics-aggregation
+  @generated @skip @team:DataDog/metrics-intake-edge
   Scenario: Submit distribution points returns "Request timeout" response
     Given new "SubmitDistributionPoints" request
     And body with value {"series": [{"metric": "system.load.1", "points": [[1475317847.0, [1.0, 2.0]]]}]}