diff --git a/tests/v2/features/datasets.feature b/tests/v2/features/datasets.feature
index 2e089dd018..1efcaeb669 100644
--- a/tests/v2/features/datasets.feature
+++ b/tests/v2/features/datasets.feature
@@ -11,7 +11,7 @@ Feature: Datasets
     And a valid "appKeyAuth" key in the system
     And an instance of "Datasets" API
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/aaa-granular-access
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/access-enforcement
   Scenario: Create a dataset returns "Bad Request" response
     Given new "CreateDataset" request
     And operation "CreateDataset" enabled
@@ -19,7 +19,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Create a dataset returns "Conflict" response
     Given there is a valid "dataset" in the system
     And operation "CreateDataset" enabled
@@ -28,7 +28,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Create a dataset returns "OK" response
     Given new "CreateDataset" request
     And operation "CreateDataset" enabled
@@ -36,7 +36,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Delete a dataset returns "Bad Request" response
     Given new "DeleteDataset" request
     And operation "DeleteDataset" enabled
@@ -44,7 +44,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Delete a dataset returns "No Content" response
     Given there is a valid "dataset" in the system
     And operation "DeleteDataset" enabled
@@ -53,7 +53,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Delete a dataset returns "Not Found" response
     Given new "DeleteDataset" request
     And operation "DeleteDataset" enabled
@@ -61,7 +61,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/aaa-granular-access
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/access-enforcement
   Scenario: Edit a dataset returns "Bad Request" response
     Given new "UpdateDataset" request
     And operation "UpdateDataset" enabled
@@ -69,7 +69,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Edit a dataset returns "Not Found" response
     Given there is a valid "dataset" in the system
     And operation "UpdateDataset" enabled
@@ -79,7 +79,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Edit a dataset returns "OK" response
     Given there is a valid "dataset" in the system
     And operation "UpdateDataset" enabled
@@ -89,7 +89,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Get a single dataset by ID returns "Bad Request" response
     Given new "GetDataset" request
     And operation "GetDataset" enabled
@@ -97,7 +97,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Get a single dataset by ID returns "Not Found" response
     Given operation "GetDataset" enabled
     And new "GetDataset" request
@@ -105,7 +105,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Get a single dataset by ID returns "OK" response
     Given there is a valid "dataset" in the system
     And operation "GetDataset" enabled
@@ -114,7 +114,7 @@ Feature: Datasets
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/aaa-granular-access
+  @skip-terraform-config @team:DataDog/access-enforcement
   Scenario: Get all datasets returns "OK" response
     Given there is a valid "dataset" in the system
     And operation "GetAllDatasets" enabled
diff --git a/tests/v2/features/org_connections.feature b/tests/v2/features/org_connections.feature
index 321e7c77f2..f829284f44 100644
--- a/tests/v2/features/org_connections.feature
+++ b/tests/v2/features/org_connections.feature
@@ -10,14 +10,14 @@ Feature: Org Connections
     And a valid "appKeyAuth" key in the system
     And an instance of "OrgConnections" API
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Create Org Connection returns "Bad Request" response
     Given new "CreateOrgConnections" request
     And body with value {"data": {"type": "org_connection", "relationships": {"sink_org": {"data": {"type": "orgs", "id": "83999dcd-7f97-11f0-8de1-1ecf66f1aa85"}}}, "attributes": {"connection_types": ["logs", "logs"]}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Create Org Connection returns "Conflict" response
     Given there is a valid "org_connection" in the system
     And new "CreateOrgConnections" request
@@ -25,35 +25,35 @@ Feature: Org Connections
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Create Org Connection returns "Not Found" response
     Given new "CreateOrgConnections" request
     And body with value {"data": {"type": "org_connection", "relationships": {"sink_org": {"data": {"type": "orgs", "id": "nonexistent-org-id"}}}, "attributes": {"connection_types": ["logs"]}}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Create Org Connection returns "OK" response
     Given new "CreateOrgConnections" request
     And body with value {"data": {"type": "org_connection", "relationships": {"sink_org": {"data": {"type": "orgs", "id": "83999dcd-7f97-11f0-8de1-1ecf66f1aa85"}}}, "attributes": {"connection_types": ["logs"]}}}
     When the request is sent
     Then the response status is 200 Created
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/aaa-granular-access
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/access-enforcement
   Scenario: Delete Org Connection returns "Bad Request" response
     Given new "DeleteOrgConnections" request
     And request contains "connection_id" parameter with value "malformed_id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Delete Org Connection returns "Not Found" response
     Given new "DeleteOrgConnections" request
     And request contains "connection_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Delete Org Connection returns "OK" response
     Given there is a valid "org_connection" in the system
     And new "DeleteOrgConnections" request
@@ -61,13 +61,13 @@ Feature: Org Connections
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: List Org Connections returns "OK" response
     Given new "ListOrgConnections" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Update Org Connection returns "Bad Request" response
     Given there is a valid "org_connection" in the system
     And new "UpdateOrgConnections" request
@@ -76,7 +76,7 @@ Feature: Org Connections
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Update Org Connection returns "Not Found" response
     Given there is a valid "org_connection" in the system
     And new "UpdateOrgConnections" request
@@ -85,7 +85,7 @@ Feature: Org Connections
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-enforcement
   Scenario: Update Org Connection returns "OK" response
     Given there is a valid "org_connection" in the system
     And new "UpdateOrgConnections" request
diff --git a/tests/v2/features/restriction_policies.feature b/tests/v2/features/restriction_policies.feature
index 6f5bb72d84..fee6874341 100644
--- a/tests/v2/features/restriction_policies.feature
+++ b/tests/v2/features/restriction_policies.feature
@@ -10,28 +10,28 @@ Feature: Restriction Policies
     And a valid "appKeyAuth" key in the system
     And an instance of "RestrictionPolicies" API
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Delete a restriction policy returns "Bad Request" response
     Given new "DeleteRestrictionPolicy" request
     And request contains "resource_id" parameter with value "malformed"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Delete a restriction policy returns "No Content" response
     Given new "DeleteRestrictionPolicy" request
     And request contains "resource_id" parameter with value "dashboard:test-delete"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Get a restriction policy returns "Bad Request" response
     Given new "GetRestrictionPolicy" request
     And request contains "resource_id" parameter with value "malformed"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Get a restriction policy returns "OK" response
     Given new "GetRestrictionPolicy" request
     And request contains "resource_id" parameter with value "dashboard:test-get"
@@ -41,7 +41,7 @@ Feature: Restriction Policies
     And the response "data.id" is equal to "dashboard:test-get"
     And the response "data.attributes.bindings" has length 0
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Update a restriction policy returns "Bad Request" response
     Given there is a valid "role" in the system
     And there is a valid "user" in the system
@@ -52,7 +52,7 @@ Feature: Restriction Policies
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-granular-access
+  @team:DataDog/access-policies-lifecycle
   Scenario: Update a restriction policy returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "user" in the system