diff --git a/tests/v2/features/api_management.feature b/tests/v2/features/api_management.feature
index 86cb52fe84..aefe9f319c 100644
--- a/tests/v2/features/api_management.feature
+++ b/tests/v2/features/api_management.feature
@@ -7,7 +7,7 @@ Feature: API Management
     And a valid "appKeyAuth" key in the system
     And an instance of "APIManagement" API
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/api-management
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/apm-aoe
   Scenario: Create a new API returns "API created successfully" response
     Given operation "CreateOpenAPI" enabled
     And new "CreateOpenAPI" request
@@ -16,14 +16,14 @@ Feature: API Management
     Then the response status is 201 API created successfully
     And the response "data.attributes.failed_endpoints" has length 0
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Create a new API returns "Bad request" response
     Given operation "CreateOpenAPI" enabled
     And new "CreateOpenAPI" request
     When the request is sent
     Then the response status is 400 Bad request
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/api-management
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/apm-aoe
   Scenario: Delete an API returns "API deleted successfully" response
     Given operation "DeleteOpenAPI" enabled
     And there is a valid "managed_api" in the system
@@ -32,7 +32,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 204 API deleted successfully
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Delete an API returns "API not found error" response
     Given operation "DeleteOpenAPI" enabled
     And new "DeleteOpenAPI" request
@@ -40,7 +40,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 404 API not found error
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Delete an API returns "Bad request" response
     Given operation "DeleteOpenAPI" enabled
     And new "DeleteOpenAPI" request
@@ -48,7 +48,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Get an API returns "API not found error" response
     Given operation "GetOpenAPI" enabled
     And new "GetOpenAPI" request
@@ -56,7 +56,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 404 API not found error
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Get an API returns "Bad request" response
     Given operation "GetOpenAPI" enabled
     And new "GetOpenAPI" request
@@ -64,7 +64,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 400 Bad request
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/api-management
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/apm-aoe
   Scenario: Get an API returns "OK" response
     Given operation "GetOpenAPI" enabled
     And there is a valid "managed_api" in the system
@@ -73,21 +73,21 @@ Feature: API Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: List APIs returns "Bad request" response
     Given operation "ListAPIs" enabled
     And new "ListAPIs" request
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: List APIs returns "OK" response
     Given operation "ListAPIs" enabled
     And new "ListAPIs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Update an API returns "API not found error" response
     Given operation "UpdateOpenAPI" enabled
     And new "UpdateOpenAPI" request
@@ -95,7 +95,7 @@ Feature: API Management
     When the request is sent
     Then the response status is 404 API not found error
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/api-management
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/apm-aoe
   Scenario: Update an API returns "API updated successfully" response
     Given operation "UpdateOpenAPI" enabled
     And there is a valid "managed_api" in the system
@@ -106,7 +106,7 @@ Feature: API Management
     Then the response status is 200 API updated successfully
     And the response "data.attributes.failed_endpoints" has length 0
 
-  @generated @skip @team:DataDog/api-management
+  @generated @skip @team:DataDog/apm-aoe
   Scenario: Update an API returns "Bad request" response
     Given operation "UpdateOpenAPI" enabled
     And new "UpdateOpenAPI" request