diff --git a/tests/v1/features/organizations.feature b/tests/v1/features/organizations.feature
index d9d89aa89d..ffd0cf7639 100644
--- a/tests/v1/features/organizations.feature
+++ b/tests/v1/features/organizations.feature
@@ -8,55 +8,55 @@ Feature: Organizations
     And a valid "appKeyAuth" key in the system
     And an instance of "Organizations" API
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a child organization returns "Bad Request" response
     Given new "CreateChildOrg" request
     And body with value {"billing": {"type": "parent_billing"}, "name": "New child org", "subscription": {"type": "pro"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a child organization returns "OK" response
     Given new "CreateChildOrg" request
     And body with value {"billing": {"type": "parent_billing"}, "name": "New child org", "subscription": {"type": "pro"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get organization information returns "Bad Request" response
     Given new "GetOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get organization information returns "OK" response
     Given new "GetOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: List your managed organizations returns "OK" response
     Given new "ListOrgs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Spin-off Child Organization returns "Bad Request" response
     Given new "DowngradeOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Spin-off Child Organization returns "OK" response
     Given new "DowngradeOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update your organization returns "Bad Request" response
     Given new "UpdateOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -64,7 +64,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update your organization returns "OK" response
     Given new "UpdateOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -72,7 +72,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/team-aaa-identity
+  @skip @team:DataDog/org-management
   Scenario: Upload IdP metadata returns "Bad Request" response
     Given new "UploadIdPForOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -80,7 +80,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/team-aaa-identity
+  @skip @team:DataDog/org-management
   Scenario: Upload IdP metadata returns "OK" response
     Given new "UploadIdPForOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -88,7 +88,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Upload IdP metadata returns "Unsupported Media Type" response
     Given new "UploadIdPForOrg" request
     And request contains "public_id" parameter from "REPLACE.ME"
diff --git a/tests/v1/features/users.feature b/tests/v1/features/users.feature
index 5728554467..6be22f2fd0 100644
--- a/tests/v1/features/users.feature
+++ b/tests/v1/features/users.feature
@@ -7,28 +7,28 @@ Feature: Users
     And a valid "appKeyAuth" key in the system
     And an instance of "Users" API
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a user returns "Bad Request" response
     Given new "CreateUser" request
     And body with value {"access_role": "ro", "disabled": false, "email": "test@datadoghq.com", "handle": "test@datadoghq.com", "name": "test user"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a user returns "Conflict" response
     Given new "CreateUser" request
     And body with value {"access_role": "ro", "disabled": false, "email": "test@datadoghq.com", "handle": "test@datadoghq.com", "name": "test user"}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a user returns "User created" response
     Given new "CreateUser" request
     And body with value {"access_role": "ro", "disabled": false, "email": "test@datadoghq.com", "handle": "test@datadoghq.com", "name": "test user"}
     When the request is sent
     Then the response status is 200 User created
 
-  @replay-only @team:DataDog/team-aaa-identity
+  @replay-only @team:DataDog/org-management
   Scenario: Create a user returns null access role
     Given new "CreateUser" request
     And body with value {"access_role": null, "disabled": false, "email": "test@datadoghq.com", "handle": "test@datadoghq.com", "name": "test user"}
@@ -36,48 +36,48 @@ Feature: Users
     Then the response status is 200 User created
     And the response "user.access_role" is equal to null
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Disable a user returns "Bad Request" response
     Given new "DisableUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Disable a user returns "Not Found" response
     Given new "DisableUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Disable a user returns "User disabled" response
     Given new "DisableUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 User disabled
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get user details returns "Not Found" response
     Given new "GetUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get user details returns "OK for get user" response
     Given new "GetUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK for get user
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: List all users returns "OK" response
     Given new "ListUsers" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update a user returns "Bad Request" response
     Given new "UpdateUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
@@ -85,7 +85,7 @@ Feature: Users
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update a user returns "Not Found" response
     Given new "UpdateUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
@@ -93,7 +93,7 @@ Feature: Users
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update a user returns "User updated" response
     Given new "UpdateUser" request
     And request contains "user_handle" parameter from "REPLACE.ME"
diff --git a/tests/v2/features/authn_mappings.feature b/tests/v2/features/authn_mappings.feature
index 9e0bb72fec..0065724463 100644
--- a/tests/v2/features/authn_mappings.feature
+++ b/tests/v2/features/authn_mappings.feature
@@ -10,21 +10,21 @@ Feature: AuthN Mappings
     And a valid "appKeyAuth" key in the system
     And an instance of "AuthNMappings" API
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Create an AuthN Mapping returns "Bad Request" response
     Given new "CreateAuthNMapping" request
     And body with value {"data": {"attributes": {"attribute_key": "member-of", "attribute_value": "Development"}, "relationships": {"role": {"data": {"id": "3653d3c6-0c75-11ea-ad28-fb5701eabc7d", "type": "roles"}}}, "type": "authn_mappings"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Create an AuthN Mapping returns "Not Found" response
     Given new "CreateAuthNMapping" request
     And body with value {"data": {"attributes": {"attribute_key": "member-of", "attribute_value": "Development"}, "relationships": {"role": {"data": {"id": "3653d3c6-0c75-11ea-ad28-fb5701eabc7d", "type": "roles"}}}, "type": "authn_mappings"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/delegated-auth-login
   Scenario: Create an AuthN Mapping returns "OK" response
     Given there is a valid "role" in the system
     And new "CreateAuthNMapping" request
@@ -35,14 +35,14 @@ Feature: AuthN Mappings
     And the response "data.attributes.attribute_value" is equal to "{{ unique }}"
     And the response "data.relationships.role.data.id" is equal to "{{ role.data.id }}"
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Delete an AuthN Mapping returns "Not Found" response
     Given new "DeleteAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/delegated-auth-login
   Scenario: Delete an AuthN Mapping returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "authn_mapping" in the system
@@ -51,7 +51,7 @@ Feature: AuthN Mappings
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Edit an AuthN Mapping returns "Bad Request" response
     Given new "UpdateAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
@@ -59,7 +59,7 @@ Feature: AuthN Mappings
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Edit an AuthN Mapping returns "Conflict" response
     Given new "UpdateAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
@@ -67,7 +67,7 @@ Feature: AuthN Mappings
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Edit an AuthN Mapping returns "Not Found" response
     Given new "UpdateAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
@@ -75,7 +75,7 @@ Feature: AuthN Mappings
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/delegated-auth-login
   Scenario: Edit an AuthN Mapping returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "authn_mapping" in the system
@@ -89,7 +89,7 @@ Feature: AuthN Mappings
     And the response "data.attributes.attribute_value" is equal to "Development"
     And the response "data.relationships.role.data.id" is equal to "{{ role.data.id }}"
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Edit an AuthN Mapping returns "Unprocessable Entity" response
     Given new "UpdateAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
@@ -97,14 +97,14 @@ Feature: AuthN Mappings
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Get an AuthN Mapping by UUID returns "Not Found" response
     Given new "GetAuthNMapping" request
     And request contains "authn_mapping_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/delegated-auth-login
   Scenario: Get an AuthN Mapping by UUID returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "authn_mapping" in the system
@@ -117,7 +117,7 @@ Feature: AuthN Mappings
     And the response "data.attributes.attribute_value" is equal to "{{ unique }}"
     And the response "data.relationships.role.data.id" is equal to "{{ role.data.id }}"
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/delegated-auth-login
   Scenario: List all AuthN Mappings returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "authn_mapping" in the system
diff --git a/tests/v2/features/organizations.feature b/tests/v2/features/organizations.feature
index ddec7484e7..45e56056c2 100644
--- a/tests/v2/features/organizations.feature
+++ b/tests/v2/features/organizations.feature
@@ -8,40 +8,40 @@ Feature: Organizations
     And a valid "appKeyAuth" key in the system
     And an instance of "Organizations" API
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get a specific Org Config value returns "Bad Request" response
     Given new "GetOrgConfig" request
     And request contains "org_config_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Get a specific Org Config value returns "Not Found" response
     Given new "GetOrgConfig" request
     And request contains "org_config_name" parameter with value "i_dont_exist"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Get a specific Org Config value returns "OK" response
     Given new "GetOrgConfig" request
     And request contains "org_config_name" parameter with value "custom_roles"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: List Org Configs returns "Bad Request" response
     Given new "ListOrgConfigs" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: List Org Configs returns "OK" response
     Given new "ListOrgConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a specific Org Config returns "Bad Request" response
     Given new "UpdateOrgConfig" request
     And request contains "org_config_name" parameter with value "custom_roles"
@@ -49,7 +49,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a specific Org Config returns "Not Found" response
     Given new "UpdateOrgConfig" request
     And request contains "org_config_name" parameter with value "i_dont_exist"
@@ -57,7 +57,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a specific Org Config returns "OK" response
     Given new "UpdateOrgConfig" request
     And request contains "org_config_name" parameter with value "monitor_timezone"
@@ -65,20 +65,20 @@ Feature: Organizations
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/team-aaa-identity
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/delegated-auth-login
   Scenario: Upload IdP metadata returns "Bad Request - caused by either malformed XML or invalid SAML IdP metadata" response
     Given new "UploadIdPMetadata" request
     And request contains "idp_file" parameter with value "fixtures/organizations/saml_configurations/invalid_idp_metadata.xml"
     When the request is sent
     Then the response status is 400 Bad Request - caused by either malformed XML or invalid SAML IdP metadata
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/delegated-auth-login
   Scenario: Upload IdP metadata returns "Bad Request" response
     Given new "UploadIdPMetadata" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/team-aaa-identity
+  @integration-only @skip-terraform-config @skip-validation @team:DataDog/delegated-auth-login
   Scenario: Upload IdP metadata returns "OK" response
     Given new "UploadIdPMetadata" request
     And request contains "idp_file" parameter with value "fixtures/organizations/saml_configurations/valid_idp_metadata.xml"
diff --git a/tests/v2/features/service_accounts.feature b/tests/v2/features/service_accounts.feature
index 6e25db1e8f..12976f5ebc 100644
--- a/tests/v2/features/service_accounts.feature
+++ b/tests/v2/features/service_accounts.feature
@@ -9,14 +9,14 @@ Feature: Service Accounts
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceAccounts" API
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Create a service account returns "Bad Request" response
     Given new "CreateServiceAccount" request
     And body with value {"data": {"attributes": {"email": "jane.doe@example.com", "service_account": true}, "relationships": {"roles": {"data": [{"id": "3653d3c6-0c75-11ea-ad28-fb5701eabc7d", "type": "roles"}]}}, "type": "users"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Create a service account returns "OK" response
     Given there is a valid "role" in the system
     And new "CreateServiceAccount" request
@@ -29,7 +29,7 @@ Feature: Service Accounts
     And the response "data.attributes.service_account" is equal to true
     And the response "data.relationships.roles.data[0].id" is equal to "{{ role.data.id }}"
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Create an application key for this service account returns "Bad Request" response
     Given new "CreateServiceAccountApplicationKey" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -37,7 +37,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Create an application key for this service account returns "Created" response
     Given there is a valid "service_account_user" in the system
     And new "CreateServiceAccountApplicationKey" request
@@ -48,7 +48,7 @@ Feature: Service Accounts
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.relationships.owned_by.data.id" has the same value as "service_account_user.data.id"
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Create an application key with scopes for this service account returns "Created" response
     Given there is a valid "service_account_user" in the system
     And new "CreateServiceAccountApplicationKey" request
@@ -60,7 +60,7 @@ Feature: Service Accounts
     And the response "data.attributes.scopes" is equal to ["dashboards_read", "dashboards_write", "dashboards_public_share"]
     And the response "data.relationships.owned_by.data.id" has the same value as "service_account_user.data.id"
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Delete an application key for this service account returns "No Content" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_application_key" for "service_account_user"
@@ -70,7 +70,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Delete an application key for this service account returns "Not Found" response
     Given new "DeleteServiceAccountApplicationKey" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -78,7 +78,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Edit an application key for this service account returns "Bad Request" response
     Given new "UpdateServiceAccountApplicationKey" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -87,7 +87,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Edit an application key for this service account returns "Not Found" response
     Given new "UpdateServiceAccountApplicationKey" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -96,7 +96,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Edit an application key for this service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_application_key" for "service_account_user"
@@ -110,7 +110,7 @@ Feature: Service Accounts
     And the response "data.type" is equal to "application_keys"
     And the response "data.id" is equal to "{{ service_account_application_key.data.id }}"
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Get one application key for this service account returns "Not Found" response
     Given new "GetServiceAccountApplicationKey" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -118,7 +118,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: Get one application key for this service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_application_key" for "service_account_user"
@@ -131,21 +131,21 @@ Feature: Service Accounts
     And the response "data.type" is equal to "application_keys"
     And the response "data.id" is equal to "{{ service_account_application_key.data.id }}"
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: List application keys for this service account returns "Bad Request" response
     Given new "ListServiceAccountApplicationKeys" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: List application keys for this service account returns "Not Found" response
     Given new "ListServiceAccountApplicationKeys" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management @team:DataDog/team-aaa-identity
+  @team:DataDog/credentials-management @team:DataDog/org-management
   Scenario: List application keys for this service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And new "ListServiceAccountApplicationKeys" request
diff --git a/tests/v2/features/users.feature b/tests/v2/features/users.feature
index ce27d72998..f64d3b8946 100644
--- a/tests/v2/features/users.feature
+++ b/tests/v2/features/users.feature
@@ -7,14 +7,14 @@ Feature: Users
     And a valid "appKeyAuth" key in the system
     And an instance of "Users" API
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Create a user returns "Bad Request" response
     Given new "CreateUser" request
     And body with value {"data": {"attributes": {"email": "jane.doe@example.com"}, "relationships": {"roles": {"data": [{"id": "3653d3c6-0c75-11ea-ad28-fb5701eabc7d", "type": "roles"}]}}, "type": "users"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Create a user returns "OK" response
     Given new "CreateUser" request
     And body with value {"data": {"type": "users", "attributes": {"name": "Datadog API Client Python", "email": "{{ unique }}@datadoghq.com"}}}
@@ -25,14 +25,14 @@ Feature: Users
     And the response "data.attributes.disabled" is false
     And the response "data.attributes.service_account" is false
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Disable a user returns "Not found" response
     Given new "DisableUser" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Disable a user returns "OK" response
     Given there is a valid "user" in the system
     And new "DisableUser" request
@@ -40,14 +40,14 @@ Feature: Users
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get a user invitation returns "Not found" response
     Given new "GetInvitation" request
     And request contains "user_invitation_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Get a user invitation returns "OK" response
     Given there is a valid "user" in the system
     And the "user" has a "user_invitation"
@@ -58,28 +58,28 @@ Feature: Users
     And the response "data.attributes.invite_type" is equal to "openid_invite"
     And the response "data.attributes.uuid" is equal to "{{user_invitation.id}}"
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get a user organization returns "Not found" response
     Given new "ListUserOrganizations" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get a user organization returns "OK" response
     Given new "ListUserOrganizations" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get a user permissions returns "Not found" response
     Given new "ListUserPermissions" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Get a user permissions returns "OK" response
     Given there is a valid "user" in the system
     And new "ListUserPermissions" request
@@ -88,14 +88,14 @@ Feature: Users
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Get user details returns "Not found" response
     Given new "GetUser" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Get user details returns "OK" response
     Given there is a valid "user" in the system
     And new "GetUser" request
@@ -106,13 +106,13 @@ Feature: Users
     And the response "data.type" is equal to "users"
     And the response "data.attributes.handle" is equal to "{{ unique_lower }}@datadoghq.com"
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: List all users returns "Bad Request" response
     Given new "ListUsers" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: List all users returns "OK" response
     Given there is a valid "user" in the system
     And new "ListUsers" request
@@ -122,7 +122,7 @@ Feature: Users
     And the response "meta.page.total_filtered_count" is equal to 1
     And the response "data[0].attributes.email" has the same value as "user.data.attributes.email"
 
-  @replay-only @skip-validation @team:DataDog/team-aaa-identity @with-pagination
+  @replay-only @skip-validation @team:DataDog/org-management @with-pagination
   Scenario: List all users returns "OK" response with pagination
     Given new "ListUsers" request
     And request contains "page[size]" parameter with value 2
@@ -130,14 +130,14 @@ Feature: Users
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Send invitation emails returns "Bad Request" response
     Given new "SendInvitations" request
     And body with value {"data": []}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Send invitation emails returns "OK" response
     Given there is a valid "user" in the system
     And new "SendInvitations" request
@@ -147,7 +147,7 @@ Feature: Users
     And the response "data" has length 1
     And the response "data[0].attributes.invite_type" is equal to "openid_invite"
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update a user returns "Bad Request" response
     Given new "UpdateUser" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -155,7 +155,7 @@ Feature: Users
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a user returns "Bad User ID in Request" response
     Given there is a valid "user" in the system
     And new "UpdateUser" request
@@ -164,7 +164,7 @@ Feature: Users
     When the request is sent
     Then the response status is 422 Bad User ID in Request
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a user returns "Not found" response
     Given new "UpdateUser" request
     And request contains "user_id" parameter with value "00000000-dead-beef-dead-ffffffffffff"
@@ -172,7 +172,7 @@ Feature: Users
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/team-aaa-identity
+  @team:DataDog/org-management
   Scenario: Update a user returns "OK" response
     Given there is a valid "user" in the system
     And new "UpdateUser" request
@@ -185,7 +185,7 @@ Feature: Users
     And the response "data.attributes.name" is equal to "updated"
     And the response "data.attributes.disabled" is equal to true
 
-  @generated @skip @team:DataDog/team-aaa-identity
+  @generated @skip @team:DataDog/org-management
   Scenario: Update a user returns "Unprocessable Entity" response
     Given new "UpdateUser" request
     And request contains "user_id" parameter from "REPLACE.ME"