diff --git a/features/v1/authentication.feature b/features/v1/authentication.feature
index b82a2313218e..6ca043fd757f 100644
--- a/features/v1/authentication.feature
+++ b/features/v1/authentication.feature
@@ -16,12 +16,12 @@ Feature: Authentication
     Given an instance of "Authentication" API
     And new "Validate" request
 
-  @skip-validation @team:DataDog/credentials-management
+  @skip-validation @team:ddoghq/credentials-management
   Scenario: Validate API key returns "Forbidden" response
     When the request is sent
     Then the response status is 403 OK
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Validate API key returns "OK" response
     Given a valid "apiKeyAuth" key in the system
     When the request is sent
diff --git a/features/v1/aws_integration.feature b/features/v1/aws_integration.feature
index 08c57bbc61eb..a2a6d6508340 100644
--- a/features/v1/aws_integration.feature
+++ b/features/v1/aws_integration.feature
@@ -9,70 +9,70 @@ Feature: AWS Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "AWSIntegration" API
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "Bad Request" response
     Given new "CreateAWSAccount" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "Conflict Error" response
     Given new "CreateAWSAccount" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 409 Conflict Error
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "OK" response
     Given new "CreateAWSAccount" request
     And body with value {"account_id": "{{ timestamp("now") }}00", "account_specific_namespace_rules": {"auto_scaling": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an Amazon EventBridge source returns "Bad Request" response
     Given new "CreateAWSEventBridgeSource" request
     And body with value {"account_id": "123456789012", "create_event_bus": true, "event_generator_name": "app-alerts", "region": "us-east-1"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an Amazon EventBridge source returns "OK" response
     Given new "CreateAWSEventBridgeSource" request
     And body with value {"account_id": "123456789012", "create_event_bus": true, "event_generator_name": "app-alerts", "region": "us-east-1"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete a tag filtering entry returns "Bad Request" response
     Given new "DeleteAWSTagFilter" request
     And body with value {"account_id": "FAKEAC0FAKEAC2FAKEAC", "namespace": "elb"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete a tag filtering entry returns "OK" response
     Given new "DeleteAWSTagFilter" request
     And body with value {"account_id": "FAKEAC0FAKEAC2FAKEAC", "namespace": "elb"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "Bad Request" response
     Given new "DeleteAWSAccount" request
     And body with value {"account_id": "123456789012", "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "Conflict Error" response
     Given new "DeleteAWSAccount" request
     And body with value {"account_id": "123456789012", "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 409 Conflict Error
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "OK" response
     Given there is a valid "aws_account" in the system
     And new "DeleteAWSAccount" request
@@ -80,107 +80,107 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an Amazon EventBridge source returns "Bad Request" response
     Given new "DeleteAWSEventBridgeSource" request
     And body with value {"account_id": "123456789012", "event_generator_name": "app-alerts-zyxw3210", "region": "us-east-1"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an Amazon EventBridge source returns "OK" response
     Given new "DeleteAWSEventBridgeSource" request
     And body with value {"account_id": "123456789012", "event_generator_name": "app-alerts-zyxw3210", "region": "us-east-1"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Generate a new external ID returns "Bad Request" response
     Given new "CreateNewAWSExternalID" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Generate a new external ID returns "OK" response
     Given new "CreateNewAWSExternalID" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all AWS tag filters returns "Bad Request" response
     Given new "ListAWSTagFilters" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all AWS tag filters returns "OK" response
     Given new "ListAWSTagFilters" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all Amazon EventBridge sources returns "Bad Request" response
     Given new "ListAWSEventBridgeSources" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all Amazon EventBridge sources returns "OK" response
     Given new "ListAWSEventBridgeSources" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: List all AWS integrations returns "Bad Request" response
     Given new "ListAWSAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: List all AWS integrations returns "OK" response
     Given new "ListAWSAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: List namespace rules returns "OK" response
     Given new "ListAvailableAWSNamespaces" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Set an AWS tag filter returns "Bad Request" response
     Given new "CreateAWSTagFilter" request
     And body with value {"account_id": "123456789012", "namespace": "elb", "tag_filter_str": "prod*"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Set an AWS tag filter returns "OK" response
     Given new "CreateAWSTagFilter" request
     And body with value {"account_id": "123456789012", "namespace": "elb", "tag_filter_str": "prod*"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "Bad Request" response
     Given new "UpdateAWSAccount" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "Conflict Error" response
     Given new "UpdateAWSAccount" request
     And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 409 Conflict Error
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "OK" response
     Given there is a valid "aws_account" in the system
     And new "UpdateAWSAccount" request
diff --git a/features/v1/aws_logs_integration.feature b/features/v1/aws_logs_integration.feature
index 622d8d7debac..0e968f695095 100644
--- a/features/v1/aws_logs_integration.feature
+++ b/features/v1/aws_logs_integration.feature
@@ -10,89 +10,89 @@ Feature: AWS Logs Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "AWSLogsIntegration" API
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Add AWS Log Lambda ARN returns "Bad Request" response
     Given new "CreateAWSLambdaARN" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Add AWS Log Lambda ARN returns "OK" response
     Given new "CreateAWSLambdaARN" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Check permissions for log services returns "Bad Request" response
     Given new "CheckAWSLogsServicesAsync" request
     And body with value {"account_id": "1234567", "services": ["s3", "elb", "elbv2", "cloudfront", "redshift", "lambda"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Check permissions for log services returns "OK" response
     Given new "CheckAWSLogsServicesAsync" request
     And body with value {"account_id": "1234567", "services": ["s3", "elb", "elbv2", "cloudfront", "redshift", "lambda"]}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Check that an AWS Lambda Function exists returns "Bad Request" response
     Given new "CheckAWSLogsLambdaAsync" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Check that an AWS Lambda Function exists returns "OK" response
     Given new "CheckAWSLogsLambdaAsync" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an AWS Logs integration returns "Bad Request" response
     Given new "DeleteAWSLambdaARN" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an AWS Logs integration returns "OK" response
     Given new "DeleteAWSLambdaARN" request
     And body with value {"account_id": "1234567", "lambda_arn": "arn:aws:lambda:us-east-1:1234567:function:LogsCollectionAPITest"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Enable an AWS Logs integration returns "Bad Request" response
     Given new "EnableAWSLogServices" request
     And body with value {"account_id": "1234567", "services": ["s3", "elb", "elbv2", "cloudfront", "redshift", "lambda"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Enable an AWS Logs integration returns "OK" response
     Given new "EnableAWSLogServices" request
     And body with value {"account_id": "1234567", "services": ["s3", "elb", "elbv2", "cloudfront", "redshift", "lambda"]}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get list of AWS log ready services returns "OK" response
     Given new "ListAWSLogsServices" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: List all AWS Logs integrations returns "Bad Request" response
     Given new "ListAWSLogsIntegrations" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: List all AWS Logs integrations returns "OK" response
     Given new "ListAWSLogsIntegrations" request
     When the request is sent
diff --git a/features/v1/azure_integration.feature b/features/v1/azure_integration.feature
index 6ba40e91e5b5..1b218246b56e 100644
--- a/features/v1/azure_integration.feature
+++ b/features/v1/azure_integration.feature
@@ -9,28 +9,28 @@ Feature: Azure Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "AzureIntegration" API
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: Create an Azure integration returns "Bad Request" response
     Given new "CreateAzureIntegration" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/azure-integrations
+  @team:ddoghq/azure-integrations
   Scenario: Create an Azure integration returns "OK" response
     Given new "CreateAzureIntegration" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "{{ uuid }}", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "{{ uuid }}", "new_tenant_name": "{{ uuid }}", "resource_collection_enabled": true, "tenant_name": "{{ uuid }}"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: Delete an Azure integration returns "Bad Request" response
     Given new "DeleteAzureIntegration" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/azure-integrations
+  @team:ddoghq/azure-integrations
   Scenario: Delete an Azure integration returns "OK" response
     Given there is a valid "azure_account" in the system
     And new "DeleteAzureIntegration" request
@@ -38,40 +38,40 @@ Feature: Azure Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: List all Azure integrations returns "Bad Request" response
     Given new "ListAzureIntegration" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: List all Azure integrations returns "OK" response
     Given new "ListAzureIntegration" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: Update Azure integration host filters returns "Bad Request" response
     Given new "UpdateAzureHostFilters" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: Update Azure integration host filters returns "OK" response
     Given new "UpdateAzureHostFilters" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/azure-integrations
+  @generated @skip @team:ddoghq/azure-integrations
   Scenario: Update an Azure integration returns "Bad Request" response
     Given new "UpdateAzureIntegration" request
     And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/azure-integrations
+  @team:ddoghq/azure-integrations
   Scenario: Update an Azure integration returns "OK" response
     Given there is a valid "azure_account" in the system
     And new "UpdateAzureIntegration" request
diff --git a/features/v1/dashboard_lists.feature b/features/v1/dashboard_lists.feature
index 2077d4503959..474921a2cc55 100644
--- a/features/v1/dashboard_lists.feature
+++ b/features/v1/dashboard_lists.feature
@@ -8,14 +8,14 @@ Feature: Dashboard Lists
     And a valid "appKeyAuth" key in the system
     And an instance of "DashboardLists" API
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Create a dashboard list returns "Bad Request" response
     Given new "CreateDashboardList" request
     And body with value {"name": "My Dashboard"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a dashboard list returns "OK" response
     Given new "CreateDashboardList" request
     And body with value {"name": "{{ unique }}"}
@@ -23,14 +23,14 @@ Feature: Dashboard Lists
     Then the response status is 200 OK
     And the response "name" is equal to "{{ unique }}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete a dashboard list returns "Not Found" response
     Given new "DeleteDashboardList" request
     And request contains "list_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete a dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And new "DeleteDashboardList" request
@@ -39,14 +39,14 @@ Feature: Dashboard Lists
     Then the response status is 200 OK
     And the response "deleted_dashboard_list_id" has the same value as "dashboard_list.id"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get a dashboard list returns "Not Found" response
     Given new "GetDashboardList" request
     And request contains "list_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get a dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And new "GetDashboardList" request
@@ -56,7 +56,7 @@ Feature: Dashboard Lists
     And the response "id" has the same value as "dashboard_list.id"
     And the response "name" has the same value as "dashboard_list.name"
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get all dashboard lists returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And new "ListDashboardLists" request
@@ -64,7 +64,7 @@ Feature: Dashboard Lists
     Then the response status is 200 OK
     And the response "dashboard_lists[0].name" has the same value as "dashboard_list.name"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard list returns "Bad Request" response
     Given new "UpdateDashboardList" request
     And request contains "list_id" parameter from "REPLACE.ME"
@@ -72,7 +72,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard list returns "Not Found" response
     Given new "UpdateDashboardList" request
     And request contains "list_id" parameter with value 0
@@ -80,7 +80,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And new "UpdateDashboardList" request
diff --git a/features/v1/dashboards.feature b/features/v1/dashboards.feature
index 1bb0ed3bdefa..0025051913b4 100644
--- a/features/v1/dashboards.feature
+++ b/features/v1/dashboards.feature
@@ -9,7 +9,7 @@ Feature: Dashboards
     And a valid "appKeyAuth" key in the system
     And an instance of "Dashboards" API
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Clients deserialize a dashboard with a empty time object
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "Example Cloud Cost Query", "title_size": "16", "title_align": "left", "type": "timeseries",  "requests": [ { "formulas": [ { "formula": "query1" } ], "queries": [ { "data_source": "cloud_cost", "name": "query1", "query": "sum:aws.cost.amortized{*} by {aws_product}.rollup(sum, monthly)" } ], "response_format": "timeseries", "style": { "palette": "dog_classic", "line_type": "solid", "line_width": "normal" }, "display_type": "bars" } ], "time": {} } } ], "layout_type": "ordered" }
@@ -17,7 +17,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "widgets[0].definition.time" is equal to {}
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a distribution widget using a histogram request containing a formulas and functions APM Stats query
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "description": "", "widgets": [ { "definition": { "title": "APM Stats - Request latency HOP", "title_size": "16", "title_align": "left", "show_legend": false, "type": "distribution", "xaxis": { "max": "auto", "include_zero": true, "scale": "linear", "min": "auto" }, "yaxis": { "max": "auto", "include_zero": true, "scale": "linear", "min": "auto" }, "requests": [ { "query": { "primary_tag_value": "*", "stat": "latency_distribution", "data_source": "apm_resource_stats", "name": "query1", "service": "azure-bill-import", "group_by": [ "resource_name" ], "env": "staging", "primary_tag_name": "datacenter", "operation_name": "universal.http.client" }, "request_type": "histogram", "style": { "palette": "dog_classic" } } ] }, "layout": { "x": 8, "y": 0, "width": 4, "height": 2 } } ], "layout_type": "ordered" }
@@ -35,7 +35,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.primary_tag_name" is equal to "datacenter"
     And the response "widgets[0].definition.requests[0].query.operation_name" is equal to "universal.http.client"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a distribution widget using a histogram request containing a formulas and functions events query
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "description": "{{ unique }}", "widgets": [ { "definition": { "title": "Events Platform - Request latency HOP", "title_size": "16", "title_align": "left", "show_legend": false, "type": "distribution", "xaxis": { "max": "auto", "include_zero": true, "scale": "linear", "min": "auto" }, "yaxis": { "max": "auto", "include_zero": true, "scale": "linear", "min": "auto" }, "requests": [ { "query": { "search": { "query": "" }, "data_source": "events", "compute": { "metric": "@duration", "aggregation": "min" }, "name": "query1", "indexes": [ "*" ] }, "request_type": "histogram" } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 2 } } ], "layout_type": "ordered" }
@@ -49,7 +49,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.name" is equal to "query1"
     And the response "widgets[0].definition.requests[0].query.indexes" is equal to ["*"]
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a distribution widget using a histogram request containing a formulas and functions metrics query
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }}","widgets":[{"definition":{"title":"Metrics HOP","title_size":"16","title_align":"left","show_legend":false,"type":"distribution","custom_links":[{"label":"Example","link":"https://example.org/"}],"xaxis":{"max":"auto","include_zero":true,"scale":"linear","min":"auto"},"yaxis":{"max":"auto","include_zero":true,"scale":"linear","min":"auto"},"requests":[{"query":{"query":"histogram:trace.Load{*}","data_source":"metrics","name":"query1"},"request_type":"histogram","style":{"palette":"dog_classic"}}]},"layout":{"x":0,"y":0,"width":4,"height":2}}],"layout_type":"ordered"}
@@ -62,7 +62,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.name" is equal to "query1"
     And the response "widgets[0].definition.custom_links" has item with field "label" with value "Example"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a geomap widget using an event_list request
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }}","description": "{{ unique }}","widgets":[{"definition":{"title":"","title_size":"16","title_align":"left","type":"geomap","requests":[{"response_format":"event_list","query":{"data_source":"logs_stream","query_string":"","indexes":[]},"columns":[{"field":"@network.client.geoip.location.latitude","width":"auto"},{"field":"@network.client.geoip.location.longitude","width":"auto"},{"field":"@network.client.geoip.country.iso_code","width":"auto"},{"field":"@network.client.geoip.subdivision.name","width":"auto"},{"field":"classic","width":"auto"},{"field":"","width":"auto"}]}],"style":{"palette":"hostmap_blues","palette_flip":false},"view":{"focus":"WORLD"}},"layout":{"x":0,"y":0,"width":12,"height":6}}],"template_variables":[],"layout_type":"ordered","notify_list":[],"reflow_type":"fixed","tags":[]}
@@ -71,7 +71,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].response_format" is equal to "event_list"
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "logs_stream"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a geomap widget with conditional formats and text formats
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }}","description": "{{ unique }}","widgets":[{"definition":{"title":"Log Count by Service and Source","type":"geomap","requests":[{"response_format":"scalar","queries":[{"data_source":"rum","name":"query1","search":{"query":"@type:session"},"indexes":["*"],"compute":{"aggregation":"count"}}],"conditional_formats":[{"comparator":">","value":1000,"palette":"white_on_green"}],"formulas":[{"formula":"query1"}],"sort":{"count":250,"order_by":[{"type":"formula","index":0,"order":"desc"}]}},{"response_format":"event_list","query":{"data_source":"logs_stream","query_string":"","indexes":[],"storage":"hot"},"columns":[{"field":"@network.client.geoip.location.latitude","width":"auto"},{"field":"@network.client.geoip.location.longitude","width":"auto"},{"field":"@network.client.geoip.country.iso_code","width":"auto"},{"field":"@network.client.geoip.subdivision.name","width":"auto"}],"style":{"color_by":"status"},"text_formats":[{"match":{"type":"is","value":"error"},"palette":"white_on_red"}]}],"style":{"palette":"hostmap_blues","palette_flip":false},"view":{"focus":"NORTH_AMERICA"}},"layout":{"x":0,"y":0,"width":12,"height":6}}],"template_variables":[],"layout_type":"ordered","notify_list":[],"reflow_type":"fixed","tags":[]}
@@ -87,14 +87,14 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[1].text_formats[0].palette" is equal to "white_on_red"
     And the response "widgets[0].definition.view.focus" is equal to "NORTH_AMERICA"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard returns "Bad Request" response
     Given new "CreateDashboard" request
     And body with value {"default_timeframe": {"type": "live", "unit": "minute", "value": 4}, "description": null, "is_read_only": false, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "tabs": [{"id": "", "name": "L", "widget_ids": [0]}], "tags": [], "template_variable_presets": [{"template_variables": [{"values": []}]}], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "default": "my-host", "defaults": ["my-host-1", "my-host-2"], "name": "host1", "prefix": "host", "type": "group"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard returns "OK" response
     Given new "CreateDashboard" request
     And body from file "dashboard_payload.json"
@@ -105,7 +105,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].profile_metrics_query.compute.facet" is equal to "@prof_core_cpu_cores"
     And the response "widgets[0].definition.requests[0].profile_metrics_query.compute.aggregation" is equal to "sum"
 
-  @skip-terraform-config @skip-typescript @team:DataDog/dashboards-backend
+  @skip-terraform-config @skip-typescript @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a bar_chart widget with stacked type and no legend specified
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }}","description":"","widgets":[{"layout":{"x":0,"y":0,"width":47,"height":15},"definition":{"title":"","title_size":"16","title_align":"left","time":{},"style":{"display": {"type": "stacked"},"scaling": "relative","palette": "dog_classic"},"type":"bar_chart","requests":[{"queries":[{"data_source":"metrics","name":"query1","query":"avg:system.cpu.user{*} by {service}","aggregator":"avg"}],"formulas":[{"formula":"query1"}],"sort":{"count":10,"order_by":[{"type":"group","name":"service","order":"asc"}]},"response_format":"scalar"}]}}],"template_variables":[],"layout_type":"free","notify_list":[]}
@@ -118,7 +118,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.style.display.type" is equal to "stacked"
     And the response "widgets[0].definition.style.display" does not have field "legend"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a change widget using formulas and functions slo query
     Given there is a valid "slo" in the system
     And new "CreateDashboard" request
@@ -140,7 +140,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "hour_before(query1)"
     And the response "widgets[0].definition.requests[0].formulas[1].formula" is equal to "query1"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a formulas and functions change widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "", "title_size": "16", "title_align": "left", "time": {}, "type": "change", "requests": [ { "formulas": [ { "formula": "hour_before(query1)" }, { "formula": "query1" } ], "queries": [ { "data_source": "logs", "name": "query1", "search": { "query": "" }, "indexes": [ "*" ], "compute": { "aggregation": "count" } } ], "response_format": "scalar", "compare_to": "hour_before", "increase_good": true, "order_by": "change", "change_type": "absolute", "order_dir": "desc" } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -158,7 +158,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "hour_before(query1)"
     And the response "widgets[0].definition.requests[0].formulas[1].formula" is equal to "query1"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a formulas and functions treemap widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "", "type": "treemap", "requests": [ { "formulas": [ { "formula": "hour_before(query1)" }, { "formula": "query1" } ], "queries": [ { "data_source": "logs", "name": "query1", "search": { "query": "" }, "indexes": [ "*" ], "compute": { "aggregation": "count" } } ], "response_format": "scalar" } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -171,7 +171,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "hour_before(query1)"
     And the response "widgets[0].definition.requests[0].formulas[1].formula" is equal to "query1"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a live default_timeframe returns "OK" response
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }}", "layout_type": "ordered", "widgets": [{"definition": {"type": "note", "content": "test", "background_color": "white", "font_size": "14", "text_align": "left", "show_tick": false, "tick_pos": "50%", "tick_edge": "left"}}], "default_timeframe": {"type": "live", "unit": "hour", "value": 4}}
@@ -181,7 +181,7 @@ Feature: Dashboards
     And the response "default_timeframe.unit" is equal to "hour"
     And the response "default_timeframe.value" is equal to 4
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a query value widget using the percentile aggregator
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with QVW Percentile Aggregator", "widgets": [{"definition":{"title_size":"16","title":"","title_align":"left","precision":2,"time":{},"autoscale":true,"requests":[{"formulas":[{"formula":"query1"}],"response_format":"scalar","queries":[{"query":"p90:dist.dd.dogweb.latency{*}","data_source":"metrics","name":"query1","aggregator":"percentile"}]}],"type":"query_value"},"layout":{"y":0,"x":0,"height":2,"width":2}}]}
@@ -193,7 +193,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "query1"
     And the response "widgets[0].definition.requests[0].response_format" is equal to "scalar"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a query value widget using timeseries background
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with QVW Timeseries Background", "widgets": [{"definition":{"title_size":"16","title":"","title_align":"left","precision":2,"time":{},"autoscale":true,"requests":[{"formulas":[{"formula":"query1"}],"response_format":"scalar","queries":[{"query":"sum:my.cool.count.metric{*}","data_source":"metrics","name":"query1","aggregator":"percentile"}]}],"type":"query_value","timeseries_background":{"type":"area","yaxis":{"include_zero":true}}},"layout":{"y":0,"x":0,"height":2,"width":2}}]}
@@ -206,7 +206,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].response_format" is equal to "scalar"
     And the response "widgets[0].definition.requests[0].queries[0].query" is equal to "sum:my.cool.count.metric{*}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a query_value widget containing a description
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/query_value_widget.json"
@@ -215,7 +215,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "query_value"
     And the response "widgets[0].definition.description" is equal to "Example widget description"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a timeseries widget and an overlay request
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }}", "widgets": [{"definition": {"type": "timeseries", "requests": [{"on_right_yaxis": false, "queries": [{"data_source": "metrics", "name": "mymetric", "query": "avg:system.cpu.user{*}"}], "response_format": "timeseries", "display_type": "line"}, {"response_format": "timeseries", "queries": [{"data_source": "metrics", "name": "mymetricoverlay", "query": "avg:system.cpu.user{*}"}], "style": {"palette": "purple", "line_type": "solid", "line_width": "normal"}, "display_type": "overlay"}]}}]}
@@ -229,7 +229,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[1].queries[0].query" is equal to "avg:system.cpu.user{*}"
     And the response "widgets[0].definition.requests[1].queries[0].name" is equal to "mymetricoverlay"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a timeseries widget using formulas and functions cloud cost query
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "Example Cloud Cost Query", "title_size": "16", "title_align": "left", "type": "timeseries",  "requests": [ { "formulas": [ { "formula": "query1" } ], "queries": [ { "data_source": "cloud_cost", "name": "query1", "query": "sum:aws.cost.amortized{*} by {aws_product}.rollup(sum, monthly)" } ], "response_format": "timeseries", "style": { "palette": "dog_classic", "line_type": "solid", "line_width": "normal" }, "display_type": "bars" } ], "time": { "live_span": "week_to_date" } } } ], "layout_type": "ordered" }
@@ -242,7 +242,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "query1"
     And the response "widgets[0].definition.time.live_span" is equal to "week_to_date"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a timeseries widget using formulas and functions metrics query with combined semantic_mode
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with combined semantic_mode", "widgets": [{"definition": {"type": "timeseries", "requests": [{"queries": [{"data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*}", "semantic_mode": "combined"}], "response_format": "timeseries", "formulas": [{"formula": "query1"}], "display_type": "line"}]}}]}
@@ -254,7 +254,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].query" is equal to "avg:system.cpu.user{*}"
     And the response "widgets[0].definition.requests[0].queries[0].semantic_mode" is equal to "combined"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a timeseries widget using formulas and functions metrics query with native semantic_mode
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with native semantic_mode", "widgets": [{"definition": {"type": "timeseries", "requests": [{"queries": [{"data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*}", "semantic_mode": "native"}], "response_format": "timeseries", "formulas": [{"formula": "query1"}], "display_type": "line"}]}}]}
@@ -266,7 +266,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].query" is equal to "avg:system.cpu.user{*}"
     And the response "widgets[0].definition.requests[0].queries[0].semantic_mode" is equal to "native"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a toplist widget sorted by group
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }}","description":"","widgets":[{"layout":{"x":0,"y":0,"width":47,"height":15},"definition":{"title":"","title_size":"16","title_align":"left","time":{},"style":{"display": {"type": "stacked","legend": "inline"},"scaling": "relative","palette": "dog_classic"},"type":"toplist","requests":[{"queries":[{"data_source":"metrics","name":"query1","query":"avg:system.cpu.user{*} by {service}","aggregator":"avg"}],"formulas":[{"formula":"query1"}],"sort":{"count":10,"order_by":[{"type":"group","name":"service","order":"asc"}]},"response_format":"scalar"}]}}],"template_variables":[],"layout_type":"free","notify_list":[]}
@@ -277,7 +277,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "group"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].name" is equal to "service"
 
-  @skip-terraform-config @skip-typescript @team:DataDog/dashboards-backend
+  @skip-terraform-config @skip-typescript @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with a toplist widget with stacked type and no legend specified
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }}","description":"","widgets":[{"layout":{"x":0,"y":0,"width":47,"height":15},"definition":{"title":"","title_size":"16","title_align":"left","time":{},"style":{"display": {"type": "stacked"},"scaling": "relative","palette": "dog_classic"},"type":"toplist","requests":[{"queries":[{"data_source":"metrics","name":"query1","query":"avg:system.cpu.user{*} by {service}","aggregator":"avg"}],"formulas":[{"formula":"query1"}],"sort":{"count":10,"order_by":[{"type":"group","name":"service","order":"asc"}]},"response_format":"scalar"}]}}],"template_variables":[],"layout_type":"free","notify_list":[]}
@@ -290,7 +290,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.style.display.type" is equal to "stacked"
     And the response "widgets[0].definition.style.display" does not have field "legend"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with alert_graph widget
     Given there is a valid "monitor" in the system
     And new "CreateDashboard" request
@@ -301,7 +301,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.viz_type" is equal to "timeseries"
     And the response "widgets[0].definition.alert_id" is equal to "{{ monitor.id }}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with alert_value widget
     Given there is a valid "monitor" in the system
     And new "CreateDashboard" request
@@ -311,7 +311,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "alert_value"
     And the response "widgets[0].definition.alert_id" is equal to "{{ monitor.id }}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with an audit logs query
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with Audit Logs Query", "widgets": [{"definition": {"type": "timeseries","requests": [{"response_format": "timeseries","queries": [{"search": {"query": ""},"data_source": "audit","compute": {"aggregation": "count"},"name": "query1","indexes": ["*"]}]}]},"layout": {"x": 2,"y": 0,"width": 4,"height": 2}}]}
@@ -322,7 +322,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].response_format" is equal to "timeseries"
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "audit"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with apm dependency stats widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "query_table", "requests": [ { "response_format": "scalar", "queries": [ { "primary_tag_value": "edge-eu1.prod.dog", "stat": "avg_duration", "resource_name": "DELETE FROM monitor_history.monitor_state_change_history WHERE org_id = ? AND monitor_id IN ? AND group = ?", "name": "query1", "service": "cassandra", "data_source": "apm_dependency_stats", "env": "ci", "primary_tag_name": "datacenter", "operation_name": "cassandra.query" } ] } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -339,7 +339,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].primary_tag_name" is equal to "datacenter"
     And the response "widgets[0].definition.requests[0].queries[0].operation_name" is equal to "cassandra.query"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with apm metrics widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "query_table", "requests": [ { "response_format": "scalar", "queries": [ { "stat": "hits", "name": "query1", "service": "web-store", "data_source": "apm_metrics", "query_filter": "env:prod", "group_by": ["resource_name"] } ] } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -353,7 +353,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "apm_metrics"
     And the response "widgets[0].definition.requests[0].queries[0].query_filter" is equal to "env:prod"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with apm resource stats widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "query_table", "requests": [ { "response_format": "scalar", "queries": [ { "primary_tag_value": "edge-eu1.prod.dog", "stat": "hits", "name": "query1", "service": "cassandra", "data_source": "apm_resource_stats", "env": "ci", "primary_tag_name": "datacenter", "operation_name": "cassandra.query", "group_by": ["resource_name"] } ] } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -370,7 +370,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].primary_tag_name" is equal to "datacenter"
     And the response "widgets[0].definition.requests[0].queries[0].operation_name" is equal to "cassandra.query"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with apm_issue_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"apm_issue_stream","query_string":""},"response_format":"event_list"}]}}]}
@@ -381,7 +381,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].columns[0].width" is equal to "auto"
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "apm_issue_stream"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with bar_chart widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/bar_chart_widget.json"
@@ -392,7 +392,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with bar_chart widget sorted by group
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }}","description":"","widgets":[{"layout":{"x":0,"y":0,"width":47,"height":15},"definition":{"title":"","title_size":"16","title_align":"left","time":{},"style":{"display": {"type": "stacked","legend": "inline"},"scaling": "relative","palette": "dog_classic"},"type":"bar_chart","requests":[{"queries":[{"data_source":"metrics","name":"query1","query":"avg:system.cpu.user{*} by {service}","aggregator":"avg"}],"formulas":[{"formula":"query1"}],"sort":{"count":10,"order_by":[{"type":"group","name":"service","order":"asc"}]},"response_format":"scalar"}]}}],"template_variables":[],"layout_type":"free","notify_list":[]}
@@ -403,7 +403,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "group"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].name" is equal to "service"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with case_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type":"ordered","title":"{{ unique }} with case_stream list_stream widget","widgets":[{"definition":{"type":"list_stream","requests":[{"columns":[{"width":"auto","field":"created_at"}],"query":{"data_source":"case_stream","query_string":"*","sort":{"column":"created_at","order":"desc"}},"response_format":"event_list"}]}}]}
@@ -414,7 +414,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.sort.column" is equal to "created_at"
     And the response "widgets[0].definition.requests[0].query.sort.order" is equal to "desc"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with check_status widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/check_status_widget.json"
@@ -424,7 +424,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.check" is equal to "datadog.agent.up"
     And the response "widgets[0].definition.grouping" is equal to "check"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with ci_test_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"ci_test_stream","query_string":"test_level:suite"},"response_format":"event_list"}]}}]}
@@ -434,7 +434,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "ci_test_stream"
     And the response "widgets[0].definition.requests[0].query.query_string" is equal to "test_level:suite"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with distribution widget and apm stats data
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "distribution", "requests": [{ "apm_stats_query": { "env": "prod", "service": "cassandra", "name": "cassandra.query", "primary_tag": "datacenter:dc1", "row_type": "service" }}] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -446,7 +446,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].apm_stats_query.service" is equal to "cassandra"
     And the response "widgets[0].definition.requests[0].apm_stats_query.name" is equal to "cassandra.query"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with distribution widget with markers and num_buckets
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "distribution", "xaxis": { "scale": "linear", "min": "auto", "max": "auto", "include_zero": true, "num_buckets": 55 }, "yaxis": { "scale": "linear", "min": "auto", "max": "auto", "include_zero": true }, "markers": [{ "display_type": "percentile", "value": "50" }, { "display_type": "percentile", "value": "99" }, { "display_type": "percentile", "value": "90" }], "requests": [{ "response_format": "scalar", "queries": [{ "data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*} by {service}", "aggregator": "avg" }] }] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -455,7 +455,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.xaxis.num_buckets" is equal to 55
     And the response "widgets[0].definition.markers" is equal to [{"display_type": "percentile", "value": "50"}, {"display_type": "percentile", "value": "99"}, {"display_type": "percentile", "value": "90"}]
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with event_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered","title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns": [{"width": "auto","field": "timestamp"}],"query": {"data_source": "event_stream","query_string": "","event_size": "l"},"response_format": "event_list"}]}}]}
@@ -466,7 +466,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "event_stream"
     And the response "widgets[0].definition.requests[0].query.event_size" is equal to "l"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with event_stream widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/event_stream_widget.json"
@@ -475,7 +475,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "event_stream"
     And the response "widgets[0].definition.query" is equal to "example-query"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with event_timeline widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/event_timeline_widget.json"
@@ -484,7 +484,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "event_timeline"
     And the response "widgets[0].definition.query" is equal to "status:error priority:all"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with formula and function distribution widget
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }}", "widgets": [{"layout": {"x": 0, "y": 0, "width": 47, "height": 15}, "definition": {"title": "", "title_size": "16", "title_align": "left", "time": {}, "type": "distribution", "requests": [{"response_format": "scalar", "queries": [{"data_source": "logs", "name": "query1", "search": {"query": ""}, "indexes": ["*"], "compute": {"aggregation": "avg", "metric": "@duration"}, "group_by": [{"facet": "service", "limit": 1000, "sort": {"aggregation": "count", "order": "desc"}}], "storage": "hot"}]}]}}], "template_variables": [], "layout_type": "free", "notify_list": []}
@@ -498,7 +498,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].compute.metric" is equal to "@duration"
     And the response "widgets[0].definition.requests[0].queries[0].group_by[0].facet" is equal to "service"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with formula and function heatmap widget
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }}", "widgets": [{"layout": {"x": 0, "y": 0, "width": 47, "height": 15}, "definition": {"title": "", "title_size": "16", "title_align": "left", "time": {}, "type": "heatmap", "requests": [{"response_format": "timeseries", "queries": [{"data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*}"}], "formulas": [{"formula": "query1"}], "style": {"palette": "dog_classic"}}]}}], "template_variables": [], "layout_type": "free", "notify_list": []}
@@ -509,7 +509,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "metrics"
     And the response "widgets[0].definition.requests[0].style.palette" is equal to "dog_classic"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with formulas and functions events query using facet group by
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }} with events facet group_by", "widgets": [{"definition": {"type": "timeseries", "requests": [{"response_format": "timeseries", "queries": [{"data_source": "events", "name": "query1", "search": {"query": ""}, "compute": {"aggregation": "count"}, "group_by": [{"facet": "service", "limit": 10}]}]}]}, "layout": {"x": 0, "y": 0, "width": 4, "height": 2}}], "layout_type": "ordered"}
@@ -519,7 +519,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].group_by[0].facet" is equal to "service"
     And the response "widgets[0].definition.requests[0].queries[0].group_by[0].limit" is equal to 10
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with formulas and functions events query using flat group by fields
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }} with events flat group_by fields", "widgets": [{"definition": {"type": "timeseries", "requests": [{"response_format": "timeseries", "queries": [{"data_source": "events", "name": "query1", "search": {"query": ""}, "compute": {"aggregation": "count"}, "group_by": {"fields": ["service", "host"], "limit": 10}}]}]}, "layout": {"x": 0, "y": 0, "width": 4, "height": 2}}], "layout_type": "ordered"}
@@ -530,7 +530,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].group_by.fields[1]" is equal to "host"
     And the response "widgets[0].definition.requests[0].queries[0].group_by.limit" is equal to 10
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with formulas and functions scatterplot widget
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "id": 5346764334358972, "definition": { "title": "", "title_size": "16", "title_align": "left", "type": "scatterplot", "requests": { "table": { "formulas": [ { "formula": "query1", "dimension": "x", "alias": "my-query1" }, { "formula": "query2", "dimension": "y", "alias": "my-query2" } ], "queries": [ { "data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*} by {service}", "aggregator": "avg" }, { "data_source": "metrics", "name": "query2", "query": "avg:system.mem.used{*} by {service}", "aggregator": "avg" } ], "response_format": "scalar" } } }, "layout": { "x": 0, "y": 0, "width": 4, "height": 2 } } ], "layout_type": "ordered" }
@@ -552,7 +552,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests.table.queries[1].aggregator" is equal to "avg"
     And the response "widgets[0].definition.requests.table.response_format" is equal to "scalar"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with free_text widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/free_text_widget.json"
@@ -562,7 +562,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.text" is equal to "Example free text"
     And the response "widgets[0].definition.color" is equal to "#4d4d4d"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with funnel widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with funnel widget","widgets": [{"definition": {"type": "funnel","requests": [{"query":{"data_source":"rum","query_string":"","steps":[]},"request_type":"funnel"}]}}]}
@@ -573,7 +573,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "rum"
     And the response "widgets[0].definition.requests[0].request_type" is equal to "funnel"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with geomap widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/geomap_widget.json"
@@ -584,7 +584,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with heatmap widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/heatmap_widget.json"
@@ -593,7 +593,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "heatmap"
     And the response "widgets[0].definition.requests[0].q" is equal to "avg:system.cpu.user{*} by {service}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with heatmap widget with markers and num_buckets
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [{"definition": { "title": "", "title_size": "16", "title_align": "left", "type": "heatmap", "xaxis": { "num_buckets": 75 }, "yaxis": { "scale": "linear", "min": "auto", "max": "auto", "include_zero": true }, "markers": [{ "display_type": "percentile", "value": "50" }, { "display_type": "percentile", "value": "99" }], "requests": [{ "request_type": "histogram", "query": { "data_source": "metrics", "name": "query1", "query": "histogram:trace.servlet.request{*}"} }] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } }], "layout_type": "ordered" }
@@ -602,7 +602,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.xaxis.num_buckets" is equal to 75
     And the response "widgets[0].definition.markers" is equal to [{"display_type": "percentile", "value": "50"}, {"display_type": "percentile", "value": "99"}]
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with hostmap DDSQL widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/hostmap_ddsql_widget.json"
@@ -611,7 +611,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "hostmap"
     And the response "widgets[0].definition.requests" is equal to {"request_type": "data_projection", "limit": 1000, "query": {"data_source": "dataset", "dataset_provider": "ddsql_query", "dataset_id": "abc-123-def"}, "projection": {"type": "hostmap", "dimensions": [{"column": "entity_id", "dimension": "node"}, {"column": "parent_id", "dimension": "group"}, {"column": "cpu_usage", "dimension": "fill"}]}, "style": {"palette": "green_to_orange", "palette_flip": false}}
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with hostmap infra widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/hostmap_infra_widget.json"
@@ -620,7 +620,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "hostmap"
     And the response "widgets[0].definition.requests" is equal to {"request_type": "infrastructure_hostmap", "node_type": "host", "filter": "env:prod", "group_by": [{"column": "tags", "key": "service"}], "enrichments": [{"response_format": "scalar", "queries": [{"data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{*} by {host}"}], "formulas": [{"formula": "query1", "dimension": "fill"}]}], "style": {"palette": "green_to_orange", "palette_flip": false}}
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with hostmap widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/hostmap_widget.json"
@@ -629,7 +629,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "hostmap"
     And the response "widgets[0].definition.requests.fill.q" is equal to "avg:system.cpu.user{*} by {host}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with iframe widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/iframe_widget.json"
@@ -638,7 +638,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "iframe"
     And the response "widgets[0].definition.url" is equal to "https://docs.datadoghq.com/api/latest/"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with image widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/image_widget.json"
@@ -647,14 +647,14 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "image"
     And the response "widgets[0].definition.url" is equal to "https://example.com/image.png"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with invalid team tags returns "Bad Request" response
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "", "title_size": "16", "title_align": "left", "time": {}, "type": "change", "requests": [ { "formulas": [ { "formula": "hour_before(query1)" }, { "formula": "query1" } ], "queries": [ { "data_source": "logs", "name": "query1", "search": { "query": "" }, "indexes": [ "*" ], "compute": { "aggregation": "count" } } ], "response_format": "scalar", "compare_to": "hour_before", "increase_good": true, "order_by": "change", "change_type": "absolute", "order_dir": "desc" } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "tags": ["tm:foobar"], "layout_type": "ordered" }
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"apm_issue_stream","query_string":""},"response_format":"event_list"}]}}]}
@@ -663,7 +663,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "list_stream"
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "apm_issue_stream"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with list_stream widget with a valid sort parameter ASC
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered","title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns": [{"width": "auto","field": "timestamp"}],"query": {"data_source": "event_stream","query_string": "","event_size": "l", "sort": {"column": "timestamp", "order": "asc"}},"response_format": "event_list"}]}}]}
@@ -676,7 +676,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.sort.column" is equal to "timestamp"
     And the response "widgets[0].definition.requests[0].query.sort.order" is equal to "asc"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with list_stream widget with a valid sort parameter DESC
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered","title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns": [{"width": "auto","field": "timestamp"}],"query": {"data_source": "event_stream","query_string": "","event_size": "l", "sort": {"column": "timestamp", "order": "desc"}},"response_format": "event_list"}]}}]}
@@ -689,7 +689,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.sort.column" is equal to "timestamp"
     And the response "widgets[0].definition.requests[0].query.sort.order" is equal to "desc"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with llm_observability_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type":"ordered","title":"{{ unique }} with list_stream widget","widgets":[{"definition":{"type":"list_stream","requests":[{"response_format":"event_list","query":{"data_source":"llm_observability_stream","query_string":"@event_type:span @parent_id:undefined","indexes":[]},"columns":[{"field":"@status","width":"compact"},{"field":"@content.prompt","width":"auto"},{"field":"@content.response.content","width":"auto"},{"field":"timestamp","width":"auto"},{"field":"@ml_app","width":"auto"},{"field":"service","width":"auto"},{"field":"@meta.evaluations.quality","width":"auto"},{"field":"@meta.evaluations.security","width":"auto"},{"field":"@duration","width":"auto"}]}]}}]}
@@ -697,7 +697,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "llm_observability_stream"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with log_stream widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/log_stream_widget.json"
@@ -707,7 +707,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.query" is equal to ""
     And the response "widgets[0].definition.indexes[0]" is equal to "main"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with logs query table widget and storage parameter
     Given new "CreateDashboard" request
     And body with value {"layout_type":"ordered","title":"{{ unique }} with query table widget and storage parameter","widgets":[{"definition":{"type":"query_table","requests":[{"queries":[{"data_source":"logs","name":"query1","search":{"query":""},"indexes":["*"],"compute":{"aggregation":"count"},"storage":"online_archives"}],"formulas":[{"conditional_formats":[],"cell_display_mode":"bar","formula":"query1"}],"sort":{"count":50, "order_by":[{"type":"formula","index":0,"order":"desc"}]},"response_format":"scalar"}]}}]}
@@ -720,7 +720,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with logs_pattern_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"},{"width":"auto","field":"message"}],"query":{"data_source":"logs_pattern_stream","query_string":"","clustering_pattern_field_path":"message","group_by":[{"facet":"service"}]},  "response_format":"event_list"}]}}]}
@@ -730,7 +730,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.group_by[0].facet" is equal to "service"
     And the response "widgets[0].definition.requests[0].query.clustering_pattern_field_path" is equal to "message"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with logs_stream list_stream widget and storage parameter
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"logs_stream","query_string":"", "storage": "hot"},"response_format":"event_list"}]}}]}
@@ -740,7 +740,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "logs_stream"
     And the response "widgets[0].definition.requests[0].query.storage" is equal to "hot"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with logs_transaction_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"logs_transaction_stream","query_string":"","group_by":[{"facet":"service"}],"compute":[{"facet":"service","aggregation":"count"}]},"response_format":"event_list"}]}}]}
@@ -751,7 +751,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.compute[0].facet" is equal to "service"
     And the response "widgets[0].definition.requests[0].query.compute[0].aggregation" is equal to "count"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with logs_transaction_stream list_stream widget and version
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"logs_transaction_stream","query_string":"","group_by":[{"facet":"service"}],"compute":[{"facet":"service","aggregation":"count"}],"version":"sequential_query"},"response_format":"event_list"}]}}]}
@@ -760,7 +760,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "logs_transaction_stream"
     And the response "widgets[0].definition.requests[0].query.version" is equal to "sequential_query"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with manage_status widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/manage_status_widget.json"
@@ -768,7 +768,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "widgets[0].definition.type" is equal to "manage_status"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with manage_status widget and show_priority parameter
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/manage_status_widget_priority_sort.json"
@@ -778,7 +778,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.show_priority" is false
     And the response "widgets[0].definition.sort" is equal to "priority,asc"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with note widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/note_widget.json"
@@ -787,7 +787,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "note"
     And the response "widgets[0].definition.content" is equal to "# Example Note"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with point_plot widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/point_plot_widget.json"
@@ -799,7 +799,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].projection.dimensions[0].dimension" is equal to "group"
     And the response "widgets[0].definition.requests[0].projection.dimensions[1].dimension" is equal to "y"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with powerpack widget
     Given new "CreateDashboard" request
     And there is a valid "powerpack" in the system
@@ -809,7 +809,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "powerpack"
     And the response "widgets[0].definition.powerpack_id" has the same value as "powerpack.data.id"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with query_table widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/query_table_widget.json"
@@ -820,7 +820,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with query_table widget and cell_display_mode is trend
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/query_table_widget_cell_display_mode_trend.json"
@@ -831,7 +831,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].cell_display_mode_options.trend_type" is equal to "line"
     And the response "widgets[0].definition.requests[0].formulas[0].cell_display_mode_options.y_scale" is equal to "shared"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with query_table widget and text formatting
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/query_table_widget_text_formatting.json"
@@ -847,7 +847,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].text_formats[0][1].custom_bg_color" is equal to "#632ca6"
     And the response "widgets[0].definition.requests[0].text_formats[5][2].custom_fg_color" is equal to "#632ca6"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with query_value widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/query_value_widget.json"
@@ -856,7 +856,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "query_value"
     And the response "widgets[0].definition.requests[0].queries[0].query" is equal to "avg:system.cpu.user{*}"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with rum_issue_stream list_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"}],"query":{"data_source":"rum_issue_stream","query_string":""},"response_format":"event_list"}]}}]}
@@ -865,7 +865,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "list_stream"
     And the response "widgets[0].definition.requests[0].response_format" is equal to "event_list"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with run-workflow widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/run_workflow_widget.json"
@@ -875,7 +875,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.workflow_id" is equal to "2e055f16-8b6a-4cdd-b452-17a34c44b160"
     And the response "widgets[0].definition.inputs[0]" is equal to {"name": "environment", "value": "$env.value"}
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with sankey widget and RUM data source
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/sankey_rum_widget.json"
@@ -887,7 +887,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.mode" is equal to "source"
     And the response "widgets[0].definition.requests[0].request_type" is equal to "sankey"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with sankey widget and network data source
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/sankey_network_widget.json"
@@ -900,7 +900,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.limit" is equal to 100
     And the response "widgets[0].definition.requests[0].request_type" is equal to "netflow_sankey"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with sankey widget and product analytics data source
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/sankey_product_analytics_widget.json"
@@ -912,7 +912,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.mode" is equal to "source"
     And the response "widgets[0].definition.requests[0].request_type" is equal to "sankey"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with scatterplot widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/scatterplot_widget.json"
@@ -920,7 +920,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "widgets[0].definition.type" is equal to "scatterplot"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with servicemap widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/servicemap_widget.json"
@@ -929,7 +929,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "servicemap"
     And the response "widgets[0].definition.filters" is equal to ["env:none","environment:*"]
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with slo list widget
     Given there is a valid "slo" in the system
     And new "CreateDashboard" request
@@ -940,7 +940,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.query_string" is equal to "env:prod AND service:my-app"
     And the response "widgets[0].definition.requests[0].query.limit" is equal to 75
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with slo list widget with sort
     Given there is a valid "slo" in the system
     And new "CreateDashboard" request
@@ -953,7 +953,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.sort[0].column" is equal to "status.sli"
     And the response "widgets[0].definition.requests[0].query.sort[0].order" is equal to "asc"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with slo widget
     Given there is a valid "slo" in the system
     And new "CreateDashboard" request
@@ -964,7 +964,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.slo_id" is equal to "{{ slo.data[0].id }}"
     And the response "widgets[0].definition.additional_query_filters" is equal to "!host:excluded_host"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with split graph widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/split_graph_widget.json"
@@ -990,7 +990,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.size" is equal to "md"
     And the response "widgets[0].definition.has_uniform_y_axes" is equal to true
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with sunburst widget and metrics data
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "", "title_size": "16", "title_align": "left", "type": "sunburst", "requests": [ { "response_format": "scalar", "formulas": [ { "formula": "query1" } ], "queries": [ { "query": "sum:system.mem.used{*} by {service}", "data_source": "metrics", "name": "query1", "aggregator": "sum" } ], "style": { "palette": "dog_classic" } } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "layout_type": "ordered" }
@@ -1004,7 +1004,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].formula" is equal to "query1"
     And the response "widgets[0].definition.requests[0].style.palette" is equal to "dog_classic"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with team tags returns "OK" response
     Given new "CreateDashboard" request
     And body with value { "title": "{{ unique }}", "widgets": [ { "definition": { "title": "", "title_size": "16", "title_align": "left", "time": {}, "type": "change", "requests": [ { "formulas": [ { "formula": "hour_before(query1)" }, { "formula": "query1" } ], "queries": [ { "data_source": "logs", "name": "query1", "search": { "query": "" }, "indexes": [ "*" ], "compute": { "aggregation": "count" } } ], "response_format": "scalar", "compare_to": "hour_before", "increase_good": true, "order_by": "change", "change_type": "absolute", "order_dir": "desc" } ] }, "layout": { "x": 0, "y": 0, "width": 4, "height": 4 } } ], "tags": ["team:foobar"], "layout_type": "ordered" }
@@ -1013,14 +1013,14 @@ Feature: Dashboards
     And the response "title" is equal to "{{ unique }}"
     And the response "tags" array contains value "team:foobar"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable defaults and default returns "Bad Request" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "default": "my-host", "defaults": ["my-host"], "name": "host1", "prefix": "host"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable defaults returns "OK" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "defaults": ["my-host"], "name": "host1", "prefix": "host"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
@@ -1030,21 +1030,21 @@ Feature: Dashboards
     And the response "template_variables[0].available_values[0]" is equal to "my-host"
     And the response "template_variables[0].defaults[0]" is equal to "my-host"
 
-  @skip-validation @team:DataDog/dashboards-backend
+  @skip-validation @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable defaults whose value has no length returns "Bad Request" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "defaults": [""], "name": "host1", "prefix": "host"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable presets using values and value returns "Bad Request" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variable_presets": [{"name": "my saved view", "template_variables": [{"name": "datacenter", "value": "*", "values": [ "*" ]}]}], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "defaults": ["my-host"], "name": "host1", "prefix": "host"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable presets using values returns "OK" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variable_presets": [{"name": "my saved view", "template_variables": [{"name": "datacenter", "values": ["*", "my-host"]}]}], "template_variables": [{"available_values": ["my-host", "host1", "host2"], "defaults": ["my-host"], "name": "host1", "prefix": "host"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
@@ -1054,7 +1054,7 @@ Feature: Dashboards
     And the response "template_variable_presets[0].template_variables[0].name" is equal to "datacenter"
     And the response "template_variable_presets[0].template_variables[0].values[0]" is equal to "*"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with template variable type field returns "OK" response
     Given new "CreateDashboard" request
     And body with value {"description": null, "layout_type": "ordered", "notify_list": [], "reflow_type": "auto", "restricted_roles": [], "template_variables": [{"available_values": ["service", "datacenter", "env"], "defaults": ["service", "datacenter"], "name": "group_by_var", "type": "group"}], "title": "", "widgets": [{"definition": {"requests": {"fill": {"q": "avg:system.cpu.user{*}"}}, "type": "hostmap"}}]}
@@ -1065,7 +1065,7 @@ Feature: Dashboards
     And the response "template_variables[0].defaults[0]" is equal to "service"
     And the response "template_variables[0].type" is equal to "group"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget and formula style attributes
     Given new "CreateDashboard" request
     And body with value {"title": "{{ unique }} with formula style","widgets": [{"definition": {"title": "styled timeseries","show_legend": true,"legend_layout": "auto","legend_columns": ["avg","min","max","value","sum"],"time": {},"type": "timeseries","requests": [{"formulas": [{"formula": "query1","style": {"palette_index": 4,"palette": "classic"}}],"queries": [{"query": "avg:system.cpu.user{*}","data_source": "metrics","name": "query1"}],"response_format": "timeseries","style": {"palette": "dog_classic","line_type": "solid","line_width": "normal"},"display_type": "line"}]}}],"layout_type": "ordered","reflow_type": "auto"}
@@ -1075,7 +1075,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].style.palette" is equal to "classic"
     And the response "widgets[0].definition.requests[0].formulas[0].style.palette_index" is equal to 4
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget containing style attributes
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with timeseries widget","widgets": [{"definition": {"type": "timeseries","requests": [{"q": "sum:trace.test.errors{env:prod,service:datadog-api-spec} by {resource_name}.as_count()","on_right_yaxis": false,"style": {"palette": "warm","line_type": "solid","line_width": "normal"},"display_type": "bars"}]}}]}
@@ -1086,7 +1086,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].display_type" is equal to "bars"
     And the response "widgets[0].definition.requests[0].q" is equal to "sum:trace.test.errors{env:prod,service:datadog-api-spec} by {resource_name}.as_count()"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget using has_value_labels
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with has_value_labels","widgets": [{"definition": {"type": "timeseries","requests": [{"q": "avg:system.cpu.user{*} by {host}","style": {"palette": "dog_classic","line_type": "solid","line_width": "normal","has_value_labels": true},"display_type": "line"}]}}]}
@@ -1097,7 +1097,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].style.line_type" is equal to "solid"
     And the response "widgets[0].definition.requests[0].style.line_width" is equal to "normal"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget using order_by tags
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with order_by tags","widgets": [{"definition": {"type": "timeseries","requests": [{"q": "avg:system.cpu.user{*} by {host}","style": {"palette": "dog_classic","order_by": "tags"},"display_type": "line"}]}}]}
@@ -1106,7 +1106,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].style.order_by" is equal to "tags"
     And the response "widgets[0].definition.requests[0].style.palette" is equal to "dog_classic"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget using order_by values
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with order_by values","widgets": [{"definition": {"type": "timeseries","requests": [{"q": "avg:system.cpu.user{*} by {host}","style": {"palette": "warm","order_by": "values"},"display_type": "line"}]}}]}
@@ -1115,7 +1115,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].style.order_by" is equal to "values"
     And the response "widgets[0].definition.requests[0].style.palette" is equal to "warm"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget with custom_unit
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/timeseries_widget_with_custom_unit.json"
@@ -1128,7 +1128,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].formulas[0].number_format.unit.unit_name" is equal to "fraction"
     And the response "widgets[0].definition.description" is equal to "Example widget description"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with timeseries widget without order_by for backward compatibility
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} without order_by","widgets": [{"definition": {"type": "timeseries","requests": [{"q": "avg:system.cpu.user{*} by {host}","style": {"palette": "dog_classic","line_type": "solid","line_width": "normal"},"display_type": "line"}]}}]}
@@ -1138,7 +1138,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].style.line_type" is equal to "solid"
     And the response "widgets[0].definition.requests[0].style.line_width" is equal to "normal"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with toplist widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/toplist_widget.json"
@@ -1149,7 +1149,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with topology_map data_streams widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/topology_map_widget_data_streams.json"
@@ -1162,7 +1162,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.filters" is equal to ["env:prod"]
     And the response "widgets[0].definition.requests[0].query.query_string" is equal to "service:myservice"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with topology_map widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/topology_map_widget.json"
@@ -1174,7 +1174,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].query.service" is equal to ""
     And the response "widgets[0].definition.requests[0].query.filters" is equal to ["env:none","environment:*"]
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with trace_service widget
     Given new "CreateDashboard" request
     And body from file "dashboards_json_payload/trace_service_widget.json"
@@ -1183,7 +1183,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "trace_service"
     And the response "widgets[0].definition.env" is equal to "none"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new dashboard with trace_stream widget
     Given new "CreateDashboard" request
     And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"},{"width":"auto","field":"service"}],"query":{"data_source":"trace_stream","query_string":""},"response_format":"event_list"}]}}]}
@@ -1192,7 +1192,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.type" is equal to "list_stream"
     And the response "widgets[0].definition.requests[0].query.data_source" is equal to "trace_stream"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with ci_pipelines data source
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with ci_pipelines datasource","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"ci_pipelines","name":"query1","search":{"query":"ci_level:job"},"indexes":["*"],"compute":{"aggregation":"count", "metric": "@ci.queue_time"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1201,7 +1201,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "ci_pipelines"
     And the response "widgets[0].definition.requests[0].queries[0].search.query" is equal to "ci_level:job"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with ci_tests data source
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with ci_tests datasource","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"ci_tests","name":"query1","search":{"query":"test_level:test"},"indexes":["*"],"compute":{"aggregation":"count"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1210,7 +1210,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "ci_tests"
     And the response "widgets[0].definition.requests[0].queries[0].search.query" is equal to "test_level:test"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with incident_analytics data source
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with incident_analytics datasource","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"incident_analytics","name":"query1","search":{"query":"test_level:test"},"indexes":["*"],"compute":{"aggregation":"count"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1219,7 +1219,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "incident_analytics"
     And the response "widgets[0].definition.requests[0].queries[0].search.query" is equal to "test_level:test"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with legacy live span time format
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with legacy live span time","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{"live_span": "5m", "hide_incomplete_cost_data": true},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"ci_pipelines","name":"query1","search":{"query":"ci_level:job"},"indexes":["*"],"compute":{"aggregation":"count", "metric": "@ci.queue_time"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1228,7 +1228,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.time.live_span" is equal to "5m"
     And the response "widgets[0].definition.time.hide_incomplete_cost_data" is equal to true
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with new fixed span time format
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with new fixed span time","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{"type": "fixed", "from": 1712080128, "to": 1712083128, "hide_incomplete_cost_data": true},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"ci_pipelines","name":"query1","search":{"query":"ci_level:job"},"indexes":["*"],"compute":{"aggregation":"count", "metric": "@ci.queue_time"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1239,7 +1239,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.time.to" is equal to 1712083128
     And the response "widgets[0].definition.time.hide_incomplete_cost_data" is equal to true
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with new live span time format
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with new live span time","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{"type": "live", "unit": "minute", "value": 8, "hide_incomplete_cost_data": true},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"ci_pipelines","name":"query1","search":{"query":"ci_level:job"},"indexes":["*"],"compute":{"aggregation":"count", "metric": "@ci.queue_time"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1250,7 +1250,7 @@ Feature: Dashboards
     And the response "widgets[0].definition.time.value" is equal to 8
     And the response "widgets[0].definition.time.hide_incomplete_cost_data" is equal to true
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new timeseries widget with product_analytics data source
     Given new "CreateDashboard" request
     And body with value {"title":"{{ unique }} with product_analytics datasource","widgets":[{"definition":{"title":"","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"time":{},"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"product_analytics","name":"query1","search":{"query":"test_level:test"},"indexes":["*"],"compute":{"aggregation":"count"}}],"response_format":"timeseries","style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}]}}],"layout_type":"ordered","reflow_type":"auto"}
@@ -1259,21 +1259,21 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].queries[0].data_source" is equal to "product_analytics"
     And the response "widgets[0].definition.requests[0].queries[0].search.query" is equal to "test_level:test"
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a shared dashboard returns "Bad Request" response
     Given new "CreatePublicDashboard" request
     And body with value {"dashboard_id": "123-abc-456", "dashboard_type": "custom_timeboard", "embeddable_domains": ["https://domain.atlassian.net/", "http://myserver.com/"], "expiration": null, "global_time": {"live_span": "1h"}, "global_time_selectable_enabled": null, "invitees": [{"access_expiration": "2030-01-01T12:00:00.00Z", "email": "test@datadoghq.com"}, {"access_expiration": null, "email": "test2@datadoghq.com"}], "selectable_template_vars": [{"default_value": "*", "name": "exampleVar", "prefix": "test", "visible_tags": ["selectableValue1", "selectableValue2"]}], "share_list": ["test@datadoghq.com", "test2@email.com"], "share_type": "open", "status": "active", "viewing_preferences": {"theme": "system"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Create a shared dashboard returns "Dashboard Not Found" response
     Given new "CreatePublicDashboard" request
     And body with value {"dashboard_id": "abc-123-def", "dashboard_type": "custom_timeboard", "share_type": "open", "global_time": {"live_span": "1h"}}
     When the request is sent
     Then the response status is 404 Dashboard Not Found
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Create a shared dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "CreatePublicDashboard" request
@@ -1283,7 +1283,7 @@ Feature: Dashboards
     And the response "dashboard_id" has the same value as "dashboard.id"
     And the response "dashboard_type" is equal to "custom_timeboard"
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Create a shared dashboard with a group template variable returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "CreatePublicDashboard" request
@@ -1295,14 +1295,14 @@ Feature: Dashboards
     And the response "selectable_template_vars[0].name" is equal to "group_by_var"
     And the response "selectable_template_vars[0].type" is equal to "group"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete a dashboard returns "Dashboards Not Found" response
     Given new "DeleteDashboard" request
     And request contains "dashboard_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Dashboards Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete a dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "DeleteDashboard" request
@@ -1311,21 +1311,21 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "deleted_dashboard_id" is equal to "{{ dashboard.id }}"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete dashboards returns "Bad Request" response
     Given new "DeleteDashboards" request
     And body with value {"data": [{"id": "123-abc-456", "type": "dashboard"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete dashboards returns "Dashboards Not Found" response
     Given new "DeleteDashboards" request
     And body with value {"data": [{"id": "123-abc-456", "type": "dashboard"}]}
     When the request is sent
     Then the response status is 404 Dashboards Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete dashboards returns "No Content" response
     Given there is a valid "dashboard" in the system
     And new "DeleteDashboards" request
@@ -1333,14 +1333,14 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Get a dashboard returns "Item Not Found" response
     Given new "GetDashboard" request
     And request contains "dashboard_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get a dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "GetDashboard" request
@@ -1350,7 +1350,7 @@ Feature: Dashboards
     And the response "description" is equal to null
     And the response "experience_type" is equal to "default"
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get a dashboard returns 'author_name'
     Given there is a valid "dashboard" in the system
     And new "GetDashboard" request
@@ -1359,7 +1359,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "author_name" is equal to "Frog Account"
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Get a shared dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And there is a valid "shared_dashboard" in the system
@@ -1370,14 +1370,14 @@ Feature: Dashboards
     And the response "dashboard_id" has the same value as "dashboard.id"
     And the response "token" has the same value as "shared_dashboard.token"
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a shared dashboard returns "Shared Dashboard Not Found" response
     Given new "GetPublicDashboard" request
     And request contains "token" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Shared Dashboard Not Found
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get all dashboards returns "OK" response
     Given new "ListDashboards" request
     And there is a valid "dashboard" in the system
@@ -1387,7 +1387,7 @@ Feature: Dashboards
     And the response "dashboards[0].title" has the same value as "dashboard.title"
     And the response "dashboards[0].id" has the same value as "dashboard.id"
 
-  @replay-only @skip-validation @team:DataDog/dashboards-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/dashboards-backend @with-pagination
   Scenario: Get all dashboards returns "OK" response with pagination
     Given new "ListDashboards" request
     And request contains "count" parameter with value 2
@@ -1395,14 +1395,14 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get all invitations for a shared dashboard returns "Not Found" response
     Given new "GetPublicDashboardInvitations" request
     And request contains "token" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Get all invitations for a shared dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And there is a valid "shared_dashboard" in the system
@@ -1412,7 +1412,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get deleted dashboards returns "OK" response
     Given new "ListDashboards" request
     And there is a valid "dashboard" in the system
@@ -1423,21 +1423,21 @@ Feature: Dashboards
     And the response "dashboards[0].title" has the same value as "dashboard.title"
     And the response "dashboards[0].id" has the same value as "dashboard.id"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Restore deleted dashboards returns "Bad Request" response
     Given new "RestoreDashboards" request
     And body with value {"data": [{"id": "123-abc-456", "type": "dashboard"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Restore deleted dashboards returns "Dashboards Not Found" response
     Given new "RestoreDashboards" request
     And body with value {"data": [{"id": "123-abc-456", "type": "dashboard"}]}
     When the request is sent
     Then the response status is 404 Dashboards Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Restore deleted dashboards returns "No Content" response
     Given there is a valid "dashboard" in the system
     And the "dashboard" was deleted
@@ -1446,21 +1446,21 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Revoke a shared dashboard URL returns "OK" response
     Given new "DeletePublicDashboard" request
     And request contains "token" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Revoke a shared dashboard URL returns "Shared Dashboard Not Found" response
     Given new "DeletePublicDashboard" request
     And request contains "token" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Shared Dashboard Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Revoke shared dashboard invitations returns "Not Found" response
     Given new "DeletePublicDashboardInvitation" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1468,7 +1468,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Revoke shared dashboard invitations returns "OK" response
     Given new "DeletePublicDashboardInvitation" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1476,7 +1476,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Send shared dashboard invitation email returns "Bad Request" response
     Given new "SendPublicDashboardInvitation" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1484,7 +1484,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Send shared dashboard invitation email returns "Not Found" response
     Given new "SendPublicDashboardInvitation" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1492,7 +1492,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Send shared dashboard invitation email returns "OK" response
     Given new "SendPublicDashboardInvitation" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1500,7 +1500,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Send shared dashboard invitation email returns OK
     Given there is a valid "dashboard" in the system
     And there is a valid "shared_dashboard" in the system
@@ -1512,7 +1512,7 @@ Feature: Dashboards
     And the response "data.attributes.email" has the same value as "shared_dashboard.share_list[1]"
     And the response "data.attributes.share_token" has the same value as "shared_dashboard.token"
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard returns "Bad Request" response
     Given new "UpdateDashboard" request
     And request contains "dashboard_id" parameter from "REPLACE.ME"
@@ -1520,7 +1520,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard returns "Item Not Found" response
     Given new "UpdateDashboard" request
     And request contains "dashboard_id" parameter from "REPLACE.ME"
@@ -1528,7 +1528,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "UpdateDashboard" request
@@ -1538,7 +1538,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "description" is equal to "Updated description"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a dashboard with tags returns "OK" response
     Given there is a valid "dashboard" in the system
     And new "UpdateDashboard" request
@@ -1548,7 +1548,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "tags" is equal to ["team:foo", "team:bar"]
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a shared dashboard returns "Bad Request" response
     Given new "UpdatePublicDashboard" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1556,7 +1556,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a shared dashboard returns "Item Not Found" response
     Given new "UpdatePublicDashboard" request
     And request contains "token" parameter from "REPLACE.ME"
@@ -1564,7 +1564,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Update a shared dashboard returns "OK" response
     Given there is a valid "dashboard" in the system
     And there is a valid "shared_dashboard" in the system
@@ -1579,7 +1579,7 @@ Feature: Dashboards
     And the response "share_type" is equal to "open"
     And the response "share_list" has length 0
 
-  @team:DataDog/reporting-and-sharing
+  @team:ddoghq/reporting-and-sharing
   Scenario: Update a shared dashboard with selectable_template_vars returns "OK" response
     Given there is a valid "dashboard" in the system
     And there is a valid "shared_dashboard" in the system
diff --git a/features/v1/downtimes.feature b/features/v1/downtimes.feature
index fccf36602729..8737ca992e8c 100644
--- a/features/v1/downtimes.feature
+++ b/features/v1/downtimes.feature
@@ -12,14 +12,14 @@ Feature: Downtimes
     And a valid "appKeyAuth" key in the system
     And an instance of "Downtimes" API
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Cancel a downtime returns "Downtime not found" response
     Given new "CancelDowntime" request
     And request contains "downtime_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Downtime not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Cancel a downtime returns "OK" response
     Given there is a valid "downtime" in the system
     And new "CancelDowntime" request
@@ -27,21 +27,21 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Cancel downtimes by scope returns "Bad Request" response
     Given new "CancelDowntimesByScope" request
     And body with value {"scope": "host:myserver"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Cancel downtimes by scope returns "Downtimes not found" response
     Given new "CancelDowntimesByScope" request
     And body with value {"scope": "test:{{ unique_lower_alnum }}_invalid"}
     When the request is sent
     Then the response status is 404 Downtimes not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Cancel downtimes by scope returns "OK" response
     Given there is a valid "downtime" in the system
     And new "CancelDowntimesByScope" request
@@ -50,14 +50,14 @@ Feature: Downtimes
     Then the response status is 200 OK
     And the response "cancelled_ids[0]" has the same value as "downtime.id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a downtime returns "Downtime not found" response
     Given new "GetDowntime" request
     And request contains "downtime_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Downtime not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a downtime returns "OK" response
     Given there is a valid "downtime" in the system
     And new "GetDowntime" request
@@ -67,35 +67,35 @@ Feature: Downtimes
     And the response "id" has the same value as "downtime.id"
     And the response "message" has the same value as "downtime.message"
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Get active downtimes for a monitor returns "Bad Request" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Get active downtimes for a monitor returns "Monitor Not Found error" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Monitor Not Found error
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Get active downtimes for a monitor returns "OK" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all downtimes returns "OK" response
     Given new "ListDowntimes" request
     And request contains "with_creator" parameter with value true
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime once a year
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_once_a_year.json"
@@ -106,14 +106,14 @@ Feature: Downtimes
     And the response "recurrence.period" is equal to 1
     And the response "recurrence.type" is equal to "years"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime returns "Bad Request" response
     Given new "CreateDowntime" request
     And body from file "downtime_with_many_tags_payload.json"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime returns "OK" response
     Given new "CreateDowntime" request
     And body with value {"message": "{{ unique }}", "start": {{ timestamp("now") }}, "end": {{ timestamp("now + 1h") }}, "timezone": "Etc/UTC", "scope": ["test:{{ unique_lower_alnum }}"], "recurrence": {"type": "weeks", "period": 1, "week_days": ["Mon", "Tue", "Wed", "Thu", "Fri"], "until_date": {{ timestamp("now + 21d")}} }, "notify_end_states": ["alert", "no data", "warn"], "notify_end_types": ["canceled", "expired"]}
@@ -124,7 +124,7 @@ Feature: Downtimes
     And the response "notify_end_states" array contains value "alert"
     And the response "notify_end_types" array contains value "canceled"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime until date
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_until_date.json"
@@ -134,28 +134,28 @@ Feature: Downtimes
     And the response "recurrence.period" is equal to 1
     And the response "recurrence.until_date" is equal to {{ timestamp("now + 21d") }}
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime with invalid type hours
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_invalid_type_hours.json"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime with invalid weekdays
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_invalid_weekdays.json"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime with mutually exclusive until occurrences and until date properties
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_until_occurrences_and_until_date_are_mutually_exclusive.json"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime with until occurrences
     Given new "CreateDowntime" request
     And body from file "downtime_recurrence_payload_until_occurrences.json"
@@ -165,7 +165,7 @@ Feature: Downtimes
     And the response "recurrence.period" is equal to 1
     And the response "recurrence.until_occurrences" is equal to 3
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a monitor downtime returns "OK" response
     Given there is a valid "monitor" in the system
     And new "CreateDowntime" request
@@ -174,7 +174,7 @@ Feature: Downtimes
     Then the response status is 200 OK
     And the response "monitor_id" has the same value as "monitor.id"
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "Bad Request" response
     Given new "UpdateDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -182,7 +182,7 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "Downtime not found" response
     Given new "UpdateDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -190,7 +190,7 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 404 Downtime not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "OK" response
     Given there is a valid "downtime" in the system
     And new "UpdateDowntime" request
diff --git a/features/v1/events.feature b/features/v1/events.feature
index e1b7d8a0fd62..da4bfca0670e 100644
--- a/features/v1/events.feature
+++ b/features/v1/events.feature
@@ -16,7 +16,7 @@ Feature: Events
     Given a valid "apiKeyAuth" key in the system
     And an instance of "Events" API
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Get a list of events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListEvents" request
@@ -25,7 +25,7 @@ Feature: Events
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Get a list of events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListEvents" request
@@ -34,7 +34,7 @@ Feature: Events
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Get an event returns "Item Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetEvent" request
@@ -42,7 +42,7 @@ Feature: Events
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Get an event returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "GetEvent" request
@@ -50,21 +50,21 @@ Feature: Events
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/monitors-evaluation
+  @skip-validation @team:ddoghq/monitors-evaluation
   Scenario: Post an event in the past returns "Bad Request" response
     Given new "CreateEvent" request
     And body with value {"title": "{{ unique }}", "text": "A text message.", "date_happened": 1, "tags": ["test:{{ unique_alnum }}"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Post an event returns "Bad Request" response
     Given new "CreateEvent" request
     And body with value {"alert_type": "info", "priority": "normal", "tags": ["environment:test"], "text": "Oh boy!", "title": "Did you hear the news today?"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitors-evaluation
+  @team:ddoghq/monitors-evaluation
   Scenario: Post an event returns "OK" response
     Given new "CreateEvent" request
     And body with value {"title": "{{ unique }}", "text": "A text message.", "tags": ["test:{{ unique_alnum }}"]}
@@ -72,7 +72,7 @@ Feature: Events
     Then the response status is 202 OK
     And the response "event.text" is equal to "A text message."
 
-  @team:DataDog/monitors-evaluation
+  @team:ddoghq/monitors-evaluation
   Scenario: Post an event with a long title returns "OK" response
     Given new "CreateEvent" request
     And body with value {"title": "{{ unique }} very very very looooooooong looooooooooooong loooooooooooooooooooooong looooooooooooooooooooooooooong title with 100+ characters", "text": "A text message.", "tags": ["test:{{ unique_alnum }}"]}
diff --git a/features/v1/gcp_integration.feature b/features/v1/gcp_integration.feature
index 5e6bccf3a7ce..400ace74dc2d 100644
--- a/features/v1/gcp_integration.feature
+++ b/features/v1/gcp_integration.feature
@@ -10,28 +10,28 @@ Feature: GCP Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "GCPIntegration" API
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Create a GCP integration returns "Bad Request" response
     Given new "CreateGCPIntegration" request
     And body with value {"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "client_email": "api-dev@datadog-sandbox.iam.gserviceaccount.com", "client_id": "123456712345671234567", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL", "cloud_run_revision_filters": ["$KEY:$VALUE"], "errors": ["*"], "host_filters": "$KEY1:$VALUE1,$KEY2:$VALUE2", "is_cspm_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}], "private_key": "private_key", "private_key_id": "123456789abcdefghi123456789abcdefghijklm", "project_id": "datadog-apitest", "resource_collection_enabled": true, "token_uri": "https://accounts.google.com/o/oauth2/token", "type": "service_account"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a GCP integration returns "OK" response
     Given new "CreateGCPIntegration" request
     And body with value {"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "client_email": "{{unique_hash}}@example.com", "client_id": "{{ timestamp("now") }}{{ timestamp("now") }}0", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL", "host_filters": "key:value,filter:example", "cloud_run_revision_filters": ["dr:dre"], "is_cspm_enabled": true, "is_security_command_center_enabled": true, "is_resource_change_collection_enabled": true, "private_key": "private_key", "private_key_id": "123456789abcdefghi123456789abcdefghijklm", "project_id": "datadog-apitest", "resource_collection_enabled": true, "token_uri": "https://accounts.google.com/o/oauth2/token", "type": "service_account"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Delete a GCP integration returns "Bad Request" response
     Given new "DeleteGCPIntegration" request
     And body with value {"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "client_email": "api-dev@datadog-sandbox.iam.gserviceaccount.com", "client_id": "123456712345671234567", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL", "cloud_run_revision_filters": ["$KEY:$VALUE"], "errors": ["*"], "host_filters": "$KEY1:$VALUE1,$KEY2:$VALUE2", "is_cspm_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}], "private_key": "private_key", "private_key_id": "123456789abcdefghi123456789abcdefghijklm", "project_id": "datadog-apitest", "resource_collection_enabled": true, "token_uri": "https://accounts.google.com/o/oauth2/token", "type": "service_account"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Delete a GCP integration returns "OK" response
     Given there is a valid "gcp_account" in the system
     And new "DeleteGCPIntegration" request
@@ -39,19 +39,19 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: List all GCP integrations returns "Bad Request" response
     Given new "ListGCPIntegration" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/gcp-integrations
+  @skip-terraform-config @team:ddoghq/gcp-integrations
   Scenario: List all GCP integrations returns "OK" response
     Given new "ListGCPIntegration" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update a GCP integration cloud run revision filters returns "OK" response
     Given there is a valid "gcp_account" in the system
     And new "UpdateGCPIntegration" request
@@ -59,14 +59,14 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Update a GCP integration returns "Bad Request" response
     Given new "UpdateGCPIntegration" request
     And body with value {"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "client_email": "api-dev@datadog-sandbox.iam.gserviceaccount.com", "client_id": "123456712345671234567", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL", "cloud_run_revision_filters": ["$KEY:$VALUE"], "errors": ["*"], "host_filters": "$KEY1:$VALUE1,$KEY2:$VALUE2", "is_cspm_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}], "private_key": "private_key", "private_key_id": "123456789abcdefghi123456789abcdefghijklm", "project_id": "datadog-apitest", "resource_collection_enabled": true, "token_uri": "https://accounts.google.com/o/oauth2/token", "type": "service_account"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update a GCP integration returns "OK" response
     Given there is a valid "gcp_account" in the system
     And new "UpdateGCPIntegration" request
diff --git a/features/v1/hosts.feature b/features/v1/hosts.feature
index 56257ab18440..109fea00f886 100644
--- a/features/v1/hosts.feature
+++ b/features/v1/hosts.feature
@@ -9,20 +9,20 @@ Feature: Hosts
     And a valid "appKeyAuth" key in the system
     And an instance of "Hosts" API
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get all hosts for your organization returns "Invalid Parameter Error" response
     Given new "ListHosts" request
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @integration-only @team:DataDog/redapl-hosts
+  @integration-only @team:ddoghq/redapl-hosts
   Scenario: Get all hosts for your organization returns "OK" response
     Given new "ListHosts" request
     And request contains "filter" parameter with value "env:ci"
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/redapl-hosts
+  @replay-only @team:ddoghq/redapl-hosts
   Scenario: Get all hosts with metadata deserializes successfully
     Given new "ListHosts" request
     And request contains "include_hosts_metadata" parameter with value true
@@ -35,26 +35,26 @@ Feature: Hosts
     And the response "host_list[0].meta.agent_checks[0]" is equal to ["ntp","ntp","ntp:d884b5186b651429","OK","",""]
     And the response "host_list[0].meta.gohai" is equal to "{\"cpu\":{\"cache_size\":\"8192 KB\",\"cpu_cores\":\"1\",\"cpu_logical_processors\":\"1\",\"family\":\"6\",\"mhz\":\"2711.998\",\"model\":\"142\",\"model_name\":\"Intel(R) Core(TM) i7-8559U CPU @ 2.70GHz\",\"stepping\":\"10\",\"vendor_id\":\"GenuineIntel\"},\"filesystem\":[{\"kb_size\":\"3966892\",\"mounted_on\":\"/dev\",\"name\":\"udev\"},{\"kb_size\":\"797396\",\"mounted_on\":\"/run\",\"name\":\"tmpfs\"},{\"kb_size\":\"64800356\",\"mounted_on\":\"/\",\"name\":\"/dev/mapper/vagrant--vg-root\"},{\"kb_size\":\"3986968\",\"mounted_on\":\"/dev/shm\",\"name\":\"tmpfs\"},{\"kb_size\":\"5120\",\"mounted_on\":\"/run/lock\",\"name\":\"tmpfs\"},{\"kb_size\":\"3986968\",\"mounted_on\":\"/sys/fs/cgroup\",\"name\":\"tmpfs\"},{\"kb_size\":\"488245288\",\"mounted_on\":\"/vagrant\",\"name\":\"/vagrant\"},{\"kb_size\":\"797392\",\"mounted_on\":\"/run/user/1000\",\"name\":\"tmpfs\"}],\"memory\":{\"swap_total\":\"1003516kB\",\"total\":\"7973940kB\"},\"network\":{\"interfaces\":[{\"ipv4\":\"10.0.2.15\",\"ipv4-network\":\"10.0.2.0/24\",\"ipv6\":\"fe80::a00:27ff:fec2:be11\",\"ipv6-network\":\"fe80::/64\",\"macaddress\":\"08:00:27:c2:be:11\",\"name\":\"eth0\"},{\"ipv4\":\"192.168.122.1\",\"ipv4-network\":\"192.168.122.0/24\",\"macaddress\":\"52:54:00:6f:1c:bf\",\"name\":\"virbr0\"}],\"ipaddress\":\"10.0.2.15\",\"ipaddressv6\":\"fe80::a00:27ff:fec2:be11\",\"macaddress\":\"08:00:27:c2:be:11\"},\"platform\":{\"GOOARCH\":\"amd64\",\"GOOS\":\"linux\",\"goV\":\"1.16.7\",\"hardware_platform\":\"x86_64\",\"hostname\":\"vagrant\",\"kernel_name\":\"Linux\",\"kernel_release\":\"4.15.0-29-generic\",\"kernel_version\":\"#31-Ubuntu SMP Tue Jul 17 15:39:52 UTC 2018\",\"machine\":\"x86_64\",\"os\":\"GNU/Linux\",\"processor\":\"x86_64\",\"pythonV\":\"2.7.15rc1\"}}"
 
-  @skip-validation @team:DataDog/redapl-hosts
+  @skip-validation @team:ddoghq/redapl-hosts
   Scenario: Get all hosts with metadata for your organization returns "OK" response
     Given new "ListHosts" request
     And request contains "include_hosts_metadata" parameter with value true
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get the total number of active hosts returns "Invalid Parameter Error" response
     Given new "GetHostTotals" request
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get the total number of active hosts returns "OK" response
     Given new "GetHostTotals" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Mute a host returns "Invalid Parameter Error" response
     Given new "MuteHost" request
     And request contains "host_name" parameter from "REPLACE.ME"
@@ -62,7 +62,7 @@ Feature: Hosts
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Mute a host returns "OK" response
     Given new "MuteHost" request
     And request contains "host_name" parameter from "REPLACE.ME"
@@ -70,14 +70,14 @@ Feature: Hosts
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Unmute a host returns "Invalid Parameter Error" response
     Given new "UnmuteHost" request
     And request contains "host_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Unmute a host returns "OK" response
     Given new "UnmuteHost" request
     And request contains "host_name" parameter from "REPLACE.ME"
diff --git a/features/v1/ip_ranges.feature b/features/v1/ip_ranges.feature
index 067c9b6215eb..14f01ff58ae3 100644
--- a/features/v1/ip_ranges.feature
+++ b/features/v1/ip_ranges.feature
@@ -2,7 +2,7 @@
 Feature: IP Ranges
   Get a list of IP prefixes belonging to Datadog.
 
-  @team:DataDog/network-edge
+  @team:ddoghq/network-edge
   Scenario: List IP Ranges returns "OK" response
     Given an instance of "IPRanges" API
     And new "GetIPRanges" request
diff --git a/features/v1/key_management.feature b/features/v1/key_management.feature
index c3f18c2346a1..afb15f2246f4 100644
--- a/features/v1/key_management.feature
+++ b/features/v1/key_management.feature
@@ -12,77 +12,77 @@ Feature: Key Management
     And a valid "appKeyAuth" key in the system
     And an instance of "KeyManagement" API
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an API key returns "Bad Request" response
     Given new "CreateAPIKey" request
     And body with value {"name": "example user"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an API key returns "OK" response
     Given new "CreateAPIKey" request
     And body with value {"name": "example user"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an application key returns "Bad Request" response
     Given new "CreateApplicationKey" request
     And body with value {"name": "example user"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an application key returns "Conflict" response
     Given new "CreateApplicationKey" request
     And body with value {"name": "example user"}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an application key returns "OK" response
     Given new "CreateApplicationKey" request
     And body with value {"name": "example user"}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an API key returns "Bad Request" response
     Given new "DeleteAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an API key returns "Not Found" response
     Given new "DeleteAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an API key returns "OK" response
     Given new "DeleteAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an application key returns "Not Found" response
     Given new "DeleteApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an application key returns "OK" response
     Given new "DeleteApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "Bad Request" response
     Given new "UpdateAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -90,7 +90,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "Not Found" response
     Given new "UpdateAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -98,7 +98,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "OK" response
     Given new "UpdateAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -106,7 +106,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "Bad Request" response
     Given new "UpdateApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -114,7 +114,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "Conflict" response
     Given new "UpdateApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -122,7 +122,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "Not Found" response
     Given new "UpdateApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -130,7 +130,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "OK" response
     Given new "UpdateApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
@@ -138,40 +138,40 @@ Feature: Key Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get API key returns "Not Found" response
     Given new "GetAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get API key returns "OK" response
     Given new "GetAPIKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all API keys returns "OK" response
     Given new "ListAPIKeys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all application keys returns "OK" response
     Given new "ListApplicationKeys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get an application key returns "Not Found" response
     Given new "GetApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get an application key returns "OK" response
     Given new "GetApplicationKey" request
     And request contains "key" parameter from "REPLACE.ME"
diff --git a/features/v1/logs.feature b/features/v1/logs.feature
index 1a4ba2de4c26..5e77d38a5129 100644
--- a/features/v1/logs.feature
+++ b/features/v1/logs.feature
@@ -8,7 +8,7 @@ Feature: Logs
     Given a valid "apiKeyAuth" key in the system
     And an instance of "Logs" API
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -16,7 +16,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -24,7 +24,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Search test logs returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -32,7 +32,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 200 OK
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake
   Scenario: Send deflate logs returns "Response from server (always 200 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
@@ -40,7 +40,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 200 Response from server (always 200 empty JSON).
 
-  @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake
+  @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake
   Scenario: Send deflate logs with explicit compression returns "Response from server (always 200 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
@@ -49,7 +49,7 @@ Feature: Logs
     Then the response status is 200 Response from server (always 200 empty JSON).
     And the request uses "deflate" compression
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake
   Scenario: Send gzip logs returns "Response from server (always 200 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
@@ -57,7 +57,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 200 Response from server (always 200 empty JSON).
 
-  @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake
+  @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake
   Scenario: Send gzip logs with explicit compression returns "Response from server (always 200 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
@@ -66,14 +66,14 @@ Feature: Logs
     Then the response status is 200 Response from server (always 200 empty JSON).
     And the request uses "gzip" compression
 
-  @team:DataDog/event-platform-intake
+  @team:ddoghq/event-platform-intake
   Scenario: Send logs returns "Response from server (always 200 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
     When the request is sent
     Then the response status is 200 Response from server (always 200 empty JSON).
 
-  @generated @skip @team:DataDog/event-platform-intake
+  @generated @skip @team:ddoghq/event-platform-intake
   Scenario: Send logs returns "unexpected error" response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
diff --git a/features/v1/logs_indexes.feature b/features/v1/logs_indexes.feature
index 4091527029ba..b9c26e5d9c0a 100644
--- a/features/v1/logs_indexes.feature
+++ b/features/v1/logs_indexes.feature
@@ -8,68 +8,68 @@ Feature: Logs Indexes
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsIndexes" API
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Create an index returns "Invalid Parameter Error" response
     Given new "CreateLogsIndex" request
     And body with value {"daily_limit": 300000000, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+02:00"}, "daily_limit_warning_threshold_percentage": 70, "exclusion_filters": [{"filter": {"query": "*", "sample_attribute": "@ci.job_id", "sample_rate": 1.0}, "name": "payment"}], "filter": {"query": "source:python"}, "name": "main", "num_flex_logs_retention_days": 360, "num_retention_days": 15, "tags": ["team:backend", "env:production"]}
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Create an index returns "OK" response
     Given new "CreateLogsIndex" request
     And body with value {"daily_limit": 300000000, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+02:00"}, "daily_limit_warning_threshold_percentage": 70, "exclusion_filters": [{"filter": {"query": "*", "sample_attribute": "@ci.job_id", "sample_rate": 1.0}, "name": "payment"}], "filter": {"query": "source:python"}, "name": "main", "num_flex_logs_retention_days": 360, "num_retention_days": 15, "tags": ["team:backend", "env:production"]}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Create an index returns "Unprocessable Entity" response
     Given new "CreateLogsIndex" request
     And body with value {"daily_limit": 300000000, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+02:00"}, "daily_limit_warning_threshold_percentage": 70, "exclusion_filters": [{"filter": {"query": "*", "sample_attribute": "@ci.job_id", "sample_rate": 1.0}, "name": "payment"}], "filter": {"query": "source:python"}, "name": "main", "num_flex_logs_retention_days": 360, "num_retention_days": 15, "tags": ["team:backend", "env:production"]}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Delete an index returns "Not Found" response
     Given new "DeleteLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Delete an index returns "OK" response
     Given new "DeleteLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Get all indexes returns "OK" response
     Given new "ListLogIndexes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Get an index returns "Not Found" response
     Given new "GetLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Get an index returns "OK" response
     Given new "GetLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Get indexes order returns "OK" response
     Given new "GetLogsIndexOrder" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Update an index returns "Invalid Parameter Error" response
     Given new "UpdateLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
@@ -77,7 +77,7 @@ Feature: Logs Indexes
     When the request is sent
     Then the response status is 400 Invalid Parameter Error
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Update an index returns "OK" response
     Given new "UpdateLogsIndex" request
     And request contains "name" parameter from "REPLACE.ME"
@@ -85,14 +85,14 @@ Feature: Logs Indexes
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Update indexes order returns "Bad Request" response
     Given new "UpdateLogsIndexOrder" request
     And body with value {"index_names": ["main", "payments", "web"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-core
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-core
   Scenario: Update indexes order returns "OK" response
     Given new "UpdateLogsIndexOrder" request
     And body with value {"index_names": ["main", "payments", "web"]}
diff --git a/features/v1/logs_pipelines.feature b/features/v1/logs_pipelines.feature
index 8b584949d9ae..5474d748d940 100644
--- a/features/v1/logs_pipelines.feature
+++ b/features/v1/logs_pipelines.feature
@@ -21,180 +21,180 @@ Feature: Logs Pipelines
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsPipelines" API
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline returns "Bad Request" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar", "support_rules": "rule_name_1 foo\nrule_name_2 bar"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar", "support_rules": "rule_name_1 foo\nrule_name_2 bar"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Map Processor returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayMap", "processors": [{"type": "array-map-processor", "is_enabled": true, "name": "map items", "source": "items", "target": "out", "preserve_source": true, "processors": [{"type": "attribute-remapper", "sources": ["$sourceElem.id"], "target": "$targetElem.uid", "preserve_source": true}, {"type": "string-builder-processor", "template": "item-%{$sourceElem.id}", "target": "$targetElem.label"}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Map Processor using arithmetic sub-processor returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayMapArithmetic", "processors": [{"type": "array-map-processor", "is_enabled": true, "name": "double counts", "source": "items", "target": "out", "processors": [{"type": "arithmetic-processor", "expression": "$sourceElem.count * 2", "target": "$targetElem.doubled"}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Map Processor using category sub-processor returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayMapCategory", "processors": [{"type": "array-map-processor", "is_enabled": true, "name": "categorize items", "source": "items", "target": "out", "processors": [{"type": "category-processor", "target": "$targetElem.level", "categories": [{"filter": {"query": "@$sourceElem.status:error"}, "name": "error"}, {"filter": {"query": "*"}, "name": "info"}]}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Map Processor with preserve_source false returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayMapNoPreserve", "processors": [{"type": "array-map-processor", "is_enabled": true, "name": "map and remove source", "source": "items", "target": "out", "preserve_source": false, "processors": [{"type": "attribute-remapper", "sources": ["$sourceElem.id"], "target": "$targetElem.uid"}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Append Operation returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayAppend", "processors": [{"type": "array-processor", "is_enabled": true, "name": "append_ip_to_array", "operation": {"type": "append", "source": "network.client.ip", "target": "sourceIps"}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Append Operation with preserve_source false returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayAppendNoPreserve", "processors": [{"type": "array-processor", "is_enabled": true, "name": "append_ip_and_remove_source", "operation": {"type": "append", "source": "network.client.ip", "target": "sourceIps", "preserve_source": false}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Append Operation with preserve_source true returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayAppendPreserve", "processors": [{"type": "array-processor", "is_enabled": true, "name": "append_ip_and_keep_source", "operation": {"type": "append", "source": "network.client.ip", "target": "sourceIps", "preserve_source": true}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Key Value Operation returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayKeyValue", "processors": [{"type": "array-processor", "is_enabled": true, "name": "extract_kv", "operation": {"type": "key-value", "source": "tags", "key_to_extract": "name", "value_to_extract": "value"}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Key Value Operation with target and override_on_conflict returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayKeyValueTarget", "processors": [{"type": "array-processor", "is_enabled": true, "name": "extract_kv_to_target", "operation": {"type": "key-value", "source": "tags", "key_to_extract": "name", "value_to_extract": "value", "target": "extracted", "override_on_conflict": true}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Length Operation returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArrayLength", "processors": [{"type": "array-processor", "is_enabled": true, "name": "count_tags", "operation": {"type": "length", "source": "tags", "target": "tagCount"}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Array Processor Select Operation returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineArraySelect", "processors": [{"type": "array-processor", "is_enabled": true, "name": "extract_referrer", "operation": {"type": "select", "source": "httpRequest.headers", "target": "referrer", "filter": "name:Referrer", "value_to_extract": "value"}}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Decoder Processor returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testDecoderProcessor", "processors": [{"type": "decoder-processor", "is_enabled": true, "name": "test_decoder", "source": "encoded.field", "target": "decoded.field", "binary_to_text_encoding": "base16", "input_representation": "utf_8"}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Schema Processor and preserve_source false returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testSchemaProcessor", "processors": [{"type": "schema-processor", "is_enabled": true, "name": "Apply OCSF schema for 3001", "schema": {"schema_type": "ocsf", "version": "1.5.0", "class_uid": 3001, "class_name": "Account Change", "profiles": ["cloud", "datetime"]}, "mappers": [{"type": "schema-category-mapper", "name": "activity_id and activity_name", "categories": [{"filter": {"query": "@eventName:(*Create*)"}, "name": "Create", "id": 1}, {"filter": {"query": "@eventName:(ChangePassword OR PasswordUpdated)"}, "name": "Password Change", "id": 3}, {"filter": {"query": "@eventName:(*Attach*)"}, "name": "Attach Policy", "id": 7}, {"filter": {"query": "@eventName:(*Detach* OR *Remove*)"}, "name": "Detach Policy", "id": 8}, {"filter": {"query": "@eventName:(*Delete*)"}, "name": "Delete", "id": 6}, {"filter": {"query": "@eventName:*"}, "name": "Other", "id": 99}], "targets": {"name": "ocsf.activity_name", "id": "ocsf.activity_id"}, "fallback": {"values": {"ocsf.activity_id": "99", "ocsf.activity_name": "Other"}, "sources": {"ocsf.activity_name": ["eventName"]}}}, {"type": "schema-category-mapper", "name": "status", "categories": [{"filter": {"query": "-@errorCode:*"}, "id": 1, "name": "Success"}, {"filter": {"query": "@errorCode:*"}, "id": 2, "name": "Failure"}], "targets": {"id": "ocsf.status_id", "name": "ocsf.status"}}, {"type": "schema-category-mapper", "name": "Set default severity", "categories": [{"filter": {"query": "@eventName:*"}, "name": "Informational", "id": 1}], "targets": {"name": "ocsf.severity", "id": "ocsf.severity_id"}}, {"type": "schema-remapper", "name": "Map userIdentity to ocsf.user.uid", "sources": ["userIdentity.principalId", "responseElements.role.roleId", "responseElements.user.userId"], "target": "ocsf.user.uid", "preserve_source": false}, {"type": "schema-remapper", "name": "Map userName to ocsf.user.name", "sources": ["requestParameters.userName", "responseElements.role.roleName", "requestParameters.roleName", "responseElements.user.userName"], "target": "ocsf.user.name", "preserve_source": false}, {"type": "schema-remapper", "name": "Map api to ocsf.api", "sources": ["api"], "target": "ocsf.api", "preserve_source": false}, {"type": "schema-remapper", "name": "Map user to ocsf.user", "sources": ["user"], "target": "ocsf.user", "preserve_source": false}, {"type": "schema-remapper", "name": "Map actor to ocsf.actor", "sources": ["actor"], "target": "ocsf.actor", "preserve_source": false}, {"type": "schema-remapper", "name": "Map cloud to ocsf.cloud", "sources": ["cloud"], "target": "ocsf.cloud", "preserve_source": false}, {"type": "schema-remapper", "name": "Map http_request to ocsf.http_request", "sources": ["http_request"], "target": "ocsf.http_request", "preserve_source": false}, {"type": "schema-remapper", "name": "Map metadata to ocsf.metadata", "sources": ["metadata"], "target": "ocsf.metadata", "preserve_source": false}, {"type": "schema-remapper", "name": "Map time to ocsf.time", "sources": ["time"], "target": "ocsf.time", "preserve_source": false}, {"type": "schema-remapper", "name": "Map src_endpoint to ocsf.src_endpoint", "sources": ["src_endpoint"], "target": "ocsf.src_endpoint", "preserve_source": false}, {"type": "schema-remapper", "name": "Map severity to ocsf.severity", "sources": ["severity"], "target": "ocsf.severity", "preserve_source": false}, {"type": "schema-remapper", "name": "Map severity_id to ocsf.severity_id", "sources": ["severity_id"], "target": "ocsf.severity_id", "preserve_source": false}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Schema Processor and preserve_source true returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testSchemaProcessor", "processors": [{"type": "schema-processor", "is_enabled": true, "name": "Apply OCSF schema for 3001", "schema": {"schema_type": "ocsf", "version": "1.5.0", "class_uid": 3001, "class_name": "Account Change", "profiles": ["cloud", "datetime"]}, "mappers": [{"type": "schema-category-mapper", "name": "activity_id and activity_name", "categories": [{"filter": {"query": "@eventName:(*Create*)"}, "name": "Create", "id": 1}, {"filter": {"query": "@eventName:(ChangePassword OR PasswordUpdated)"}, "name": "Password Change", "id": 3}, {"filter": {"query": "@eventName:(*Attach*)"}, "name": "Attach Policy", "id": 7}, {"filter": {"query": "@eventName:(*Detach* OR *Remove*)"}, "name": "Detach Policy", "id": 8}, {"filter": {"query": "@eventName:(*Delete*)"}, "name": "Delete", "id": 6}, {"filter": {"query": "@eventName:*"}, "name": "Other", "id": 99}], "targets": {"name": "ocsf.activity_name", "id": "ocsf.activity_id"}, "fallback": {"values": {"ocsf.activity_id": "99", "ocsf.activity_name": "Other"}, "sources": {"ocsf.activity_name": ["eventName"]}}}, {"type": "schema-category-mapper", "name": "status", "categories": [{"filter": {"query": "-@errorCode:*"}, "id": 1, "name": "Success"}, {"filter": {"query": "@errorCode:*"}, "id": 2, "name": "Failure"}], "targets": {"id": "ocsf.status_id", "name": "ocsf.status"}}, {"type": "schema-category-mapper", "name": "Set default severity", "categories": [{"filter": {"query": "@eventName:*"}, "name": "Informational", "id": 1}], "targets": {"name": "ocsf.severity", "id": "ocsf.severity_id"}}, {"type": "schema-remapper", "name": "Map userIdentity to ocsf.user.uid", "sources": ["userIdentity.principalId", "responseElements.role.roleId", "responseElements.user.userId"], "target": "ocsf.user.uid", "preserve_source": true}, {"type": "schema-remapper", "name": "Map userName to ocsf.user.name", "sources": ["requestParameters.userName", "responseElements.role.roleName", "requestParameters.roleName", "responseElements.user.userName"], "target": "ocsf.user.name", "preserve_source": true}, {"type": "schema-remapper", "name": "Map api to ocsf.api", "sources": ["api"], "target": "ocsf.api", "preserve_source": true}, {"type": "schema-remapper", "name": "Map user to ocsf.user", "sources": ["user"], "target": "ocsf.user", "preserve_source": true}, {"type": "schema-remapper", "name": "Map actor to ocsf.actor", "sources": ["actor"], "target": "ocsf.actor", "preserve_source": true}, {"type": "schema-remapper", "name": "Map cloud to ocsf.cloud", "sources": ["cloud"], "target": "ocsf.cloud", "preserve_source": true}, {"type": "schema-remapper", "name": "Map http_request to ocsf.http_request", "sources": ["http_request"], "target": "ocsf.http_request", "preserve_source": true}, {"type": "schema-remapper", "name": "Map metadata to ocsf.metadata", "sources": ["metadata"], "target": "ocsf.metadata", "preserve_source": true}, {"type": "schema-remapper", "name": "Map time to ocsf.time", "sources": ["time"], "target": "ocsf.time", "preserve_source": true}, {"type": "schema-remapper", "name": "Map src_endpoint to ocsf.src_endpoint", "sources": ["src_endpoint"], "target": "ocsf.src_endpoint", "preserve_source": true}, {"type": "schema-remapper", "name": "Map severity to ocsf.severity", "sources": ["severity"], "target": "ocsf.severity", "preserve_source": true}, {"type": "schema-remapper", "name": "Map severity_id to ocsf.severity_id", "sources": ["severity_id"], "target": "ocsf.severity_id", "preserve_source": true}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with Span Id Remapper returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipeline", "processors": [{"type": "span-id-remapper", "is_enabled" : true, "name" : "test_filter", "sources" : [ "dd.span_id"] }], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with nested pipeline processor returns "OK" response
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testPipelineWithNested", "processors": [{"type": "pipeline", "is_enabled": true, "name": "nested_pipeline_with_metadata", "filter": {"query": "env:production"}, "tags": ["env:prod", "type:nested"], "description": "This is a nested pipeline for production logs"}], "tags": ["team:test"], "description": "Pipeline containing nested processor with tags and description"}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-onboarding
+  @team:ddoghq/logs-onboarding
   Scenario: Create a pipeline with schema processor
     Given new "CreateLogsPipeline" request
     And body with value {"filter": {"query": "source:python"}, "name": "testSchemaProcessor", "processors": [{"type": "schema-processor", "is_enabled": true, "name": "Apply OCSF schema for 3001", "schema": {"schema_type": "ocsf", "version": "1.5.0", "class_uid": 3001, "class_name": "Account Change", "profiles": ["cloud", "datetime"]}, "mappers": [{"type": "schema-category-mapper", "name": "activity_id and activity_name", "categories": [{"filter": {"query": "@eventName:(*Create*)"}, "name": "Create", "id": 1}, {"filter": {"query": "@eventName:(ChangePassword OR PasswordUpdated)"}, "name": "Password Change", "id": 3}, {"filter": {"query": "@eventName:(*Attach*)"}, "name": "Attach Policy", "id": 7}, {"filter": {"query": "@eventName:(*Detach* OR *Remove*)"}, "name": "Detach Policy", "id": 8}, {"filter": {"query": "@eventName:(*Delete*)"}, "name": "Delete", "id": 6}, {"filter": {"query": "@eventName:*"}, "name": "Other", "id": 99}], "targets": {"name": "ocsf.activity_name", "id": "ocsf.activity_id"}, "fallback": {"values": {"ocsf.activity_id": "99", "ocsf.activity_name": "Other"}, "sources": {"ocsf.activity_name": ["eventName"]}}}, {"type": "schema-category-mapper", "name": "status", "categories": [{"filter": {"query": "-@errorCode:*"}, "id": 1, "name": "Success"}, {"filter": {"query": "@errorCode:*"}, "id": 2, "name": "Failure"}], "targets": {"id": "ocsf.status_id", "name": "ocsf.status"}}, {"type": "schema-category-mapper", "name": "Set default severity", "categories": [{"filter": {"query": "@eventName:*"}, "name": "Informational", "id": 1}], "targets": {"name": "ocsf.severity", "id": "ocsf.severity_id"}}, {"type": "schema-remapper", "name": "Map userIdentity to ocsf.user.uid", "sources": ["userIdentity.principalId", "responseElements.role.roleId", "responseElements.user.userId"], "target": "ocsf.user.uid"}, {"type": "schema-remapper", "name": "Map userName to ocsf.user.name", "sources": ["requestParameters.userName", "responseElements.role.roleName", "requestParameters.roleName", "responseElements.user.userName"], "target": "ocsf.user.name"}, {"type": "schema-remapper", "name": "Map api to ocsf.api", "sources": ["api"], "target": "ocsf.api"}, {"type": "schema-remapper", "name": "Map user to ocsf.user", "sources": ["user"], "target": "ocsf.user"}, {"type": "schema-remapper", "name": "Map actor to ocsf.actor", "sources": ["actor"], "target": "ocsf.actor"}, {"type": "schema-remapper", "name": "Map cloud to ocsf.cloud", "sources": ["cloud"], "target": "ocsf.cloud"}, {"type": "schema-remapper", "name": "Map http_request to ocsf.http_request", "sources": ["http_request"], "target": "ocsf.http_request"}, {"type": "schema-remapper", "name": "Map metadata to ocsf.metadata", "sources": ["metadata"], "target": "ocsf.metadata"}, {"type": "schema-remapper", "name": "Map time to ocsf.time", "sources": ["time"], "target": "ocsf.time"}, {"type": "schema-remapper", "name": "Map src_endpoint to ocsf.src_endpoint", "sources": ["src_endpoint"], "target": "ocsf.src_endpoint"}, {"type": "schema-remapper", "name": "Map severity to ocsf.severity", "sources": ["severity"], "target": "ocsf.severity"}, {"type": "schema-remapper", "name": "Map severity_id to ocsf.severity_id", "sources": ["severity_id"], "target": "ocsf.severity_id"}]}], "tags": []}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Delete a pipeline returns "Bad Request" response
     Given new "DeleteLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Delete a pipeline returns "OK" response
     Given new "DeleteLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Get a pipeline returns "Bad Request" response
     Given new "GetLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Get a pipeline returns "OK" response
     Given new "GetLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Get all pipelines returns "OK" response
     Given new "ListLogsPipelines" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Get pipeline order returns "OK" response
     Given new "GetLogsPipelineOrder" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Update a pipeline returns "Bad Request" response
     Given new "UpdateLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
@@ -202,7 +202,7 @@ Feature: Logs Pipelines
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Update a pipeline returns "OK" response
     Given new "UpdateLogsPipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
@@ -210,21 +210,21 @@ Feature: Logs Pipelines
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Update pipeline order returns "Bad Request" response
     Given new "UpdateLogsPipelineOrder" request
     And body with value {"pipeline_ids": ["tags", "org_ids", "products"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Update pipeline order returns "OK" response
     Given new "UpdateLogsPipelineOrder" request
     And body with value {"pipeline_ids": ["tags", "org_ids", "products"]}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-onboarding
+  @generated @skip @team:ddoghq/logs-onboarding
   Scenario: Update pipeline order returns "Unprocessable Entity" response
     Given new "UpdateLogsPipelineOrder" request
     And body with value {"pipeline_ids": ["tags", "org_ids", "products"]}
diff --git a/features/v1/metrics.feature b/features/v1/metrics.feature
index 578439f7acbc..9362bd0d2699 100644
--- a/features/v1/metrics.feature
+++ b/features/v1/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/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-experience @team:DataDog/metrics-index @team:DataDog/metrics-intake @team:DataDog/timeseries-query
+  @generated @skip @team:ddoghq/metrics-experience @team:ddoghq/metrics-index @team:ddoghq/metrics-intake @team:ddoghq/timeseries-query
   Scenario: Search metrics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListMetrics" request
@@ -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-intake-edge
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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]]]}]}
@@ -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
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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 }}"]}]}
@@ -127,56 +127,56 @@ 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-edge
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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-intake-edge
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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-intake-edge
+  @generated @skip @team:ddoghq/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-intake-edge
+  @generated @skip @team:ddoghq/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]]]}]}
     When the request is sent
     Then the response status is 408 Request timeout
 
-  @skip @team:DataDog/metrics-intake
+  @skip @team:ddoghq/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
+  @skip-validation @team:ddoghq/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
+  @generated @skip @team:ddoghq/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
+  @generated @skip @team:ddoghq/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/features/v1/monitors.feature b/features/v1/monitors.feature
index 5b9dffa8b1ca..fa6affa0f634 100644
--- a/features/v1/monitors.feature
+++ b/features/v1/monitors.feature
@@ -12,21 +12,21 @@ Feature: Monitors
     And a valid "appKeyAuth" key in the system
     And an instance of "Monitors" API
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Check if a monitor can be deleted returns "Bad Request" response
     Given new "CheckCanDeleteMonitor" request
     And request contains "monitor_ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Check if a monitor can be deleted returns "Deletion conflict error" response
     Given new "CheckCanDeleteMonitor" request
     And request contains "monitor_ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Deletion conflict error
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Check if a monitor can be deleted returns "OK" response
     Given there is a valid "monitor" in the system
     And new "CheckCanDeleteMonitor" request
@@ -35,14 +35,14 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.ok[0]" has the same value as "monitor.id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Cost Monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "Example Monitor", "type": "cost alert", "query": "formula(\"exclude_null(query1)\").last(\"7d\").anomaly(direction=\"above\", threshold=10) >= 5", "message": "some message Notify: @hipchat-channel", "tags": ["test:examplemonitor", "env:ci"], "priority": 3, "options": {"thresholds": {"critical": 5, "warning": 3}, "variables": [{"data_source": "cloud_cost", "query": "sum:aws.cost.net.amortized.shared.resources.allocated{aws_product IN (amplify ,athena, backup, bedrock ) } by {aws_product}.rollup(sum, 86400)", "name": "query1", "aggregator": "sum"}], "include_tags": true}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Data Jobs monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "data-jobs alert", "query": "formula(\"failed_runs(run_query)\").by(job_name,workspace_name).last(10d) > 0", "message": "Data jobs alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "options": {"thresholds": {"critical": 0}, "variables": [{"name": "run_query", "jobs_query": "job_name:*", "job_type": "databricks.job", "query_dialect": "metric"}]}}
@@ -51,7 +51,7 @@ Feature: Monitors
     And the response "name" is equal to "{{ unique }}"
     And the response "type" is equal to "data-jobs alert"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Data Quality monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "data-quality alert", "query": "formula(\"query1\").last(\"5m\") > 100", "message": "Data quality alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "priority": 3, "options": {"thresholds": {"critical": 100}, "variables": [{"name": "query1", "data_source": "data_quality_metrics", "measure": "row_count", "filter": "search for column where `database:production AND table:users`", "group_by": ["entity_id"]}]}}
@@ -60,7 +60,7 @@ Feature: Monitors
     And the response "name" is equal to "{{ unique }}"
     And the response "type" is equal to "data-quality alert"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Data Quality monitor with a model configuration returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "data-quality alert", "query": "formula(\"query1\").last(\"5m\") > 100", "message": "Data quality alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "priority": 3, "options": {"thresholds": {"critical": 100}, "variables": [{"name": "query1", "data_source": "data_quality_metrics", "measure": "row_count", "filter": "search for column where `database:production AND table:users`", "group_by": ["entity_id"], "monitor_options": {"model_configuration": {"auto_resolve_days": 7, "enable_flatline_detection": true, "function": "DIFF", "min_lower_bound_size": 10.0, "min_upper_bound_size": 10.0, "model_bounds_override": "UPPER_ONLY"}}}]}}
@@ -72,7 +72,7 @@ Feature: Monitors
     And the response "options.variables[0].monitor_options.model_configuration.function" is equal to "DIFF"
     And the response "options.variables[0].monitor_options.model_configuration.model_bounds_override" is equal to "UPPER_ONLY"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Data Quality monitor with a source to target configuration returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "data-quality alert", "query": "formula(\"query1\").last(\"5m\") > 100", "message": "Data quality alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "priority": 3, "options": {"thresholds": {"critical": 100}, "variables": [{"name": "query1", "data_source": "data_quality_metrics", "measure": "row_count", "filter": "search for column where `database:production AND table:users`", "group_by": ["entity_id"], "monitor_options": {"source_to_target_config": {"source": {"entity_id": "source-entity-id", "entity_type": "table"}, "target": {"entity_id": "target-entity-id", "entity_type": "table"}, "diff_type": "absolute", "entity_type": "table"}}}]}}
@@ -84,7 +84,7 @@ Feature: Monitors
     And the response "options.variables[0].monitor_options.source_to_target_config.source.entity_id" is equal to "source-entity-id"
     And the response "options.variables[0].monitor_options.source_to_target_config.target.entity_id" is equal to "target-entity-id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a Data Quality monitor with sensitivity returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "data-quality alert", "query": "formula(\"query1\").last(\"5m\") > 100", "message": "Data quality alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "priority": 3, "options": {"thresholds": {"critical": 100}, "variables": [{"name": "query1", "data_source": "data_quality_metrics", "measure": "row_count", "filter": "search for column where `database:production AND table:users`", "group_by": ["entity_id"], "monitor_options": {"sensitivity": 2.5}}]}}
@@ -94,7 +94,7 @@ Feature: Monitors
     And the response "type" is equal to "data-quality alert"
     And the response "options.variables[0].monitor_options.sensitivity" is equal to 2.5
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a RUM formula and functions monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}","type": "rum alert","query": "formula(\"query2 / query1 * 100\").last(\"15m\") >= 0.8","message": "some message Notify: @hipchat-channel", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"],"priority": 3,"options":{"thresholds":{"critical":0.8},"variables":[{"data_source": "rum","name": "query2","search": {"query": ""},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []}, {"data_source": "rum","name": "query1","search": {"query": "status:error"},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []}]}}
@@ -104,7 +104,7 @@ Feature: Monitors
     And the response "type" is equal to "rum alert"
     And the response "draft_status" is equal to "published"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a ci-pipelines formula and functions monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}","type": "ci-pipelines alert","query": "formula(\"query1 / query2 * 100\").last(\"15m\") >= 0.8","message": "some message Notify: @hipchat-channel","tags": ["test:{{ unique_lower_alnum }}", "env:ci"],"priority": 3,"options": {"thresholds": {"critical": 0.8},"variables": [{"data_source": "ci_pipelines","name": "query1","search": {"query": "@ci.status:error"},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []},{"data_source": "ci_pipelines","name": "query2","search": {"query": ""},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []}]}}
@@ -114,7 +114,7 @@ Feature: Monitors
     And the response "type" is equal to "ci-pipelines alert"
     And the response "query" is equal to "formula(\"query1 / query2 * 100\").last(\"15m\") >= 0.8"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a ci-pipelines monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}","type": "ci-pipelines alert","query": "ci-pipelines(\"ci_level:pipeline @git.branch:staging* @ci.status:error\").rollup(\"count\").by(\"@git.branch,@ci.pipeline.name\").last(\"5m\") >= 1","message": "some message Notify: @hipchat-channel",	"tags": ["test:{{ unique_lower_alnum }}", "env:ci"],"priority": 3,"options":{"thresholds":{"critical":1}}}
@@ -124,7 +124,7 @@ Feature: Monitors
     And the response "type" is equal to "ci-pipelines alert"
     And the response "query" is equal to "ci-pipelines(\"ci_level:pipeline @git.branch:staging* @ci.status:error\").rollup(\"count\").by(\"@git.branch,@ci.pipeline.name\").last(\"5m\") >= 1"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a ci-tests formula and functions monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}","type": "ci-tests alert","query": "formula(\"query1 / query2 * 100\").last(\"15m\") >= 0.8","message": "some message Notify: @hipchat-channel","tags": ["test:{{ unique_lower_alnum }}", "env:ci"],"priority": 3,"options": {"thresholds": {"critical": 0.8},"variables": [{"data_source": "ci_tests","name": "query1","search": {"query": "@test.status:fail"},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []},{"data_source": "ci_tests","name": "query2","search": {"query": ""},"indexes": ["*"],"compute": {"aggregation": "count"},"group_by": []}]}}
@@ -134,7 +134,7 @@ Feature: Monitors
     And the response "type" is equal to "ci-tests alert"
     And the response "query" is equal to "formula(\"query1 / query2 * 100\").last(\"15m\") >= 0.8"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a ci-tests monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}","type": "ci-tests alert","query": "ci-tests(\"type:test @git.branch:staging* @test.status:fail\").rollup(\"count\").by(\"@test.name\").last(\"5m\") >= 1","message": "some message Notify: @hipchat-channel", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"],"priority": 3,"options":{"thresholds":{"critical":1}}}
@@ -144,7 +144,7 @@ Feature: Monitors
     And the response "type" is equal to "ci-tests alert"
     And the response "query" is equal to "ci-tests(\"type:test @git.branch:staging* @test.status:fail\").rollup(\"count\").by(\"@test.name\").last(\"5m\") >= 1"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a metric monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "metric alert", "query": "avg(current_1mo):avg:system.load.5{*} > 0.5", "message": "some message Notify: @hipchat-channel", "options":{"thresholds":{"critical":0.5}, "scheduling_options":{"evaluation_window":{"day_starts":"04:00", "month_starts":1}}}}
@@ -153,7 +153,7 @@ Feature: Monitors
     And the response "name" is equal to "{{ unique }}"
     And the response "query" is equal to "avg(current_1mo):avg:system.load.5{*} > 0.5"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a metric monitor with a custom schedule returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"message":"some message Notify: @hipchat-channel","name":"{{ unique }}","query":"avg(current_1mo):avg:system.load.5{*} > 0.5","tags":[],"options":{"thresholds":{"critical":0.5},"notify_audit":false,"include_tags":false,"on_missing_data":"default","scheduling_options":{"evaluation_window":{"day_starts":"04:00", "month_starts":1},"custom_schedule":{"recurrences":[{"rrule":"FREQ=DAILY;INTERVAL=1","timezone":"America/Los_Angeles","start":"2024-10-26T09:13:00"}]}}},"type":"query alert", "draft_status": "published"}
@@ -165,14 +165,14 @@ Feature: Monitors
     And the response "options.scheduling_options.custom_schedule.recurrences[0].start" is equal to "2024-10-26T09:13:00"
     And the response "options.scheduling_options.custom_schedule.recurrences[0].timezone" is equal to "America/Los_Angeles"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor returns "Bad Request" response
     Given new "CreateMonitor" request
     And body with value {"type": "log alert", "query": "query"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor returns "OK" response
     Given there is a valid "role" in the system
     And new "CreateMonitor" request
@@ -183,7 +183,7 @@ Feature: Monitors
     And the response "type" is equal to "log alert"
     And the response "query" is equal to "logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") > 2"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor with aggregate augmented query variables returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name":"{{ unique }}","type":"query alert","query":"formula(\"query1\").rollup(\"sum\").last(\"5m\") > 124","message":"test message","options":{"thresholds":{"critical":124},"variables":[{"data_source":"aggregate_augmented_query","name":"query1","group_by":[{"facet":"org_id"},{"facet":"name"}],"compute":[{"name":"compute_result","aggregation":"max"}],"augment_query":{"name":"filter_query","data_source":"reference_table","table_name":"test_table","columns":[{"name":"org_id"},{"name":"name"}]},"base_query":{"data_source":"metrics","name":"query1","query":"avg:dd{*} by {org_id}.as_count()"},"join_condition":{"augment_attribute":"org_id","base_attribute":"org_id","join_type":"inner"}}]}}
@@ -193,7 +193,7 @@ Feature: Monitors
     And the response "options.variables[0].data_source" is equal to "aggregate_augmented_query"
     And the response "options.variables[0].join_condition.join_type" is equal to "inner"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor with aggregate filtered query variables returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name":"{{ unique }}","type":"query alert","query":"formula(\"query1\").rollup(\"sum\").last(\"5m\") > 100","message":"test message","options":{"thresholds":{"critical":100},"variables":[{"data_source":"aggregate_filtered_query","name":"query1","base_query":{"data_source":"metrics","name":"query1","query":"max:container.cpu.usage{*} by {kube_cluster_name}.rollup(max)"},"filter_query":{"name":"filter_query","data_source":"reference_table","table_name":"test_table","columns":[{"name":"cluster_name"}]},"filters":[{"base_attribute":"kube_cluster_name","filter_attribute":"cluster_name"}]}]}}
@@ -203,7 +203,7 @@ Feature: Monitors
     And the response "options.variables[0].data_source" is equal to "aggregate_filtered_query"
     And the response "options.variables[0].filters[0].base_attribute" is equal to "kube_cluster_name"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor with assets returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"assets": [{"category": "runbook", "name": "Monitor Runbook", "resource_key": "12345", "resource_type": "notebook", "url": "/notebooks/12345"}], "name": "{{ unique }}", "type": "metric alert", "query": "avg(current_1mo):avg:system.load.5{*} > 0.5", "message": "some message Notify: @hipchat-channel", "options":{"thresholds":{"critical":0.5}, "scheduling_options":{"evaluation_window":{"day_starts":"04:00", "month_starts":1}}}}
@@ -215,7 +215,7 @@ Feature: Monitors
     And the response "assets[0].resource_type" is equal to "notebook"
     And the response "assets[0].url" is equal to "/notebooks/12345"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create an Error Tracking monitor returns "OK" response
     Given new "CreateMonitor" request
     And body from file "monitor_error_tracking_alert_payload.json"
@@ -226,7 +226,7 @@ Feature: Monitors
     And the response "query" is equal to "error-tracking-rum(\"service:foo AND @error.source:source\").rollup(\"count\").by(\"@issue.id\").last(\"1h\") >= 1"
     And the response "draft_status" is equal to "draft"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create an LLM Observability monitor returns "OK" response
     Given new "CreateMonitor" request
     And body with value {"name": "{{ unique }}", "type": "llm-observability alert", "query": "llm-observability(\"*\").rollup(\"count\").last(\"2h\") > 0", "message": "LLM observability alert triggered", "tags": ["test:{{ unique_lower_alnum }}", "env:ci"], "options": {"thresholds": {"critical": 0}, "include_tags": true, "notify_audit": false}}
@@ -235,21 +235,21 @@ Feature: Monitors
     And the response "name" is equal to "{{ unique }}"
     And the response "type" is equal to "llm-observability alert"
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Delete a monitor returns "Bad Request" response
     Given new "DeleteMonitor" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor returns "Item not found error" response
     Given new "DeleteMonitor" request
     And request contains "monitor_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Item not found error
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor returns "OK" response
     Given there is a valid "monitor" in the system
     And new "DeleteMonitor" request
@@ -258,7 +258,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "deleted_monitor_id" has the same value as "monitor.id"
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Edit a monitor returns "Bad Request" response
     Given new "UpdateMonitor" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
@@ -266,7 +266,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Edit a monitor returns "Monitor Not Found error" response
     Given new "UpdateMonitor" request
     And request contains "monitor_id" parameter with value 0
@@ -274,7 +274,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Monitor Not Found error
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Edit a monitor returns "OK" response
     Given there is a valid "monitor" in the system
     And new "UpdateMonitor" request
@@ -285,21 +285,21 @@ Feature: Monitors
     And the response "name" is equal to "{{ monitor.name }}-updated"
     And the response "priority" is equal to null
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Get a monitor's details returns "Bad Request" response
     Given new "GetMonitor" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor's details returns "Monitor Not Found error" response
     Given new "GetMonitor" request
     And request contains "monitor_id" parameter with value 12345
     When the request is sent
     Then the response status is 404 Monitor Not Found error
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor's details returns "OK" response
     Given there is a valid "monitor" in the system
     And new "GetMonitor" request
@@ -309,7 +309,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "id" has the same value as "monitor.id"
 
-  @replay-only @team:DataDog/monitor-app
+  @replay-only @team:ddoghq/monitor-app
   Scenario: Get a monitor's details with downtime returns "OK" response
     Given there is a valid "monitor" in the system
     And there is a valid "downtime" for a "monitor" in the system
@@ -322,7 +322,7 @@ Feature: Monitors
     And the response "matching_downtimes" has length 1
     And the response "matching_downtimes[0].id" has the same value as "downtime_monitor.id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a synthetics monitor's details
     Given there is a valid "synthetics_api_test" in the system
     And new "GetMonitor" request
@@ -331,20 +331,20 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "options.synthetics_check_id" has the same value as "synthetics_api_test.public_id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all monitors returns "Bad Request" response
     Given new "ListMonitors" request
     And request contains "group_states" parameter with value "notagroupstate"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @team:DataDog/monitor-app
+  @integration-only @team:ddoghq/monitor-app
   Scenario: Get all monitors returns "OK" response
     Given new "ListMonitors" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/monitor-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/monitor-app @with-pagination
   Scenario: Get all monitors returns "OK" response with pagination
     Given new "ListMonitors" request
     And request contains "page_size" parameter with value 2
@@ -352,7 +352,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response has 3 items
 
-  @skip @team:DataDog/monitor-app
+  @skip @team:ddoghq/monitor-app
   Scenario: Get all monitors with tags
     Given there is a valid "monitor" in the system
     And new "ListMonitors" request
@@ -362,56 +362,56 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "[0].id" has the same value as "monitor.id"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Monitors group search returns "Bad Request" response
     Given new "SearchMonitorGroups" request
     And request contains "query" parameter with value "status:notastatus"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Monitors group search returns "OK" response
     Given new "SearchMonitorGroups" request
     When the request is sent
     Then the response status is 200 OK
     And the response "metadata.page" is equal to 0
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Monitors search returns "Bad Request" response
     Given new "SearchMonitors" request
     And request contains "query" parameter with value "status:notastatus"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Monitors search returns "OK" response
     Given new "SearchMonitors" request
     When the request is sent
     Then the response status is 200 OK
     And the response "metadata.page" is equal to 0
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate a monitor returns "Invalid JSON" response
     Given new "ValidateMonitor" request
     And body with value {"type": "log alert", "query": "query"}
     When the request is sent
     Then the response status is 400 Invalid JSON
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate a monitor returns "OK" response
     Given new "ValidateMonitor" request
     And body from file "monitor_payload.json"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate a multi-alert monitor returns "OK" response
     Given new "ValidateMonitor" request
     And body from file "multi_alert_monitor_payload.json"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor returns "Invalid JSON" response
     Given there is a valid "monitor" in the system
     And new "ValidateExistingMonitor" request
@@ -420,14 +420,14 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Invalid JSON
 
-  @skip @team:DataDog/monitor-app
+  @skip @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor returns "Item not found error" response
     Given new "ValidateExistingMonitor" request
     And request contains "monitor_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Item not found error
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor returns "OK" response
     Given there is a valid "monitor" in the system
     And new "ValidateExistingMonitor" request
diff --git a/features/v1/notebooks.feature b/features/v1/notebooks.feature
index 1a7dcacb6b8f..16203a56a25c 100644
--- a/features/v1/notebooks.feature
+++ b/features/v1/notebooks.feature
@@ -10,14 +10,14 @@ Feature: Notebooks
     And a valid "appKeyAuth" key in the system
     And an instance of "Notebooks" API
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Create a notebook returns "Bad Request" response
     Given new "CreateNotebook" request
     And body with value {"data": {"attributes": {"cells": [{"attributes": {"definition": {"text": "## Some test markdown\n\n```\nvar x, y;\nx = 5;\ny = 6;\n```", "type": "markdown"}}, "type": "notebook_cells"}, {"attributes": {"definition": {"requests": [{"display_type": "line", "q": "avg:system.load.1{*}", "style": {"line_type": "solid", "line_width": "normal", "palette": "dog_classic"}}], "show_legend": true, "type": "timeseries", "yaxis": {"scale": "linear"}}, "graph_size": "m", "split_by": {"keys": [], "tags": []}, "time": null}, "type": "notebook_cells"}], "metadata": {"is_template": false, "take_snapshots": false, "type": "investigation"}, "name": "Example Notebook", "status": "published", "template_variables": [{"available_values": ["my-host", "host1", "host2"], "available_values_query": {"data_source": "logs", "group_by": [{"facet": "host"}], "search": {"query": "service:web"}}, "default": "my-host", "defaults": ["my-host-1", "my-host-2"], "name": "host1", "placement": "global", "prefix": "host", "type": "tag"}], "time": {"live_span": "1h"}}, "type": "notebooks"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/notebooks
+  @team:ddoghq/notebooks
   Scenario: Create a notebook returns "OK" response
     Given new "CreateNotebook" request
     And body with value {"data": {"attributes": {"cells": [{"attributes": {"definition": {"text": "## Some test markdown\n\n```\nvar x, y;\nx = 5;\ny = 6;\n```", "type": "markdown"}}, "type": "notebook_cells"}, {"attributes": {"definition": {"requests": [{"display_type": "line", "q": "avg:system.load.1{*}", "style": {"line_type": "solid", "line_width": "normal", "palette": "dog_classic"}}], "show_legend": true, "type": "timeseries", "yaxis": {"scale": "linear"}}, "graph_size": "m", "split_by": {"keys": [], "tags": []}, "time": null}, "type": "notebook_cells"}], "name": "{{ unique }}", "status": "published", "time": {"live_span": "1h"}}, "type": "notebooks"}}
@@ -27,21 +27,21 @@ Feature: Notebooks
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.cells[0].attributes.definition.text" is equal to "## Some test markdown\n\n```\nvar x, y;\nx = 5;\ny = 6;\n```"
 
-  @skip @team:DataDog/notebooks
+  @skip @team:ddoghq/notebooks
   Scenario: Delete a notebook returns "Bad Request" response
     Given new "DeleteNotebook" request
     And request contains "notebook_id" parameter with value "ThisIsntANotebookId"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/notebooks
+  @team:ddoghq/notebooks
   Scenario: Delete a notebook returns "Not Found" response
     Given new "DeleteNotebook" request
     And request contains "notebook_id" parameter with value 123456
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/notebooks
+  @team:ddoghq/notebooks
   Scenario: Delete a notebook returns "OK" response
     Given new "DeleteNotebook" request
     And there is a valid "notebook" in the system
@@ -49,21 +49,21 @@ Feature: Notebooks
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Get a notebook returns "Bad Request" response
     Given new "GetNotebook" request
     And request contains "notebook_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Get a notebook returns "Not Found" response
     Given new "GetNotebook" request
     And request contains "notebook_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/notebooks
+  @team:ddoghq/notebooks
   Scenario: Get a notebook returns "OK" response
     Given new "GetNotebook" request
     And there is a valid "notebook" in the system
@@ -73,20 +73,20 @@ Feature: Notebooks
     And the response "data.attributes.name" has the same value as "notebook.data.attributes.name"
     And the response "data.attributes.cells[0].attributes.definition.type" has the same value as "notebook.data.attributes.cells[0].attributes.definition.type"
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Get all notebooks returns "Bad Request" response
     Given new "ListNotebooks" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/notebooks
+  @skip-validation @team:ddoghq/notebooks
   Scenario: Get all notebooks returns "OK" response
     Given new "ListNotebooks" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data" has item with field "attributes.status" with value "published"
 
-  @replay-only @skip-validation @team:DataDog/notebooks @with-pagination
+  @replay-only @skip-validation @team:ddoghq/notebooks @with-pagination
   Scenario: Get all notebooks returns "OK" response with pagination
     Given new "ListNotebooks" request
     And request contains "count" parameter with value 2
@@ -94,7 +94,7 @@ Feature: Notebooks
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Update a notebook returns "Bad Request" response
     Given new "UpdateNotebook" request
     And request contains "notebook_id" parameter from "REPLACE.ME"
@@ -102,7 +102,7 @@ Feature: Notebooks
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Update a notebook returns "Conflict" response
     Given new "UpdateNotebook" request
     And request contains "notebook_id" parameter from "REPLACE.ME"
@@ -110,7 +110,7 @@ Feature: Notebooks
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/notebooks
+  @generated @skip @team:ddoghq/notebooks
   Scenario: Update a notebook returns "Not Found" response
     Given new "UpdateNotebook" request
     And request contains "notebook_id" parameter from "REPLACE.ME"
@@ -118,7 +118,7 @@ Feature: Notebooks
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/notebooks
+  @team:ddoghq/notebooks
   Scenario: Update a notebook returns "OK" response
     Given new "UpdateNotebook" request
     And there is a valid "notebook" in the system
diff --git a/features/v1/organizations.feature b/features/v1/organizations.feature
index ffd0cf763928..b4decda290aa 100644
--- a/features/v1/organizations.feature
+++ b/features/v1/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @skip @team:ddoghq/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/org-management
+  @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/features/v1/pagerduty_integration.feature b/features/v1/pagerduty_integration.feature
index c0adea375a8c..899ff6057019 100644
--- a/features/v1/pagerduty_integration.feature
+++ b/features/v1/pagerduty_integration.feature
@@ -9,49 +9,49 @@ Feature: PagerDuty Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "PagerDutyIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a new service object returns "Bad Request" response
     Given new "CreatePagerDutyIntegrationService" request
     And body with value {"service_key": "", "service_name": ""}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a new service object returns "OK" response
     Given new "CreatePagerDutyIntegrationService" request
     And body with value {"service_key": "", "service_name": ""}
     When the request is sent
     Then the response status is 201 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a single service object returns "Item Not Found" response
     Given new "DeletePagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a single service object returns "No Content" response
     Given new "DeletePagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a single service object returns "Item Not Found" response
     Given new "GetPagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a single service object returns "OK" response
     Given new "GetPagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a single service object returns "Bad Request" response
     Given new "UpdatePagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
@@ -59,7 +59,7 @@ Feature: PagerDuty Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a single service object returns "Item Not Found" response
     Given new "UpdatePagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
@@ -67,7 +67,7 @@ Feature: PagerDuty Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a single service object returns "OK" response
     Given new "UpdatePagerDutyIntegrationService" request
     And request contains "service_name" parameter from "REPLACE.ME"
diff --git a/features/v1/security_monitoring.feature b/features/v1/security_monitoring.feature
index ce9090d171e6..9974e61bb476 100644
--- a/features/v1/security_monitoring.feature
+++ b/features/v1/security_monitoring.feature
@@ -9,7 +9,7 @@ Feature: Security Monitoring
     And a valid "appKeyAuth" key in the system
     And an instance of "SecurityMonitoring" API
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Add a security signal to an incident returns "Bad Request" response
     Given new "AddSecurityMonitoringSignalToIncident" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Add a security signal to an incident returns "Not Found" response
     Given new "AddSecurityMonitoringSignalToIncident" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Add a security signal to an incident returns "OK" response
     Given new "AddSecurityMonitoringSignalToIncident" request
     And request contains "signal_id" parameter with value "AQAAAYDiB_Ol8PbzFAAAAABBWURpQl9PbEFBQU0yeXhGTG9ZV2JnQUE"
@@ -34,7 +34,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "status" is equal to "done"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "Bad Request" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -42,7 +42,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "Not Found" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -50,7 +50,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "OK" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter with value "AQAAAYDiB_Ol8PbzFAAAAABBWURpQl9PbEFBQU0yeXhGTG9ZV2JnQUE"
@@ -59,7 +59,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "status" is equal to "done"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "Bad Request" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -67,7 +67,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "Not Found" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -75,7 +75,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "OK" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter with value "AQAAAYDiB_Ol8PbzFAAAAABBWURpQl9PbEFBQU0yeXhGTG9ZV2JnQUE"
diff --git a/features/v1/service_checks.feature b/features/v1/service_checks.feature
index 5ed435e4cb7d..8f9d130374ef 100644
--- a/features/v1/service_checks.feature
+++ b/features/v1/service_checks.feature
@@ -20,25 +20,25 @@ Feature: Service Checks
     And an instance of "ServiceChecks" API
     And new "SubmitServiceCheck" request
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Submit a Service Check returns "Bad Request" response
     Given body with value [{"check": "app.ok", "host_name": "app.host1", "message": "app is running", "status": 0, "tags": ["environment:test"]}]
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/monitors-evaluation
+  @skip-validation @team:ddoghq/monitors-evaluation
   Scenario: Submit a Service Check returns "Payload accepted" response
     Given body with value [{"check": "app.ok", "host_name": "host", "status": 0, "tags": ["test:{{ unique_alnum }}"]}]
     When the request is sent
     Then the response status is 202 Payload accepted
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Submit a Service Check returns "Payload too large" response
     Given body with value [{"check": "app.ok", "host_name": "app.host1", "message": "app is running", "status": 0, "tags": ["environment:test"]}]
     When the request is sent
     Then the response status is 413 Payload too large
 
-  @generated @skip @team:DataDog/monitors-evaluation
+  @generated @skip @team:ddoghq/monitors-evaluation
   Scenario: Submit a Service Check returns "Request timeout" response
     Given body with value [{"check": "app.ok", "host_name": "app.host1", "message": "app is running", "status": 0, "tags": ["environment:test"]}]
     When the request is sent
diff --git a/features/v1/service_level_objective_corrections.feature b/features/v1/service_level_objective_corrections.feature
index 5b89ea6df2d9..4280c63f574b 100644
--- a/features/v1/service_level_objective_corrections.feature
+++ b/features/v1/service_level_objective_corrections.feature
@@ -13,7 +13,7 @@ Feature: Service Level Objective Corrections
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceLevelObjectiveCorrections" API
 
-  @skip @team:DataDog/slo-app
+  @skip @team:ddoghq/slo-app
   Scenario: Create an SLO correction returns "Bad Request" response
     Given there is a valid "slo" in the system
     And new "CreateSLOCorrection" request
@@ -21,7 +21,7 @@ Feature: Service Level Objective Corrections
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create an SLO correction returns "OK" response
     Given there is a valid "slo" in the system
     And new "CreateSLOCorrection" request
@@ -32,14 +32,14 @@ Feature: Service Level Objective Corrections
     And the response "data.attributes.category" is equal to "Scheduled Maintenance"
     And the response "data.attributes.slo_id" has the same value as "slo.data[0].id"
 
-  @skip @team:DataDog/slo-app
+  @skip @team:ddoghq/slo-app
   Scenario: Create an SLO correction returns "SLO Not Found" response
     Given new "CreateSLOCorrection" request
     And body with value {"data": {"attributes": {"category": "Scheduled Maintenance", "description": "{{ unique }}", "end": {{ timestamp("now + 1h") }}, "slo_id": "sloId", "start": {{ timestamp("now") }}, "timezone": "UTC"}, "type": "correction"}}
     When the request is sent
     Then the response status is 404 SLO Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create an SLO correction with rrule returns "OK" response
     Given there is a valid "slo" in the system
     And new "CreateSLOCorrection" request
@@ -49,7 +49,7 @@ Feature: Service Level Objective Corrections
     And the response "data.type" is equal to "correction"
     And the response "data.attributes.rrule" is equal to "FREQ=DAILY;INTERVAL=10;COUNT=5"
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create an SLO correction with slo_query returns "OK" response
     Given new "CreateSLOCorrection" request
     And body with value {"data": {"attributes": {"category": "Scheduled Maintenance", "description": "{{ unique }}", "end": {{ timestamp("now + 1h") }}, "slo_query": "env:prod service:checkout", "start": {{ timestamp("now") }}, "timezone": "UTC"}, "type": "correction"}}
@@ -59,21 +59,21 @@ Feature: Service Level Objective Corrections
     And the response "data.attributes.category" is equal to "Scheduled Maintenance"
     And the response "data.attributes.slo_query" is equal to "env:prod service:checkout"
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Delete an SLO correction returns "Not found" response
     Given new "DeleteSLOCorrection" request
     And request contains "slo_correction_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Delete an SLO correction returns "OK" response
     Given new "DeleteSLOCorrection" request
     And request contains "slo_correction_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get all SLO corrections returns "OK" response
     Given there is a valid "slo" in the system
     And there is a valid "correction" for "slo"
@@ -84,7 +84,7 @@ Feature: Service Level Objective Corrections
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @replay-only @skip-validation @team:DataDog/slo-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/slo-app @with-pagination
   Scenario: Get all SLO corrections returns "OK" response with pagination
     Given new "ListSLOCorrection" request
     And request contains "limit" parameter with value 2
@@ -92,14 +92,14 @@ Feature: Service Level Objective Corrections
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get an SLO correction for an SLO returns "Bad Request" response
     Given new "GetSLOCorrection" request
     And request contains "slo_correction_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get an SLO correction for an SLO returns "OK" response
     Given there is a valid "slo" in the system
     And there is a valid "correction" for "slo"
@@ -110,7 +110,7 @@ Feature: Service Level Objective Corrections
     And the response "data.type" has the same value as "correction.data.type"
     And the response "data.attributes.category" has the same value as "correction.data.attributes.category"
 
-  @skip @team:DataDog/slo-app
+  @skip @team:ddoghq/slo-app
   Scenario: Update an SLO correction returns "Bad Request" response
     Given there is a valid "slo" in the system
     And there is a valid "correction" for "slo"
@@ -120,7 +120,7 @@ Feature: Service Level Objective Corrections
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Update an SLO correction returns "Not Found" response
     Given new "UpdateSLOCorrection" request
     And request contains "slo_correction_id" parameter from "REPLACE.ME"
@@ -128,7 +128,7 @@ Feature: Service Level Objective Corrections
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Update an SLO correction returns "OK" response
     Given there is a valid "slo" in the system
     And there is a valid "correction" for "slo"
@@ -141,7 +141,7 @@ Feature: Service Level Objective Corrections
     And the response "data.attributes.slo_id" has the same value as "correction.data.attributes.slo_id"
     And the response "data.attributes.category" is equal to "Deployment"
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Update an SLO correction with slo_query returns "OK" response
     Given there is a valid "correction_with_query" in the system
     And new "UpdateSLOCorrection" request
diff --git a/features/v1/service_level_objectives.feature b/features/v1/service_level_objectives.feature
index 6e756c5a54e3..f184c60ec89a 100644
--- a/features/v1/service_level_objectives.feature
+++ b/features/v1/service_level_objectives.feature
@@ -13,42 +13,42 @@ Feature: Service Level Objectives
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceLevelObjectives" API
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Bulk Delete SLO Timeframes returns "Bad Request" response
     Given new "DeleteSLOTimeframeInBulk" request
     And body with value {"id1": ["7d", "30d"], "id2": ["7d", "30d"]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Bulk Delete SLO Timeframes returns "OK" response
     Given new "DeleteSLOTimeframeInBulk" request
     And body with value {"id1": ["7d", "30d"], "id2": ["7d", "30d"]}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Check if SLOs can be safely deleted returns "Bad Request" response
     Given new "CheckCanDeleteSLO" request
     And request contains "ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Check if SLOs can be safely deleted returns "Conflict" response
     Given new "CheckCanDeleteSLO" request
     And request contains "ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Check if SLOs can be safely deleted returns "OK" response
     Given new "CheckCanDeleteSLO" request
     And request contains "ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create a new metric SLO object using bad events formula returns "OK" response
     Given new "CreateSLO" request
     And body with value {"type":"metric","description":"Metric SLO using sli_specification","name":"{{ unique }}","sli_specification":{"count":{"good_events_formula":{"formula":"query1 - query2"},"bad_events_formula":{"formula":"query2"},"queries":[{"data_source":"metrics","name":"query1","query":"sum:httpservice.hits{*}.as_count()"},{"data_source":"metrics","name":"query2","query":"sum:httpservice.errors{*}.as_count()"}]}},"tags":["env:prod","type:count"],"thresholds":[{"target":99.0,"target_display":"99.0","timeframe":"7d","warning":99.5,"warning_display":"99.5"}],"timeframe":"7d","target_threshold":99.0,"warning_threshold":99.5}
@@ -61,7 +61,7 @@ Feature: Service Level Objectives
     And the response "data[0].sli_specification.count" has field "queries"
     And the response "data[0].sli_specification.count.queries" has length 2
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create a new metric SLO object using sli_specification returns "OK" response
     Given new "CreateSLO" request
     And body with value {"type":"metric","description":"Metric SLO using sli_specification","name":"{{ unique }}","sli_specification":{"count":{"good_events_formula":{"formula":"query1 - query2"},"total_events_formula":{"formula":"query1"},"queries":[{"data_source":"metrics","name":"query1","query":"sum:httpservice.hits{*}.as_count()"},{"data_source":"metrics","name":"query2","query":"sum:httpservice.errors{*}.as_count()"}]}},"tags":["env:prod","type:count"],"thresholds":[{"target":99.0,"target_display":"99.0","timeframe":"7d","warning":99.5,"warning_display":"99.5"}],"timeframe":"7d","target_threshold":99.0,"warning_threshold":99.5}
@@ -78,7 +78,7 @@ Feature: Service Level Objectives
     And the response "data[0].sli_specification.count.queries" has length 2
     And the response "data[0]" has field "query"
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create a time-slice SLO object returns "OK" response
     Given new "CreateSLO" request
     And body with value {"type":"time_slice","description":"string","name":"{{ unique }}","sli_specification":{"time_slice":{"query":{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"metrics","name":"query1","query":"trace.servlet.request{env:prod}"}]},"comparator":">","threshold":5}},"tags":["env:prod"],"thresholds":[{"target":97.0,"target_display":"97.0","timeframe":"7d","warning":98,"warning_display":"98.0"}],"timeframe":"7d","target_threshold":97.0,"warning_threshold":98}
@@ -88,14 +88,14 @@ Feature: Service Level Objectives
     And the response "data[0].target_threshold" is equal to 97.0
     And the response "data[0].warning_threshold" is equal to 98.0
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create an SLO object returns "Bad Request" response
     Given new "CreateSLO" request
     And body with value {"type":"monitor","name":"{{ unique }}","thresholds":[{"target":95.0,"target_display":"95.0","timeframe":"7d","warning":98,"warning_display":"98.0"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create an SLO object returns "OK" response
     Given new "CreateSLO" request
     And body with value {"type":"metric","description":"string","groups":["env:test","role:mysql"],"monitor_ids":[],"name":"{{ unique }}","query":{"denominator":"sum:httpservice.hits{!code:3xx}.as_count()","numerator":"sum:httpservice.hits{code:2xx}.as_count()"},"tags":["env:prod","app:core"],"thresholds":[{"target":97.0,"target_display":"97.0","timeframe":"7d","warning":98,"warning_display":"98.0"}],"timeframe":"7d","target_threshold":97.0,"warning_threshold":98}
@@ -105,21 +105,21 @@ Feature: Service Level Objectives
     And the response "data[0].target_threshold" is equal to 97.0
     And the response "data[0].warning_threshold" is equal to 98.0
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Delete an SLO returns "Conflict" response
     Given new "DeleteSLO" request
     And request contains "slo_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Delete an SLO returns "Not found" response
     Given new "DeleteSLO" request
     And request contains "slo_id" parameter with value "{{ unique_lower_alnum }}"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Delete an SLO returns "OK" response
     Given there is a valid "slo" in the system
     And new "DeleteSLO" request
@@ -128,21 +128,21 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data[0]" has the same value as "slo.data[0].id"
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get Corrections For an SLO returns "Bad Request" response
     Given new "GetSLOCorrections" request
     And request contains "slo_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get Corrections For an SLO returns "Not Found" response
     Given new "GetSLOCorrections" request
     And request contains "slo_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get Corrections For an SLO returns "OK" response
     Given there is a valid "slo" in the system
     And there is a valid "correction" for "slo"
@@ -152,19 +152,19 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get all SLOs returns "Bad Request" response
     Given new "ListSLOs" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get all SLOs returns "Not Found" response
     Given new "ListSLOs" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get all SLOs returns "OK" response
     Given there is a valid "slo" in the system
     And new "ListSLOs" request
@@ -174,7 +174,7 @@ Feature: Service Level Objectives
     And the response "data" has length 1
     And the response "data[0].id" has the same value as "slo.data[0].id"
 
-  @replay-only @skip-validation @team:DataDog/slo-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/slo-app @with-pagination
   Scenario: Get all SLOs returns "OK" response with pagination
     Given new "ListSLOs" request
     And request contains "limit" parameter with value 2
@@ -182,14 +182,14 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get an SLO's details returns "Not found" response
     Given new "GetSLO" request
     And request contains "slo_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get an SLO's details returns "OK" response
     Given there is a valid "slo" in the system
     And new "GetSLO" request
@@ -198,7 +198,7 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data.type" is equal to "metric"
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get an SLO's history returns "Bad Request" response
     Given new "GetSLOHistory" request
     And request contains "slo_id" parameter from "REPLACE.ME"
@@ -207,7 +207,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get an SLO's history returns "Not Found" response
     Given new "GetSLOHistory" request
     And request contains "slo_id" parameter from "REPLACE.ME"
@@ -216,7 +216,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get an SLO's history returns "OK" response
     Given there is a valid "slo" in the system
     And new "GetSLOHistory" request
@@ -227,13 +227,13 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data.series.res_type" is equal to "time_series"
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Search for SLOs returns "Bad Request" response
     Given new "SearchSLO" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/slo-app
+  @replay-only @team:ddoghq/slo-app
   Scenario: Search for SLOs returns "OK" response
     Given there is a valid "slo" in the system
     And new "SearchSLO" request
@@ -247,7 +247,7 @@ Feature: Service Level Objectives
     And the response "data.attributes.slos[0].data.attributes.overall_status[0].status" is equal to null
     And the response "data.attributes.slos[0].data.attributes.status.state" is equal to "no_data"
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Update an SLO returns "Bad Request" response
     Given new "UpdateSLO" request
     And there is a valid "slo" in the system
@@ -256,7 +256,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Update an SLO returns "Not Found" response
     Given new "UpdateSLO" request
     And request contains "slo_id" parameter from "REPLACE.ME"
@@ -264,7 +264,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Update an SLO returns "OK" response
     Given there is a valid "slo" in the system
     And new "UpdateSLO" request
diff --git a/features/v1/slack_integration.feature b/features/v1/slack_integration.feature
index 35686a8b43fc..18b665af5b40 100644
--- a/features/v1/slack_integration.feature
+++ b/features/v1/slack_integration.feature
@@ -9,7 +9,7 @@ Feature: Slack Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "SlackIntegration" API
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a Slack integration channel returns "Bad Request" response
     Given new "CreateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a Slack integration channel returns "Item Not Found" response
     Given new "CreateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a Slack integration channel returns "OK" response
     Given new "CreateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -33,7 +33,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a Slack integration channel returns "Bad Request" response
     Given new "GetSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -41,7 +41,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a Slack integration channel returns "Item Not Found" response
     Given new "GetSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -49,7 +49,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a Slack integration channel returns "OK" response
     Given new "GetSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -57,28 +57,28 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all channels in a Slack integration returns "Bad Request" response
     Given new "GetSlackIntegrationChannels" request
     And request contains "account_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all channels in a Slack integration returns "Item Not Found" response
     Given new "GetSlackIntegrationChannels" request
     And request contains "account_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all channels in a Slack integration returns "OK" response
     Given new "GetSlackIntegrationChannels" request
     And request contains "account_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Remove a Slack integration channel returns "Bad Request" response
     Given new "RemoveSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -86,7 +86,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Remove a Slack integration channel returns "Item Not Found" response
     Given new "RemoveSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -94,7 +94,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Remove a Slack integration channel returns "The channel was removed successfully." response
     Given new "RemoveSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -102,7 +102,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 204 The channel was removed successfully.
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a Slack integration channel returns "Bad Request" response
     Given new "UpdateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -111,7 +111,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a Slack integration channel returns "Item Not Found" response
     Given new "UpdateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
@@ -120,7 +120,7 @@ Feature: Slack Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a Slack integration channel returns "OK" response
     Given new "UpdateSlackIntegrationChannel" request
     And request contains "account_name" parameter from "REPLACE.ME"
diff --git a/features/v1/snapshots.feature b/features/v1/snapshots.feature
index 9e86ed6bb075..98bb20606c75 100644
--- a/features/v1/snapshots.feature
+++ b/features/v1/snapshots.feature
@@ -8,14 +8,14 @@ Feature: Snapshots
     And an instance of "Snapshots" API
     And new "GetGraphSnapshot" request
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Take graph snapshots returns "Bad Request" response
     Given request contains "start" parameter from "REPLACE.ME"
     And request contains "end" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @team:DataDog/monitor-app
+  @integration-only @team:ddoghq/monitor-app
   Scenario: Take graph snapshots returns "OK" response
     Given request contains "start" parameter with value {{ timestamp("now - 1d") }}
     And request contains "end" parameter with value {{ timestamp("now") }}
diff --git a/features/v1/synthetics.feature b/features/v1/synthetics.feature
index be5b3dfd07ce..d171f071815d 100644
--- a/features/v1/synthetics.feature
+++ b/features/v1/synthetics.feature
@@ -17,7 +17,7 @@ Feature: Synthetics
     And a valid "appKeyAuth" key in the system
     And an instance of "Synthetics" API
 
-  @replay-only @skip-validation @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @skip-validation @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Client is resilient to enum and oneOf deserialization errors
     Given new "ListTests" request
     When the request is sent
@@ -33,7 +33,7 @@ Feature: Synthetics
     And the response "tests[3].type" is equal to "A non existent test type"
     And the response "tests[4].config.request.method" is equal to "A non existent method"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a FIDO global variable returns "OK" response
     Given there is a valid "synthetics_api_test_multi_step" in the system
     And new "CreateGlobalVariable" request
@@ -42,7 +42,7 @@ Feature: Synthetics
     Then the response status is 200 OK
     And the response "name" is equal to "GLOBAL_VARIABLE_FIDO_PAYLOAD_{{ unique_upper_alnum }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a TOTP global variable returns "OK" response
     Given there is a valid "synthetics_api_test_multi_step" in the system
     And new "CreateGlobalVariable" request
@@ -51,14 +51,14 @@ Feature: Synthetics
     Then the response status is 200 OK
     And the response "name" is equal to "GLOBAL_VARIABLE_TOTP_PAYLOAD_{{ unique_upper_alnum }}"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a browser test returns "- JSON format is wrong" response
     Given new "CreateSyntheticsBrowserTest" request
     And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "secure": false, "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "bodyType": "text/plain", "callType": "unary", "certificate": {"cert": {}, "key": {}}, "certificateDomains": [], "files": [{}], "httpVersion": "http1", "mcpProtocolVersion": "2025-06-18", "proxy": {"url": "https://example.com"}, "service": "Greeter", "toolName": "search", "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"blockedRequestPatterns": [], "ci": {"executionRule": "blocking"}, "device_ids": ["chrome.laptop_large"], "httpVersion": "http1", "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "rumSettings": {"applicationId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "clientTokenId": 12345, "isEnabled": true}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a browser test returns "OK - Returns saved rumSettings." response
     Given new "CreateSyntheticsBrowserTest" request
     And body from file "synthetics_browser_test_payload_with_rum_settings.json"
@@ -69,7 +69,7 @@ Feature: Synthetics
     And the response "options.rumSettings.clientTokenId" is equal to 12345
     And the response "steps[0]" has field "public_id"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a browser test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsBrowserTest" request
     And body from file "synthetics_browser_test_payload.json"
@@ -81,14 +81,14 @@ Feature: Synthetics
     And the response "steps[0].alwaysExecute" is equal to true
     And the response "steps[0].exitIfSucceed" is equal to true
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a browser test returns "Test quota is reached" response
     Given new "CreateSyntheticsBrowserTest" request
     And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "secure": false, "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "bodyType": "text/plain", "callType": "unary", "certificate": {"cert": {}, "key": {}}, "certificateDomains": [], "files": [{}], "httpVersion": "http1", "mcpProtocolVersion": "2025-06-18", "proxy": {"url": "https://example.com"}, "service": "Greeter", "toolName": "search", "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"blockedRequestPatterns": [], "ci": {"executionRule": "blocking"}, "device_ids": ["chrome.laptop_large"], "httpVersion": "http1", "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "rumSettings": {"applicationId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "clientTokenId": 12345, "isEnabled": true}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
     When the request is sent
     Then the response status is 402 Test quota is reached
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a browser test with advanced scheduling options returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsBrowserTest" request
     And body from file "synthetics_browser_test_payload_with_advanced_scheduling.json"
@@ -100,7 +100,7 @@ Feature: Synthetics
     And the response "options.scheduling.timeframes[1].to" is equal to "16:00"
     And the response "options.scheduling.timezone" is equal to "America/New_York"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a global variable from test returns "OK" response
     Given there is a valid "synthetics_api_test_multi_step" in the system
     And new "CreateGlobalVariable" request
@@ -109,35 +109,35 @@ Feature: Synthetics
     Then the response status is 200 OK
     And the response "name" is equal to "GLOBAL_VARIABLE_FROM_TEST_PAYLOAD_{{ unique_upper_alnum }}"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a global variable returns "Conflict" response
     Given new "CreateGlobalVariable" request
     And body with value {"attributes": {"restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]}, "description": "Example description", "name": "MY_VARIABLE", "parse_test_options": {"field": "content-type", "localVariableName": "LOCAL_VARIABLE", "parser": {"type": "regex", "value": ".*"}, "type": "http_body"}, "parse_test_public_id": "abc-def-123", "tags": ["team:front", "test:workflow-1"], "value": {"secure": true, "value": "value"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a global variable returns "Invalid request" response
     Given new "CreateGlobalVariable" request
     And body with value {"attributes": {"restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]}, "description": "Example description", "name": "MY_VARIABLE", "parse_test_options": {"field": "content-type", "localVariableName": "LOCAL_VARIABLE", "parser": {"type": "regex", "value": ".*"}, "type": "http_body"}, "parse_test_public_id": "abc-def-123", "tags": ["team:front", "test:workflow-1"], "value": {"secure": true, "value": "value"}}
     When the request is sent
     Then the response status is 400 Invalid request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a global variable returns "OK" response
     Given new "CreateGlobalVariable" request
     And body with value {"attributes": {"restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]}, "description": "Example description", "name": "MY_VARIABLE", "parse_test_options": {"field": "content-type", "localVariableName": "LOCAL_VARIABLE", "parser": {"type": "regex", "value": ".*"}, "type": "http_body"}, "parse_test_public_id": "abc-def-123", "tags": ["team:front", "test:workflow-1"], "value": {"secure": true, "value": "value"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a mobile test returns "- JSON format is wrong" response
     Given new "CreateSyntheticsMobileTest" request
     And body with value {"config": {"variables": [{"name": "VARIABLE_NAME", "secure": false, "type": "text"}]}, "device_ids": ["chrome.laptop_large"], "message": "Notification message", "name": "Example test name", "options": {"bindings": [{"principals": [], "relation": "editor"}], "ci": {"executionRule": "blocking"}, "device_ids": ["synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16"], "mobileApplication": {"applicationId": "00000000-0000-0000-0000-aaaaaaaaaaaa", "referenceId": "00000000-0000-0000-0000-aaaaaaaaaaab", "referenceType": "latest"}, "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}, "tick_every": 300}, "status": "live", "steps": [{"name": "", "params": {"check": "equals", "direction": "up", "element": {"contextType": "native", "relativePosition": {}, "userLocator": {"values": [{"type": "accessibility-id"}]}}, "positions": [{}], "variable": {"example": "", "name": "VAR_NAME"}}, "publicId": "pub-lic-id0", "type": "assertElementContent"}], "tags": ["env:production"], "type": "mobile"}
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a mobile test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsMobileTest" request
     And body from file "synthetics_mobile_test_payload.json"
@@ -149,14 +149,14 @@ Feature: Synthetics
     And the response "options.mobileApplication.referenceId" is equal to "6115922a-5f5d-455e-bc7e-7955a57f3815"
     And the response "options.mobileApplication.referenceType" is equal to "version"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a mobile test returns "Test quota is reached" response
     Given new "CreateSyntheticsMobileTest" request
     And body with value {"config": {"variables": [{"name": "VARIABLE_NAME", "secure": false, "type": "text"}]}, "device_ids": ["chrome.laptop_large"], "message": "Notification message", "name": "Example test name", "options": {"bindings": [{"principals": [], "relation": "editor"}], "ci": {"executionRule": "blocking"}, "device_ids": ["synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16"], "mobileApplication": {"applicationId": "00000000-0000-0000-0000-aaaaaaaaaaaa", "referenceId": "00000000-0000-0000-0000-aaaaaaaaaaab", "referenceType": "latest"}, "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}, "tick_every": 300}, "status": "live", "steps": [{"name": "", "params": {"check": "equals", "direction": "up", "element": {"contextType": "native", "relativePosition": {}, "userLocator": {"values": [{"type": "accessibility-id"}]}}, "positions": [{}], "variable": {"example": "", "name": "VAR_NAME"}}, "publicId": "pub-lic-id0", "type": "assertElementContent"}], "tags": ["env:production"], "type": "mobile"}
     When the request is sent
     Then the response status is 402 Test quota is reached
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a multi-step api test with every type of basicAuth returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_test_multi_step_with_every_type_of_basic_auth.json"
@@ -171,7 +171,7 @@ Feature: Synthetics
     And the response "config.steps[5].request.basicAuth.type" is equal to "oauth-client"
     And the response "config.steps[6].request.basicAuth.type" is equal to "oauth-rop"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a multistep test with subtest returns "OK" response
     Given there is a valid "synthetics_api_test" in the system
     And new "CreateSyntheticsAPITest" request
@@ -179,7 +179,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a private location returns "OK" response
     Given there is a valid "role" in the system
     And new "CreatePrivateLocation" request
@@ -189,21 +189,21 @@ Feature: Synthetics
     And the response "private_location.name" is equal to "{{ unique }}"
     And the response "private_location.metadata.restricted_roles[0]" has the same value as "role.data.id"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a private location returns "Private locations are not activated for the user" response
     Given new "CreatePrivateLocation" request
     And body with value {"description": "Description of private location", "metadata": {"restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]}, "name": "New private location", "tags": ["team:front"]}
     When the request is sent
     Then the response status is 404 Private locations are not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a private location returns "Quota reached for private locations" response
     Given new "CreatePrivateLocation" request
     And body with value {"description": "Description of private location", "metadata": {"restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]}, "name": "New private location", "tags": ["team:front"]}
     When the request is sent
     Then the response status is 402 Quota reached for private locations
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API GRPC test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_grpc_test_payload.json"
@@ -211,7 +211,7 @@ Feature: Synthetics
     Then the response status is 200 OK - Returns the created test details.
     And the response "name" is equal to "{{ unique }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API HTTP test has bodyHash filled out
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_http_test_payload.json"
@@ -221,7 +221,7 @@ Feature: Synthetics
     And the response "config.assertions[6].target" is equal to "a"
     And the response "config.assertions[6].type" is equal to "bodyHash"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API HTTP test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_http_test_payload.json"
@@ -232,7 +232,7 @@ Feature: Synthetics
     And the response "config.assertions[7].code" is equal to "const hello = 'world';"
     And the response "options.bits_ai_auto_investigate" is equal to true
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API HTTP with oauth-rop test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_http_test_oauth_rop_payload.json"
@@ -240,7 +240,7 @@ Feature: Synthetics
     Then the response status is 200 OK - Returns the created test details.
     And the response "name" is equal to "{{ unique }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API SSL test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_ssl_test_payload.json"
@@ -249,28 +249,28 @@ Feature: Synthetics
     And the response "name" is equal to "{{ unique }}"
     And the response "options.ignore_certificate_validation" is equal to true
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test returns "- JSON format is wrong" response
     Given new "CreateSyntheticsAPITest" request
     And body with value {"config": {"assertions": [{"operator": "lessThan", "target": 1000, "type": "responseTime"}], "request": {"method": "GET", "url": "https://example.com"}}, "locations": ["aws:eu-west-3"], "message": "Notification message", "name": "Example test name", "options": {"blockedRequestPatterns": [], "ci": {"executionRule": "blocking"}, "device_ids": ["chrome.laptop_large"], "httpVersion": "http1", "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "rumSettings": {"applicationId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "clientTokenId": 12345, "isEnabled": true}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "subtype": "http", "tags": ["env:production"], "type": "api"}
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body with value {"config": {"assertions": [{"operator": "lessThan", "target": 1000, "type": "responseTime"}], "request": {"method": "GET", "url": "https://example.com"}}, "locations": ["aws:eu-west-3"], "message": "Notification message", "name": "Example test name", "options": {"blockedRequestPatterns": [], "ci": {"executionRule": "blocking"}, "device_ids": ["chrome.laptop_large"], "httpVersion": "http1", "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "rumSettings": {"applicationId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "clientTokenId": 12345, "isEnabled": true}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "subtype": "http", "tags": ["env:production"], "type": "api"}
     When the request is sent
     Then the response status is 200 OK - Returns the created test details.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test returns "Test quota is reached" response
     Given new "CreateSyntheticsAPITest" request
     And body with value {"config": {"assertions": [{"operator": "lessThan", "target": 1000, "type": "responseTime"}], "request": {"method": "GET", "url": "https://example.com"}}, "locations": ["aws:eu-west-3"], "message": "Notification message", "name": "Example test name", "options": {"blockedRequestPatterns": [], "ci": {"executionRule": "blocking"}, "device_ids": ["chrome.laptop_large"], "httpVersion": "http1", "monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "rumSettings": {"applicationId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "clientTokenId": 12345, "isEnabled": true}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "subtype": "http", "tags": ["env:production"], "type": "api"}
     When the request is sent
     Then the response status is 402 Test quota is reached
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test with MCP steps returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_test_mcp_payload.json"
@@ -286,7 +286,7 @@ Feature: Synthetics
     And the response "config.steps[2].request.callType" is equal to "tool_call"
     And the response "config.steps[2].request.toolName" is equal to "search"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test with UDP subtype returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_test_udp_payload.json"
@@ -294,7 +294,7 @@ Feature: Synthetics
     Then the response status is 200 OK - Returns the created test details.
     And the response "name" is equal to "{{ unique }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test with WEBSOCKET subtype returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_test_websocket_payload.json"
@@ -302,7 +302,7 @@ Feature: Synthetics
     Then the response status is 200 OK - Returns the created test details.
     And the response "name" is equal to "{{ unique }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test with a file payload returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_http_test_with_file_payload.json"
@@ -314,7 +314,7 @@ Feature: Synthetics
     And the response "config.request.files[0].type" is equal to "file type"
     And the response "config.request.files[0]" has field "bucketKey"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create an API test with multi subtype returns "OK - Returns the created test details." response
     Given new "CreateSyntheticsAPITest" request
     And body from file "synthetics_api_test_multi_step_payload.json"
@@ -352,56 +352,56 @@ Feature: Synthetics
     And the response "config.steps[8].subtype" is equal to "udp"
     And the response "config.steps[8].request.host" is equal to "8.8.8.8"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a global variable returns "JSON format is wrong" response
     Given new "DeleteGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a global variable returns "Not found" response
     Given new "DeleteGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a global variable returns "OK" response
     Given new "DeleteGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a private location returns "- Private locations are not activated for the user" response
     Given new "DeletePrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Private locations are not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a private location returns "OK" response
     Given new "DeletePrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete tests returns "- JSON format is wrong" response
     Given new "DeleteTests" request
     And body with value {"force_delete_dependencies": false, "public_ids": []}
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete tests returns "- Tests to be deleted can't be found" response
     Given new "DeleteTests" request
     And body with value {"force_delete_dependencies": false, "public_ids": []}
     When the request is sent
     Then the response status is 404 - Tests to be deleted can't be found
 
-  @skip @team:DataDog/synthetics-orchestrating-managing
+  @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete tests returns "OK." response
     Given there is a valid "synthetics_api_test" in the system
     And new "DeleteTests" request
@@ -410,7 +410,7 @@ Feature: Synthetics
     Then the response status is 200 OK.
     And the response "deleted_tests[0].public_id" is equal to "{{ synthetics_api_test.public_id }}"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a Mobile test returns "OK" response
     Given there is a valid "synthetics_mobile_test" in the system
     And new "UpdateMobileTest" request
@@ -424,7 +424,7 @@ Feature: Synthetics
     And the response "options.mobileApplication.referenceId" is equal to "6115922a-5f5d-455e-bc7e-7955a57f3815"
     And the response "options.mobileApplication.referenceType" is equal to "version"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a browser test returns "- JSON format is wrong" response
     Given new "UpdateBrowserTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -432,7 +432,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a browser test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "UpdateBrowserTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -440,7 +440,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a browser test returns "OK" response
     Given new "UpdateBrowserTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -448,7 +448,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a global variable returns "Invalid request" response
     Given new "EditGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
@@ -456,7 +456,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 Invalid request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a global variable returns "OK" response
     Given new "EditGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
@@ -464,7 +464,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a mobile test returns "- JSON format is wrong" response
     Given new "UpdateMobileTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -472,7 +472,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a mobile test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "UpdateMobileTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -480,7 +480,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a mobile test returns "OK" response
     Given new "UpdateMobileTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -488,7 +488,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a private location returns "- Private locations are not activated for the user" response
     Given new "UpdatePrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
@@ -496,7 +496,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Private locations are not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a private location returns "OK" response
     Given new "UpdatePrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
@@ -504,7 +504,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit an API test returns "- JSON format is wrong" response
     Given new "UpdateAPITest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -512,7 +512,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit an API test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "UpdateAPITest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -520,7 +520,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit an API test returns "OK" response
     Given there is a valid "synthetics_api_test" in the system
     And new "UpdateAPITest" request
@@ -530,14 +530,14 @@ Feature: Synthetics
     Then the response status is 200 OK
     And the response "name" is equal to "{{ synthetics_api_test.name }}-updated"
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Fetch uptime for multiple tests returns "- JSON format is wrong" response
     Given new "FetchUptimes" request
     And body with value {"from_ts": 0, "public_ids": [], "to_ts": 0}
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Fetch uptime for multiple tests returns "OK." response
     Given new "FetchUptimes" request
     And body with value {"from_ts": 1726041488, "public_ids": ["p8m-9gw-nte"], "to_ts": 1726055954}
@@ -547,7 +547,7 @@ Feature: Synthetics
     And the response "[0].overall.uptime" is equal to 83.05682373046875
     And the response "[0].overall.history" has length 2
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Mobile test returns "OK" response
     Given there is a valid "synthetics_mobile_test" in the system
     And new "GetMobileTest" request
@@ -561,7 +561,7 @@ Feature: Synthetics
     And the response "options.mobileApplication.referenceType" is equal to "version"
     And the response "type" is equal to "mobile"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test result returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetBrowserTestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -569,7 +569,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test result returns "OK" response
     Given new "GetBrowserTestResult" request
     And request contains "public_id" parameter with value "2yy-sem-mjh"
@@ -579,28 +579,28 @@ Feature: Synthetics
     And the response "result_id" is equal to "5671719892074090418"
     And the response "probe_dc" is equal to "aws:ca-central-1"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetBrowserTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test returns "OK" response
     Given new "GetBrowserTest" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test's latest results summaries returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetBrowserTestLatestResults" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test's latest results summaries returns "OK" response
     Given new "GetBrowserTestLatestResults" request
     And request contains "public_id" parameter with value "2yy-sem-mjh"
@@ -610,75 +610,75 @@ Feature: Synthetics
     And the response "results[0].status" is equal to 0
     And the response "results[0].probe_dc" is equal to "aws:ca-central-1"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a global variable returns "Not found" response
     Given new "GetGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a global variable returns "OK" response
     Given new "GetGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a mobile test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetMobileTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a mobile test returns "OK" response
     Given new "GetMobileTest" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a private location returns "- Synthetic private locations are not activated for the user" response
     Given new "GetPrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic private locations are not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a private location returns "OK" response
     Given new "GetPrivateLocation" request
     And request contains "location_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test configuration returns "- Synthetic is not activated for the user" response
     Given new "GetTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test configuration returns "OK" response
     Given new "GetTest" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get all global variables returns "OK" response
     Given new "ListGlobalVariables" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get all locations (public and private) returns "OK" response
     Given new "ListLocations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test result returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetAPITestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -686,7 +686,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test result returns "OK" response
     Given new "GetAPITestResult" request
     And request contains "public_id" parameter with value "hwb-332-3xe"
@@ -696,7 +696,7 @@ Feature: Synthetics
     And the response "result_id" is equal to "3420446318379485707"
     And the response "probe_dc" is equal to "aws:us-west-1"
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test result returns result with failure object
     Given there is a "synthetics_api_test_with_wrong_dns" in the system
     And the "synthetics_api_test_with_wrong_dns" is triggered
@@ -708,28 +708,28 @@ Feature: Synthetics
     And the response "result.failure.code" is equal to "DNS"
     And the response "result.failure.message" is equal to "Error during DNS resolution of hostname app.datadfoghq.com (ENOTFOUND)."
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "GetAPITest" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test returns "OK" response
     Given new "GetAPITest" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test's latest results summaries returns "- Synthetic is not activated for the user" response
     Given new "GetAPITestLatestResults" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 - Synthetic is not activated for the user
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get an API test's latest results summaries returns "OK" response
     Given new "GetAPITestLatestResults" request
     And request contains "public_id" parameter with value "hwb-332-3xe"
@@ -739,33 +739,33 @@ Feature: Synthetics
     And the response "results[0].status" is equal to 0
     And the response "results[0].probe_dc" is equal to "aws:us-west-1"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get details of batch returns "Batch does not exist." response
     Given new "GetSyntheticsCIBatch" request
     And request contains "batch_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Batch does not exist.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get details of batch returns "OK" response
     Given new "GetSyntheticsCIBatch" request
     And request contains "batch_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get the default locations returns "OK" response
     Given new "GetSyntheticsDefaultLocations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get the list of all Synthetic tests returns "OK - Returns the list of all Synthetic tests." response
     Given new "ListTests" request
     When the request is sent
     Then the response status is 200 OK - Returns the list of all Synthetic tests.
 
-  @replay-only @skip-validation @team:DataDog/synthetics-orchestrating-managing @with-pagination
+  @replay-only @skip-validation @team:ddoghq/synthetics-orchestrating-managing @with-pagination
   Scenario: Get the list of all Synthetic tests returns "OK - Returns the list of all Synthetic tests." response with pagination
     Given new "ListTests" request
     And request contains "page_size" parameter with value 2
@@ -773,19 +773,19 @@ Feature: Synthetics
     Then the response status is 200 OK - Returns the list of all Synthetic tests.
     And the response has 3 items
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get the list of all Synthetic tests returns "Synthetic Monitoring is not activated for the user." response
     Given new "ListTests" request
     When the request is sent
     Then the response status is 404 Synthetic Monitoring is not activated for the user.
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get the list of default locations returns "OK" response
     Given new "GetSyntheticsDefaultLocations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a Synthetic test returns "- JSON format is wrong" response
     Given new "PatchTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -793,7 +793,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 - JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a Synthetic test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "PatchTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -801,7 +801,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a Synthetic test returns "OK" response
     Given there is a valid "synthetics_api_test" in the system
     And new "PatchTest" request
@@ -810,7 +810,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Pause or start a test returns "- Synthetic Monitoring is not activated for the user" response
     Given new "UpdateTestPauseStatus" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -818,7 +818,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 - Synthetic Monitoring is not activated for the user
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Pause or start a test returns "JSON format is wrong." response
     Given new "UpdateTestPauseStatus" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -826,7 +826,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 JSON format is wrong.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Pause or start a test returns "OK - Returns a boolean indicating if the update was successful." response
     Given new "UpdateTestPauseStatus" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -834,26 +834,26 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK - Returns a boolean indicating if the update was successful.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Search Synthetic tests returns "Not found" response
     Given new "SearchTests" request
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Search Synthetic tests returns "OK - Returns the list of Synthetic tests matching the search." response
     Given new "SearchTests" request
     When the request is sent
     Then the response status is 200 OK - Returns the list of Synthetic tests matching the search.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Trigger Synthetic tests returns "Bad Request" response
     Given new "TriggerTests" request
     And body with value {"tests": [{"metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Trigger Synthetic tests returns "OK" response
     Given there is a valid "synthetics_api_test" in the system
     And new "TriggerTests" request
@@ -863,14 +863,14 @@ Feature: Synthetics
     And the response "triggered_check_ids" array contains value "{{ synthetics_api_test.public_id }}"
     And the response "results" has item with field "public_id" with value "{{ synthetics_api_test.public_id }}"
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Trigger tests from CI/CD pipelines returns "JSON format is wrong" response
     Given new "TriggerCITests" request
     And body with value {"tests": [{"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "deviceIds": ["chrome.laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
     When the request is sent
     Then the response status is 400 JSON format is wrong
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Trigger tests from CI/CD pipelines returns "OK" response
     Given new "TriggerCITests" request
     And body with value {"tests": [{"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "deviceIds": ["chrome.laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
diff --git a/features/v1/tags.feature b/features/v1/tags.feature
index f0e8881a275d..1c562fa38964 100644
--- a/features/v1/tags.feature
+++ b/features/v1/tags.feature
@@ -17,7 +17,7 @@ Feature: Tags
     And a valid "appKeyAuth" key in the system
     And an instance of "Tags" API
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Add tags to a host returns "Created" response
     Given new "CreateHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Tags
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Add tags to a host returns "Not Found" response
     Given new "CreateHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
@@ -33,47 +33,47 @@ Feature: Tags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get All Host Tags returns "Not Found" response
     Given new "ListHostTags" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get All Host Tags returns "OK" response
     Given new "ListHostTags" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get Host Tags returns "Not Found" response
     Given new "GetHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Get Host Tags returns "OK" response
     Given new "GetHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Remove host tags returns "Not Found" response
     Given new "DeleteHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Remove host tags returns "OK" response
     Given new "DeleteHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Update host tags returns "Not Found" response
     Given new "UpdateHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
@@ -81,7 +81,7 @@ Feature: Tags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-hosts
+  @generated @skip @team:ddoghq/redapl-hosts
   Scenario: Update host tags returns "OK" response
     Given new "UpdateHostTags" request
     And request contains "host_name" parameter from "REPLACE.ME"
diff --git a/features/v1/usage_metering.feature b/features/v1/usage_metering.feature
index 9f1d1b4afcb6..4977369c447c 100644
--- a/features/v1/usage_metering.feature
+++ b/features/v1/usage_metering.feature
@@ -14,32 +14,32 @@ Feature: Usage Metering
     And a valid "appKeyAuth" key in the system
     And an instance of "UsageMetering" API
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get all custom metrics by hourly average returns "Bad Request" response
     Given new "GetUsageTopAvgMetrics" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get all custom metrics by hourly average returns "OK" response
     Given new "GetUsageTopAvgMetrics" request
     And request contains "day" parameter with value "{{ timeISO('now - 3d') }}"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get billable usage across your account returns "Bad Request" response
     Given new "GetUsageBillableSummary" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get billable usage across your account returns "OK" response
     Given new "GetUsageBillableSummary" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly logs usage by retention returns "Bad Request" response
     Given new "GetUsageLogsByRetention" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -47,7 +47,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly logs usage by retention returns "OK" response
     Given new "GetUsageLogsByRetention" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -55,7 +55,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage attribution returns "Bad Request" response
     Given new "GetHourlyUsageAttribution" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -63,7 +63,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get hourly usage attribution returns "OK" response
     Given new "GetHourlyUsageAttribution" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -71,7 +71,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for CI visibility returns "Bad Request" response
     Given new "GetUsageCIApp" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -79,7 +79,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for CI visibility returns "OK" response
     Given new "GetUsageCIApp" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -87,21 +87,21 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for CSM Pro returns "Bad Request" response
     Given new "GetUsageCloudSecurityPostureManagement" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for CSM Pro returns "OK" response
     Given new "GetUsageCloudSecurityPostureManagement" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Database Monitoring returns "OK" response
     Given new "GetUsageDBM" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -109,7 +109,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Fargate returns "Bad Request" response
     Given new "GetUsageFargate" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -117,7 +117,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Fargate returns "OK" response
     Given new "GetUsageFargate" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -125,7 +125,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for IoT returns "Bad Request" response
     Given new "GetUsageInternetOfThings" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -133,7 +133,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for IoT returns "OK" response
     Given new "GetUsageInternetOfThings" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -141,7 +141,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Lambda returns "Bad Request" response
     Given new "GetUsageLambda" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -149,7 +149,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Lambda returns "OK" response
     Given new "GetUsageLambda" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -157,7 +157,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Logs by Index returns "Bad Request" response
     Given new "GetUsageLogsByIndex" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -165,7 +165,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Logs by Index returns "OK" response
     Given new "GetUsageLogsByIndex" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -173,7 +173,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Logs returns "Bad Request" response
     Given new "GetUsageLogs" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -181,7 +181,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Logs returns "OK" response
     Given new "GetUsageLogs" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -189,7 +189,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Network Flows returns "Bad Request" response
     Given new "GetUsageNetworkFlows" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -197,7 +197,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Network Flows returns "OK" response
     Given new "GetUsageNetworkFlows" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -205,7 +205,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Network Hosts returns "Bad Request" response
     Given new "GetUsageNetworkHosts" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -213,7 +213,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Network Hosts returns "OK" response
     Given new "GetUsageNetworkHosts" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -221,7 +221,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Online Archive returns "Bad Request" response
     Given new "GetUsageOnlineArchive" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -229,7 +229,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Online Archive returns "OK" response
     Given new "GetUsageOnlineArchive" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -237,7 +237,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM Sessions returns "Bad Request" response
     Given new "GetUsageRumSessions" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -245,7 +245,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM Sessions returns "OK" response
     Given new "GetUsageRumSessions" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -253,7 +253,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM Units returns "OK" response
     Given new "GetUsageRumUnits" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -261,35 +261,35 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM sessions returns "Bad Request" response
     Given new "GetUsageRumSessions" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM sessions returns "OK" response
     Given new "GetUsageRumSessions" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM units returns "Bad Request" response
     Given new "GetUsageRumUnits" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for RUM units returns "OK" response
     Given new "GetUsageRumUnits" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for SNMP devices returns "Bad Request" response
     Given new "GetUsageSNMP" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -297,7 +297,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for SNMP devices returns "OK" response
     Given new "GetUsageSNMP" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -305,7 +305,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Sensitive Data Scanner returns "OK" response
     Given new "GetUsageSDS" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -313,7 +313,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Synthetics API Checks returns "Bad Request" response
     Given new "GetUsageSyntheticsAPI" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -321,7 +321,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Synthetics API Checks returns "OK" response
     Given new "GetUsageSyntheticsAPI" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -329,7 +329,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Synthetics Browser Checks returns "Bad Request" response
     Given new "GetUsageSyntheticsBrowser" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -337,7 +337,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Synthetics Browser Checks returns "OK" response
     Given new "GetUsageSyntheticsBrowser" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -345,7 +345,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for analyzed logs returns "Bad Request" response
     Given new "GetUsageAnalyzedLogs" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -353,7 +353,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for analyzed logs returns "OK" response
     Given new "GetUsageAnalyzedLogs" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -361,14 +361,14 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for audit logs returns "Bad Request" response
     Given new "GetUsageAuditLogs" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for audit logs returns "OK" response
     Given new "GetUsageAuditLogs" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -376,14 +376,14 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for cloud workload security returns "Bad Request" response
     Given new "GetUsageCWS" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for cloud workload security returns "OK" response
     Given new "GetUsageCWS" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -391,7 +391,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for custom metrics returns "Bad Request" response
     Given new "GetUsageTimeseries" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -399,7 +399,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for custom metrics returns "OK" response
     Given new "GetUsageTimeseries" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -407,21 +407,21 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for database monitoring returns "Bad Request" response
     Given new "GetUsageDBM" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for database monitoring returns "OK" response
     Given new "GetUsageDBM" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for hosts and containers returns "Bad Request" response
     Given new "GetUsageHosts" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -429,7 +429,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for hosts and containers returns "OK" response
     Given new "GetUsageHosts" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -437,7 +437,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for incident management returns "Bad Request" response
     Given new "GetIncidentManagement" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -445,7 +445,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for incident management returns "OK" response
     Given new "GetIncidentManagement" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -453,7 +453,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for indexed spans returns "Bad Request" response
     Given new "GetUsageIndexedSpans" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -461,7 +461,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for indexed spans returns "OK" response
     Given new "GetUsageIndexedSpans" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -469,7 +469,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for ingested spans returns "Bad Request" response
     Given new "GetIngestedSpans" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -477,7 +477,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for ingested spans returns "OK" response
     Given new "GetIngestedSpans" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -485,63 +485,63 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for logs by index returns "Bad Request" response
     Given new "GetUsageLogsByIndex" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for logs by index returns "OK" response
     Given new "GetUsageLogsByIndex" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for logs returns "Bad Request" response
     Given new "GetUsageLogs" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for logs returns "OK" response
     Given new "GetUsageLogs" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for network hosts returns "Bad Request" response
     Given new "GetUsageNetworkHosts" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for network hosts returns "OK" response
     Given new "GetUsageNetworkHosts" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for online archive returns "Bad Request" response
     Given new "GetUsageOnlineArchive" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for online archive returns "OK" response
     Given new "GetUsageOnlineArchive" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for profiled hosts returns "Bad Request" response
     Given new "GetUsageProfiling" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -549,7 +549,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for profiled hosts returns "OK" response
     Given new "GetUsageProfiling" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -557,63 +557,63 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for sensitive data scanner returns "Bad Request" response
     Given new "GetUsageSDS" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for sensitive data scanner returns "OK" response
     Given new "GetUsageSDS" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics API checks returns "Bad Request" response
     Given new "GetUsageSyntheticsAPI" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics API checks returns "OK" response
     Given new "GetUsageSyntheticsAPI" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics browser checks returns "Bad Request" response
     Given new "GetUsageSyntheticsBrowser" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics browser checks returns "OK" response
     Given new "GetUsageSyntheticsBrowser" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics checks returns "Bad Request" response
     Given new "GetUsageSynthetics" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for synthetics checks returns "OK" response
     Given new "GetUsageSynthetics" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get mobile hourly usage for RUM Sessions returns "OK" response
     Given new "GetUsageRumSessions" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -622,7 +622,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get monthly usage attribution returns "Bad Request" response
     Given new "GetMonthlyUsageAttribution" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 3d') }}"
@@ -630,7 +630,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get monthly usage attribution returns "OK" response
     Given new "GetMonthlyUsageAttribution" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 3d') }}"
@@ -638,68 +638,68 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get specified daily custom reports returns "Not Found" response
     Given new "GetSpecifiedDailyCustomReports" request
     And request contains "report_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip @team:DataDog/billing-hub
+  @replay-only @skip @team:ddoghq/billing-hub
   Scenario: Get specified daily custom reports returns "OK" response
     Given new "GetSpecifiedDailyCustomReports" request
     And request contains "report_id" parameter with value "2022-03-20"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get specified monthly custom reports returns "Bad Request" response
     Given new "GetSpecifiedMonthlyCustomReports" request
     And request contains "report_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get specified monthly custom reports returns "Not Found" response
     Given new "GetSpecifiedMonthlyCustomReports" request
     And request contains "report_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip @team:DataDog/billing-hub
+  @replay-only @skip @team:ddoghq/billing-hub
   Scenario: Get specified monthly custom reports returns "OK" response
     Given new "GetSpecifiedMonthlyCustomReports" request
     And request contains "report_id" parameter with value "2021-05-01"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get the list of available daily custom reports returns "OK" response
     Given new "GetDailyCustomReports" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get the list of available monthly custom reports returns "OK" response
     Given new "GetMonthlyCustomReports" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get usage across your account returns "Bad Request" response
     Given new "GetUsageSummary" request
     And request contains "start_month" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get usage across your account returns "OK" response
     Given new "GetUsageSummary" request
     And request contains "start_month" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Paginate monthly usage attribution
     Given there is a valid "monthly_usage_attribution" response
     And new "GetMonthlyUsageAttribution" request
@@ -709,14 +709,14 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: get hourly usage for network flows returns "Bad Request" response
     Given new "GetUsageNetworkFlows" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: get hourly usage for network flows returns "OK" response
     Given new "GetUsageNetworkFlows" request
     And request contains "start_hr" parameter from "REPLACE.ME"
diff --git a/features/v1/users.feature b/features/v1/users.feature
index 6be22f2fd0cf..5e7f5b5bab4d 100644
--- a/features/v1/users.feature
+++ b/features/v1/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @replay-only @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/features/v1/webhooks_integration.feature b/features/v1/webhooks_integration.feature
index e58d93b78169..295fe0971baa 100644
--- a/features/v1/webhooks_integration.feature
+++ b/features/v1/webhooks_integration.feature
@@ -10,42 +10,42 @@ Feature: Webhooks Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "WebhooksIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a custom variable returns "Bad Request" response
     Given new "CreateWebhooksIntegrationCustomVariable" request
     And body with value {"is_secret": true, "name": "CUSTOM_VARIABLE_NAME", "value": "CUSTOM_VARIABLE_VALUE"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Create a custom variable returns "OK" response
     Given new "CreateWebhooksIntegrationCustomVariable" request
     And body with value {"is_secret": true, "name": "{{ unique_upper_alnum }}", "value": "CUSTOM_VARIABLE_VALUE"}
     When the request is sent
     Then the response status is 201 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a webhooks integration returns "Bad Request" response
     Given new "CreateWebhooksIntegration" request
     And body with value {"custom_headers": null, "encode_as": "json", "name": "WEBHOOK_NAME", "payload": null, "url": "https://example.com/webhook"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Create a webhooks integration returns "OK" response
     Given new "CreateWebhooksIntegration" request
     And body with value {"name": "{{ unique }}", "url": "https://example.com/webhook"}
     When the request is sent
     Then the response status is 201 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a custom variable returns "Item Not Found" response
     Given new "DeleteWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Delete a custom variable returns "OK" response
     Given there is a valid "webhook_custom_variable" in the system
     And new "DeleteWebhooksIntegrationCustomVariable" request
@@ -53,14 +53,14 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a webhook returns "Item Not Found" response
     Given new "DeleteWebhooksIntegration" request
     And request contains "webhook_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Delete a webhook returns "OK" response
     Given there is a valid "webhook" in the system
     And new "DeleteWebhooksIntegration" request
@@ -68,42 +68,42 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a custom variable returns "Bad Request" response
     Given new "GetWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a custom variable returns "Item Not Found" response
     Given new "GetWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a custom variable returns "OK" response
     Given new "GetWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a webhook integration returns "Bad Request" response
     Given new "GetWebhooksIntegration" request
     And request contains "webhook_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a webhook integration returns "Item Not Found" response
     Given new "GetWebhooksIntegration" request
     And request contains "webhook_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Get a webhook integration returns "OK" response
     Given there is a valid "webhook" in the system
     And new "GetWebhooksIntegration" request
@@ -111,7 +111,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a custom variable returns "Bad Request" response
     Given new "UpdateWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
@@ -119,7 +119,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a custom variable returns "Item Not Found" response
     Given new "UpdateWebhooksIntegrationCustomVariable" request
     And request contains "custom_variable_name" parameter from "REPLACE.ME"
@@ -127,7 +127,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Update a custom variable returns "OK" response
     Given there is a valid "webhook_custom_variable" in the system
     And new "UpdateWebhooksIntegrationCustomVariable" request
@@ -136,7 +136,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a webhook returns "Bad Request" response
     Given new "UpdateWebhooksIntegration" request
     And request contains "webhook_name" parameter from "REPLACE.ME"
@@ -144,7 +144,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a webhook returns "Item Not Found" response
     Given new "UpdateWebhooksIntegration" request
     And request contains "webhook_name" parameter from "REPLACE.ME"
@@ -152,7 +152,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 404 Item Not Found
 
-  @skip-terraform-config @team:Datadog/collaboration-integrations
+  @skip-terraform-config @team:ddoghq/collaboration-integrations
   Scenario: Update a webhook returns "OK" response
     Given there is a valid "webhook" in the system
     And new "UpdateWebhooksIntegration" request
diff --git a/features/v2/action_connection.feature b/features/v2/action_connection.feature
index 759615a8fd63..4779f0cb2aa6 100644
--- a/features/v2/action_connection.feature
+++ b/features/v2/action_connection.feature
@@ -14,28 +14,28 @@ Feature: Action Connection
     And a valid "appKeyAuth" key in the system
     And an instance of "ActionConnection" API
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Create a new Action Connection returns "Bad Request" response
     Given new "CreateActionConnection" request
     And body with value {"data":{"type":"action_connection","attributes":{"name":"Cassette Connection","integration":{"type":"AWS","credentials":{"type":"AWSAssumeRole","role":"MyRoleUpdated","account_id":"1"}}}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Create a new Action Connection returns "Successfully created Action Connection" response
     Given new "CreateActionConnection" request
     And body with value {"data":{"type":"action_connection","attributes":{"name":"Cassette Connection {{ unique_lower_alnum }}","integration":{"type":"AWS","credentials":{"type":"AWSAssumeRole","role":"MyRoleUpdated","account_id":"123456789123"}}}}}
     When the request is sent
     Then the response status is 201 Successfully created Action Connection
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Delete an existing Action Connection returns "Not Found" response
     Given new "DeleteActionConnection" request
     And request contains "connection_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Delete an existing Action Connection returns "The resource was deleted successfully." response
     Given there is a valid "action_connection" in the system
     And new "DeleteActionConnection" request
@@ -43,96 +43,96 @@ Feature: Action Connection
     When the request is sent
     Then the response status is 204 The resource was deleted successfully.
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Action Connection returns "Bad Request" response
     Given new "GetActionConnection" request
     And request contains "connection_id" parameter with value "bad-format"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Action Connection returns "Not Found" response
     Given new "GetActionConnection" request
     And request contains "connection_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Action Connection returns "Successfully get Action Connection" response
     Given new "GetActionConnection" request
     And request contains "connection_id" parameter with value "cb460d51-3c88-4e87-adac-d47131d0423d"
     When the request is sent
     Then the response status is 200 Successfully get Action Connection
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing App Key Registration returns "Bad request" response
     Given new "GetAppKeyRegistration" request
     And request contains "app_key_id" parameter with value "not_valid_app_key_id"
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing App Key Registration returns "Not found" response
     Given new "GetAppKeyRegistration" request
     And request contains "app_key_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing App Key Registration returns "OK" response
     Given new "GetAppKeyRegistration" request
     And request contains "app_key_id" parameter with value "b7feea52-994e-4714-a100-1bd9eff5aee1"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/workflow-automation-dev
+  @skip @team:ddoghq/workflow-automation-dev
   Scenario: List App Key Registrations returns "Bad request" response
     Given new "ListAppKeyRegistrations" request
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: List App Key Registrations returns "OK" response
     Given new "ListAppKeyRegistrations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Register a new App Key returns "Bad request" response
     Given new "RegisterAppKey" request
     And request contains "app_key_id" parameter with value "not_valid_app_key_id"
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Register a new App Key returns "Created" response
     Given new "RegisterAppKey" request
     And request contains "app_key_id" parameter with value "b7feea52-994e-4714-a100-1bd9eff5aee1"
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Unregister an App Key returns "Bad request" response
     Given new "UnregisterAppKey" request
     And request contains "app_key_id" parameter with value "not_valid_app_key_id"
     When the request is sent
     Then the response status is 400 Bad request
 
-  @skip @team:DataDog/workflow-automation-dev
+  @skip @team:ddoghq/workflow-automation-dev
   Scenario: Unregister an App Key returns "No Content" response
     Given new "UnregisterAppKey" request
     And request contains "app_key_id" parameter with value "57cc69ae-9214-4ecc-8df8-43ecc1d92d99"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Unregister an App Key returns "Not found" response
     Given new "UnregisterAppKey" request
     And request contains "app_key_id" parameter with value "57cc69ae-9214-4ecc-8df8-43ecc1d92d99"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Action Connection returns "Bad Request" response
     Given new "UpdateActionConnection" request
     And request contains "connection_id" parameter with value "cb460d51-3c88-4e87-adac-d47131d0423d"
@@ -140,7 +140,7 @@ Feature: Action Connection
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Action Connection returns "Not Found" response
     Given new "UpdateActionConnection" request
     And request contains "connection_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
@@ -148,7 +148,7 @@ Feature: Action Connection
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Action Connection returns "Successfully updated Action Connection" response
     Given new "UpdateActionConnection" request
     And request contains "connection_id" parameter with value "cb460d51-3c88-4e87-adac-d47131d0423d"
diff --git a/features/v2/actions_datastores.feature b/features/v2/actions_datastores.feature
index a8cd02fe0529..904369d70590 100644
--- a/features/v2/actions_datastores.feature
+++ b/features/v2/actions_datastores.feature
@@ -8,7 +8,7 @@ Feature: Actions Datastores
     And a valid "appKeyAuth" key in the system
     And an instance of "ActionsDatastores" API
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Bulk delete datastore items returns "Bad Request" response
     Given new "BulkDeleteDatastoreItems" request
     And there is a valid "datastore" in the system
@@ -17,7 +17,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Bulk delete datastore items returns "Not Found" response
     Given new "BulkDeleteDatastoreItems" request
     And request contains "datastore_id" parameter with value "c1eb5bb8-726a-4e59-9a61-ccbb26f95329"
@@ -25,7 +25,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Bulk delete datastore items returns "OK" response
     Given new "BulkDeleteDatastoreItems" request
     And there is a valid "datastore" in the system
@@ -35,7 +35,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Bulk write datastore items returns "Bad Request" response
     Given new "BulkWriteDatastoreItems" request
     And there is a valid "datastore" in the system
@@ -46,7 +46,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "item key missing or invalid"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Bulk write datastore items returns "Not Found" response
     Given new "BulkWriteDatastoreItems" request
     And request contains "datastore_id" parameter with value "70b87c26-886f-497a-bd9d-09f53bc9b40c"
@@ -56,7 +56,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore not found"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Bulk write datastore items returns "OK" response
     Given new "BulkWriteDatastoreItems" request
     And there is a valid "datastore" in the system
@@ -66,7 +66,7 @@ Feature: Actions Datastores
     Then the response status is 200 OK
     And the response "data" has length 2
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create datastore returns "Bad Request" response
     Given new "CreateDatastore" request
     And body with value {"data": {"attributes": {"name": "datastore-name", "primary_column_name": "0invalid_key"}, "type": "datastores"}}
@@ -75,14 +75,14 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore configuration invalid"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create datastore returns "OK" response
     Given new "CreateDatastore" request
     And body with value {"data": {"attributes": {"name": "datastore-name", "primary_column_name": "primaryKey"}, "type": "datastores"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Delete datastore item returns "Bad Request" response
     Given new "DeleteDatastoreItem" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -92,7 +92,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "invalid path parameter"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Delete datastore item returns "Not Found" response
     Given new "DeleteDatastoreItem" request
     And request contains "datastore_id" parameter with value "70b87c26-886f-497a-bd9d-09f53bc9b40c"
@@ -102,7 +102,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore not found"
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Delete datastore item returns "OK" response
     Given new "DeleteDatastoreItem" request
     And there is a valid "datastore" in the system
@@ -112,7 +112,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Delete datastore returns "Bad Request" response
     Given new "DeleteDatastore" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -121,7 +121,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "invalid path parameter"
 
-  @skip-typescript @skip-validation @team:DataDog/app-builder-backend
+  @skip-typescript @skip-validation @team:ddoghq/app-builder-backend
   Scenario: Delete datastore returns "OK" response
     Given new "DeleteDatastore" request
     And there is a valid "datastore" in the system
@@ -129,7 +129,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get datastore returns "Bad Request" response
     Given new "GetDatastore" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -138,7 +138,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "invalid path parameter"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get datastore returns "Not Found" response
     Given new "GetDatastore" request
     And request contains "datastore_id" parameter with value "5bf53b3f-b230-4b35-ab1a-b39f2633eb22"
@@ -147,7 +147,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore not found"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get datastore returns "OK" response
     Given new "GetDatastore" request
     And there is a valid "datastore" in the system
@@ -156,7 +156,7 @@ Feature: Actions Datastores
     Then the response status is 200 OK
     And the response "data.id" is equal to "{{datastore.data.id}}"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List datastore items returns "Bad Request" response
     Given new "ListDatastoreItems" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -165,7 +165,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "invalid path parameter"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List datastore items returns "Not Found" response
     Given new "ListDatastoreItems" request
     And request contains "datastore_id" parameter with value "3cfdd0b8-c490-4969-8d51-69add64a70ea"
@@ -174,7 +174,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore not found"
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: List datastore items returns "OK" response
     Given new "ListDatastoreItems" request
     And there is a valid "datastore" in the system
@@ -184,13 +184,13 @@ Feature: Actions Datastores
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List datastores returns "OK" response
     Given new "ListDatastores" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update datastore item returns "Bad Request" response
     Given new "UpdateDatastoreItem" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -198,7 +198,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update datastore item returns "Not Found" response
     Given new "UpdateDatastoreItem" request
     And request contains "datastore_id" parameter with value "3cfdd0b8-c490-4969-8d51-69add64a70ea"
@@ -206,7 +206,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update datastore item returns "OK" response
     Given new "UpdateDatastoreItem" request
     And there is a valid "datastore" in the system
@@ -216,7 +216,7 @@ Feature: Actions Datastores
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update datastore returns "Bad Request" response
     Given new "UpdateDatastore" request
     And request contains "datastore_id" parameter with value "invalid-uuid"
@@ -226,7 +226,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "invalid path parameter"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update datastore returns "Not Found" response
     Given new "UpdateDatastore" request
     And request contains "datastore_id" parameter with value "c1eb5bb8-726a-4e59-9a61-ccbb26f95329"
@@ -236,7 +236,7 @@ Feature: Actions Datastores
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "datastore not found"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update datastore returns "OK" response
     Given new "UpdateDatastore" request
     And there is a valid "datastore" in the system
diff --git a/features/v2/agent_observability.feature b/features/v2/agent_observability.feature
index 44fc57a408f2..7075fab6dca3 100644
--- a/features/v2/agent_observability.feature
+++ b/features/v2/agent_observability.feature
@@ -8,7 +8,7 @@ Feature: Agent Observability
     And a valid "appKeyAuth" key in the system
     And an instance of "AgentObservability" API
 
-  @skip @team:DataDog/ml-observability
+  @skip @team:ddoghq/ml-observability
   Scenario: Add a display_block interaction returns "Created" response
     Given operation "CreateLLMObsAnnotationQueueInteractions" enabled
     And new "CreateLLMObsAnnotationQueueInteractions" request
@@ -17,7 +17,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @skip @team:DataDog/ml-observability
+  @skip @team:ddoghq/ml-observability
   Scenario: Add a display_block interaction with an image block missing url returns "Bad Request" response
     Given operation "CreateLLMObsAnnotationQueueInteractions" enabled
     And new "CreateLLMObsAnnotationQueueInteractions" request
@@ -26,7 +26,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Add annotation queue interactions returns "Bad Request" response
     Given operation "CreateLLMObsAnnotationQueueInteractions" enabled
     And new "CreateLLMObsAnnotationQueueInteractions" request
@@ -35,7 +35,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Add annotation queue interactions returns "Created" response
     Given operation "CreateLLMObsAnnotationQueueInteractions" enabled
     And new "CreateLLMObsAnnotationQueueInteractions" request
@@ -44,7 +44,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Add annotation queue interactions returns "Not Found" response
     Given operation "CreateLLMObsAnnotationQueueInteractions" enabled
     And new "CreateLLMObsAnnotationQueueInteractions" request
@@ -53,7 +53,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Aggregate Agent Observability experimentation returns "Bad Request" response
     Given operation "AggregateLLMObsExperimentation" enabled
     And new "AggregateLLMObsExperimentation" request
@@ -61,7 +61,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Aggregate Agent Observability experimentation returns "OK" response
     Given operation "AggregateLLMObsExperimentation" enabled
     And new "AggregateLLMObsExperimentation" request
@@ -69,7 +69,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Append records to an Agent Observability dataset returns "Bad Request" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
@@ -79,7 +79,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Append records to an Agent Observability dataset returns "Created" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
@@ -89,7 +89,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Append records to an Agent Observability dataset returns "Not Found" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
@@ -99,7 +99,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Append records to an Agent Observability dataset returns "OK" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
@@ -109,7 +109,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Batch update Agent Observability dataset records returns "Bad Request" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
@@ -119,7 +119,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Batch update Agent Observability dataset records returns "Not Found" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
@@ -129,7 +129,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Batch update Agent Observability dataset records returns "OK" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
@@ -139,7 +139,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Batch update Agent Observability dataset records returns "Payload Too Large" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
@@ -149,7 +149,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 413 Payload Too Large
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Clone an Agent Observability dataset returns "Bad Request" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
@@ -159,7 +159,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Clone an Agent Observability dataset returns "Not Found" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
@@ -169,7 +169,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Clone an Agent Observability dataset returns "OK" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
@@ -179,7 +179,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create a new Agent Observability prompt version returns "Bad Request" response
     Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
@@ -188,7 +188,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create a new Agent Observability prompt version returns "Not Found" response
     Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
@@ -197,7 +197,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create a new Agent Observability prompt version returns "OK" response
     Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
@@ -206,7 +206,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability annotation queue returns "Bad Request" response
     Given operation "CreateLLMObsAnnotationQueue" enabled
     And new "CreateLLMObsAnnotationQueue" request
@@ -214,7 +214,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability annotation queue returns "Created" response
     Given operation "CreateLLMObsAnnotationQueue" enabled
     And new "CreateLLMObsAnnotationQueue" request
@@ -222,7 +222,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability dataset returns "Bad Request" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
@@ -231,7 +231,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability dataset returns "Created" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
@@ -240,7 +240,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability dataset returns "Not Found" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
@@ -249,7 +249,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability dataset returns "OK" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
@@ -258,7 +258,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability experiment returns "Bad Request" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
@@ -266,7 +266,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability experiment returns "Created" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
@@ -274,7 +274,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability experiment returns "OK" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
@@ -282,7 +282,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability project returns "Bad Request" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
@@ -290,7 +290,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability project returns "Created" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
@@ -298,7 +298,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability project returns "OK" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
@@ -306,7 +306,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability prompt returns "Bad Request" response
     Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
@@ -314,7 +314,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability prompt returns "Conflict" response
     Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
@@ -322,7 +322,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create an Agent Observability prompt returns "OK" response
     Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
@@ -330,7 +330,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a custom evaluator configuration returns "Bad Request" response
     Given operation "UpdateLLMObsCustomEvalConfig" enabled
     And new "UpdateLLMObsCustomEvalConfig" request
@@ -339,7 +339,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a custom evaluator configuration returns "Not Found" response
     Given operation "UpdateLLMObsCustomEvalConfig" enabled
     And new "UpdateLLMObsCustomEvalConfig" request
@@ -348,7 +348,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a custom evaluator configuration returns "OK" response
     Given operation "UpdateLLMObsCustomEvalConfig" enabled
     And new "UpdateLLMObsCustomEvalConfig" request
@@ -357,7 +357,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a custom evaluator configuration returns "Unprocessable Entity" response
     Given operation "UpdateLLMObsCustomEvalConfig" enabled
     And new "UpdateLLMObsCustomEvalConfig" request
@@ -366,7 +366,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a patterns configuration returns "Bad Request" response
     Given operation "UpsertLLMObsPatternsConfig" enabled
     And new "UpsertLLMObsPatternsConfig" request
@@ -374,7 +374,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a patterns configuration returns "Not Found" response
     Given operation "UpsertLLMObsPatternsConfig" enabled
     And new "UpsertLLMObsPatternsConfig" request
@@ -382,7 +382,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update a patterns configuration returns "OK" response
     Given operation "UpsertLLMObsPatternsConfig" enabled
     And new "UpsertLLMObsPatternsConfig" request
@@ -390,7 +390,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update annotations returns "Bad Request" response
     Given operation "UpsertLLMObsAnnotations" enabled
     And new "UpsertLLMObsAnnotations" request
@@ -399,7 +399,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update annotations returns "Not Found — the queue does not exist." response
     Given operation "UpsertLLMObsAnnotations" enabled
     And new "UpsertLLMObsAnnotations" request
@@ -408,7 +408,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found — the queue does not exist.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Create or update annotations returns "OK — annotations created or updated. For mixed batches, denied items and other per-item errors are listed in `errors`." response
     Given operation "UpsertLLMObsAnnotations" enabled
     And new "UpsertLLMObsAnnotations" request
@@ -417,7 +417,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK — annotations created or updated. For mixed batches, denied items and other per-item errors are listed in `errors`.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability dataset records returns "Bad Request" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
@@ -427,7 +427,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability dataset records returns "No Content" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
@@ -437,7 +437,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability dataset records returns "Not Found" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
@@ -447,7 +447,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability datasets returns "Bad Request" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
@@ -456,7 +456,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability datasets returns "No Content" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
@@ -465,7 +465,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability datasets returns "Not Found" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
@@ -474,7 +474,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability experiments returns "Bad Request" response
     Given operation "DeleteLLMObsExperiments" enabled
     And new "DeleteLLMObsExperiments" request
@@ -482,7 +482,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability experiments returns "No Content" response
     Given operation "DeleteLLMObsExperiments" enabled
     And new "DeleteLLMObsExperiments" request
@@ -490,7 +490,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability projects returns "Bad Request" response
     Given operation "DeleteLLMObsProjects" enabled
     And new "DeleteLLMObsProjects" request
@@ -498,7 +498,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete Agent Observability projects returns "No Content" response
     Given operation "DeleteLLMObsProjects" enabled
     And new "DeleteLLMObsProjects" request
@@ -506,7 +506,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a custom evaluator configuration returns "Bad Request" response
     Given operation "DeleteLLMObsCustomEvalConfig" enabled
     And new "DeleteLLMObsCustomEvalConfig" request
@@ -514,7 +514,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a custom evaluator configuration returns "No Content" response
     Given operation "DeleteLLMObsCustomEvalConfig" enabled
     And new "DeleteLLMObsCustomEvalConfig" request
@@ -522,7 +522,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a custom evaluator configuration returns "Not Found" response
     Given operation "DeleteLLMObsCustomEvalConfig" enabled
     And new "DeleteLLMObsCustomEvalConfig" request
@@ -530,7 +530,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a patterns configuration returns "Bad Request" response
     Given operation "DeleteLLMObsPatternsConfig" enabled
     And new "DeleteLLMObsPatternsConfig" request
@@ -538,7 +538,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a patterns configuration returns "No Content" response
     Given operation "DeleteLLMObsPatternsConfig" enabled
     And new "DeleteLLMObsPatternsConfig" request
@@ -546,7 +546,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a patterns configuration returns "Not Found" response
     Given operation "DeleteLLMObsPatternsConfig" enabled
     And new "DeleteLLMObsPatternsConfig" request
@@ -554,7 +554,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete an Agent Observability annotation queue returns "No Content" response
     Given operation "DeleteLLMObsAnnotationQueue" enabled
     And new "DeleteLLMObsAnnotationQueue" request
@@ -562,7 +562,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete an Agent Observability annotation queue returns "Not Found" response
     Given operation "DeleteLLMObsAnnotationQueue" enabled
     And new "DeleteLLMObsAnnotationQueue" request
@@ -570,7 +570,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete an Agent Observability prompt returns "Not Found" response
     Given operation "DeleteLLMObsPrompt" enabled
     And new "DeleteLLMObsPrompt" request
@@ -578,7 +578,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete an Agent Observability prompt returns "OK" response
     Given operation "DeleteLLMObsPrompt" enabled
     And new "DeleteLLMObsPrompt" request
@@ -586,7 +586,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotation queue interactions returns "Bad Request" response
     Given operation "DeleteLLMObsAnnotationQueueInteractions" enabled
     And new "DeleteLLMObsAnnotationQueueInteractions" request
@@ -595,7 +595,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotation queue interactions returns "No Content" response
     Given operation "DeleteLLMObsAnnotationQueueInteractions" enabled
     And new "DeleteLLMObsAnnotationQueueInteractions" request
@@ -604,7 +604,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotation queue interactions returns "Not Found" response
     Given operation "DeleteLLMObsAnnotationQueueInteractions" enabled
     And new "DeleteLLMObsAnnotationQueueInteractions" request
@@ -613,7 +613,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotations returns "Bad Request" response
     Given operation "DeleteLLMObsAnnotations" enabled
     And new "DeleteLLMObsAnnotations" request
@@ -622,7 +622,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotations returns "Not Found — the queue does not exist." response
     Given operation "DeleteLLMObsAnnotations" enabled
     And new "DeleteLLMObsAnnotations" request
@@ -631,7 +631,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found — the queue does not exist.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete annotations returns "OK — annotations deleted. Errors for annotations that could not be deleted are listed in `errors`." response
     Given operation "DeleteLLMObsAnnotations" enabled
     And new "DeleteLLMObsAnnotations" request
@@ -640,7 +640,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK — annotations deleted. Errors for annotations that could not be deleted are listed in `errors`.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Export an Agent Observability dataset returns "Bad Request" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
@@ -649,7 +649,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Export an Agent Observability dataset returns "Not Found" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
@@ -658,7 +658,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Export an Agent Observability dataset returns "OK" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
@@ -667,7 +667,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get Agent Observability dataset draft state returns "Bad Request" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
@@ -676,7 +676,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get Agent Observability dataset draft state returns "Not Found" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
@@ -685,7 +685,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get Agent Observability dataset draft state returns "OK" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
@@ -694,7 +694,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a custom evaluator configuration returns "Bad Request" response
     Given operation "GetLLMObsCustomEvalConfig" enabled
     And new "GetLLMObsCustomEvalConfig" request
@@ -702,7 +702,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a custom evaluator configuration returns "Not Found" response
     Given operation "GetLLMObsCustomEvalConfig" enabled
     And new "GetLLMObsCustomEvalConfig" request
@@ -710,7 +710,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a custom evaluator configuration returns "OK" response
     Given operation "GetLLMObsCustomEvalConfig" enabled
     And new "GetLLMObsCustomEvalConfig" request
@@ -718,28 +718,28 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a patterns configuration returns "Bad Request" response
     Given operation "GetLLMObsPatternsConfig" enabled
     And new "GetLLMObsPatternsConfig" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a patterns configuration returns "Not Found" response
     Given operation "GetLLMObsPatternsConfig" enabled
     And new "GetLLMObsPatternsConfig" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a patterns configuration returns "OK" response
     Given operation "GetLLMObsPatternsConfig" enabled
     And new "GetLLMObsPatternsConfig" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a specific Agent Observability prompt version returns "Bad Request" response
     Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
@@ -748,7 +748,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a specific Agent Observability prompt version returns "Not Found" response
     Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
@@ -757,7 +757,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a specific Agent Observability prompt version returns "OK" response
     Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
@@ -766,7 +766,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get an Agent Observability prompt returns "Not Found" response
     Given operation "GetLLMObsPrompt" enabled
     And new "GetLLMObsPrompt" request
@@ -774,7 +774,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get an Agent Observability prompt returns "OK" response
     Given operation "GetLLMObsPrompt" enabled
     And new "GetLLMObsPrompt" request
@@ -782,7 +782,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get an annotated queue interaction returns "Bad Request" response
     Given operation "GetLLMObsAnnotatedInteraction" enabled
     And new "GetLLMObsAnnotatedInteraction" request
@@ -791,7 +791,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get an annotated queue interaction returns "Not Found" response
     Given operation "GetLLMObsAnnotatedInteraction" enabled
     And new "GetLLMObsAnnotatedInteraction" request
@@ -800,7 +800,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get an annotated queue interaction returns "OK" response
     Given operation "GetLLMObsAnnotatedInteraction" enabled
     And new "GetLLMObsAnnotatedInteraction" request
@@ -809,7 +809,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability @with-pagination
+  @generated @skip @team:ddoghq/ml-observability @with-pagination
   Scenario: Get an annotated queue interaction returns "OK" response with pagination
     Given operation "GetLLMObsAnnotatedInteraction" enabled
     And new "GetLLMObsAnnotatedInteraction" request
@@ -818,7 +818,7 @@ Feature: Agent Observability
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotated interactions by content IDs returns "Bad Request" response
     Given operation "GetLLMObsAnnotatedInteractionsByTraceIDs" enabled
     And new "GetLLMObsAnnotatedInteractionsByTraceIDs" request
@@ -826,7 +826,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotated interactions by content IDs returns "OK" response
     Given operation "GetLLMObsAnnotatedInteractionsByTraceIDs" enabled
     And new "GetLLMObsAnnotatedInteractionsByTraceIDs" request
@@ -834,7 +834,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotated queue interactions returns "Bad Request" response
     Given operation "GetLLMObsAnnotatedInteractions" enabled
     And new "GetLLMObsAnnotatedInteractions" request
@@ -842,7 +842,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotated queue interactions returns "Not Found" response
     Given operation "GetLLMObsAnnotatedInteractions" enabled
     And new "GetLLMObsAnnotatedInteractions" request
@@ -850,7 +850,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotated queue interactions returns "OK" response
     Given operation "GetLLMObsAnnotatedInteractions" enabled
     And new "GetLLMObsAnnotatedInteractions" request
@@ -858,7 +858,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotation queue label schema returns "Not Found" response
     Given operation "GetLLMObsAnnotationQueueLabelSchema" enabled
     And new "GetLLMObsAnnotationQueueLabelSchema" request
@@ -866,7 +866,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get annotation queue label schema returns "OK" response
     Given operation "GetLLMObsAnnotationQueueLabelSchema" enabled
     And new "GetLLMObsAnnotationQueueLabelSchema" request
@@ -874,7 +874,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get patterns run status returns "Bad Request" response
     Given operation "GetLLMObsPatternsRunStatus" enabled
     And new "GetLLMObsPatternsRunStatus" request
@@ -882,7 +882,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get patterns run status returns "Not Found" response
     Given operation "GetLLMObsPatternsRunStatus" enabled
     And new "GetLLMObsPatternsRunStatus" request
@@ -890,7 +890,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get patterns run status returns "OK" response
     Given operation "GetLLMObsPatternsRunStatus" enabled
     And new "GetLLMObsPatternsRunStatus" request
@@ -898,21 +898,21 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability annotation queues returns "Bad Request" response
     Given operation "ListLLMObsAnnotationQueues" enabled
     And new "ListLLMObsAnnotationQueues" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability annotation queues returns "OK" response
     Given operation "ListLLMObsAnnotationQueues" enabled
     And new "ListLLMObsAnnotationQueues" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset records returns "Bad Request" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
@@ -921,7 +921,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset records returns "Not Found" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
@@ -930,7 +930,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset records returns "OK" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
@@ -939,7 +939,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset versions returns "Bad Request" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
@@ -948,7 +948,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset versions returns "Not Found" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
@@ -957,7 +957,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability dataset versions returns "OK" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
@@ -966,7 +966,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability datasets returns "Bad Request" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
@@ -974,7 +974,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability datasets returns "Not Found" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
@@ -982,7 +982,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability datasets returns "OK" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
@@ -990,7 +990,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment events (v2) returns "Bad Request" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
@@ -998,7 +998,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment events (v2) returns "Not Found" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
@@ -1006,7 +1006,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment events (v2) returns "OK" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
@@ -1014,7 +1014,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment spans (v1) returns "Bad Request" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
@@ -1022,7 +1022,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment spans (v1) returns "Not Found" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
@@ -1030,7 +1030,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiment spans (v1) returns "OK" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
@@ -1038,56 +1038,56 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiments returns "Bad Request" response
     Given operation "ListLLMObsExperiments" enabled
     And new "ListLLMObsExperiments" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability experiments returns "OK" response
     Given operation "ListLLMObsExperiments" enabled
     And new "ListLLMObsExperiments" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability projects returns "Bad Request" response
     Given operation "ListLLMObsProjects" enabled
     And new "ListLLMObsProjects" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability projects returns "OK" response
     Given operation "ListLLMObsProjects" enabled
     And new "ListLLMObsProjects" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability prompts returns "OK" response
     Given operation "ListLLMObsPrompts" enabled
     And new "ListLLMObsPrompts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability spans returns "Bad Request" response
     Given operation "ListLLMObsSpans" enabled
     And new "ListLLMObsSpans" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Agent Observability spans returns "OK" response
     Given operation "ListLLMObsSpans" enabled
     And new "ListLLMObsSpans" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List LLM integration accounts returns "Bad Request" response
     Given operation "ListLLMObsIntegrationAccounts" enabled
     And new "ListLLMObsIntegrationAccounts" request
@@ -1095,7 +1095,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List LLM integration accounts returns "OK" response
     Given operation "ListLLMObsIntegrationAccounts" enabled
     And new "ListLLMObsIntegrationAccounts" request
@@ -1103,7 +1103,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List LLM integration models returns "Bad Request" response
     Given operation "ListLLMObsIntegrationModels" enabled
     And new "ListLLMObsIntegrationModels" request
@@ -1112,7 +1112,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List LLM integration models returns "OK" response
     Given operation "ListLLMObsIntegrationModels" enabled
     And new "ListLLMObsIntegrationModels" request
@@ -1121,14 +1121,14 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List custom evaluator configurations returns "OK" response
     Given operation "ListLLMObsCustomEvalConfigs" enabled
     And new "ListLLMObsCustomEvalConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List events for an Agent Observability experiment returns "Bad Request" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
@@ -1136,7 +1136,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List events for an Agent Observability experiment returns "Not Found" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
@@ -1144,7 +1144,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List events for an Agent Observability experiment returns "OK" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
@@ -1152,7 +1152,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns clustered points returns "Bad Request" response
     Given operation "ListLLMObsPatternsClusteredPoints" enabled
     And new "ListLLMObsPatternsClusteredPoints" request
@@ -1160,7 +1160,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns clustered points returns "Not Found" response
     Given operation "ListLLMObsPatternsClusteredPoints" enabled
     And new "ListLLMObsPatternsClusteredPoints" request
@@ -1168,7 +1168,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns clustered points returns "OK" response
     Given operation "ListLLMObsPatternsClusteredPoints" enabled
     And new "ListLLMObsPatternsClusteredPoints" request
@@ -1176,21 +1176,21 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns configurations returns "Bad Request" response
     Given operation "ListLLMObsPatternsConfigs" enabled
     And new "ListLLMObsPatternsConfigs" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns configurations returns "OK" response
     Given operation "ListLLMObsPatternsConfigs" enabled
     And new "ListLLMObsPatternsConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns runs returns "Bad Request" response
     Given operation "ListLLMObsPatternsRuns" enabled
     And new "ListLLMObsPatternsRuns" request
@@ -1198,7 +1198,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns runs returns "Not Found" response
     Given operation "ListLLMObsPatternsRuns" enabled
     And new "ListLLMObsPatternsRuns" request
@@ -1206,7 +1206,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns runs returns "OK" response
     Given operation "ListLLMObsPatternsRuns" enabled
     And new "ListLLMObsPatternsRuns" request
@@ -1214,7 +1214,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics returns "Bad Request" response
     Given operation "ListLLMObsPatternsTopics" enabled
     And new "ListLLMObsPatternsTopics" request
@@ -1222,7 +1222,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics returns "Not Found" response
     Given operation "ListLLMObsPatternsTopics" enabled
     And new "ListLLMObsPatternsTopics" request
@@ -1230,7 +1230,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics returns "OK" response
     Given operation "ListLLMObsPatternsTopics" enabled
     And new "ListLLMObsPatternsTopics" request
@@ -1238,7 +1238,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics with clustered points returns "Bad Request" response
     Given operation "ListLLMObsPatternsTopicsWithClusteredPoints" enabled
     And new "ListLLMObsPatternsTopicsWithClusteredPoints" request
@@ -1246,7 +1246,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics with clustered points returns "Not Found" response
     Given operation "ListLLMObsPatternsTopicsWithClusteredPoints" enabled
     And new "ListLLMObsPatternsTopicsWithClusteredPoints" request
@@ -1254,7 +1254,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List patterns topics with clustered points returns "OK" response
     Given operation "ListLLMObsPatternsTopicsWithClusteredPoints" enabled
     And new "ListLLMObsPatternsTopicsWithClusteredPoints" request
@@ -1262,7 +1262,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List versions of an Agent Observability prompt returns "OK" response
     Given operation "ListLLMObsPromptVersions" enabled
     And new "ListLLMObsPromptVersions" request
@@ -1270,7 +1270,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Lock Agent Observability dataset draft state returns "Bad Request" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
@@ -1279,7 +1279,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Lock Agent Observability dataset draft state returns "Not Found" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
@@ -1288,7 +1288,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Lock Agent Observability dataset draft state returns "OK" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
@@ -1297,7 +1297,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Push events for an Agent Observability experiment returns "Accepted" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
@@ -1306,7 +1306,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Push events for an Agent Observability experiment returns "Bad Request" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
@@ -1315,7 +1315,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Push events for an Agent Observability experiment returns "Not Found" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
@@ -1324,7 +1324,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Restore an Agent Observability dataset version returns "Bad Request" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
@@ -1334,7 +1334,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Restore an Agent Observability dataset version returns "Not Found" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
@@ -1344,7 +1344,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Restore an Agent Observability dataset version returns "OK" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
@@ -1354,7 +1354,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Run an LLM inference returns "Bad Request" response
     Given operation "CreateLLMObsIntegrationInference" enabled
     And new "CreateLLMObsIntegrationInference" request
@@ -1364,7 +1364,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Run an LLM inference returns "OK" response
     Given operation "CreateLLMObsIntegrationInference" enabled
     And new "CreateLLMObsIntegrationInference" request
@@ -1374,7 +1374,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Search Agent Observability experimentation returns "Bad Request" response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
@@ -1382,7 +1382,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Search Agent Observability experimentation returns "OK — all results returned in a single page." response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
@@ -1390,7 +1390,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK — all results returned in a single page.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Search Agent Observability experimentation returns "Partial Content — more results are available. Use `meta.after` as the next `page.cursor`." response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
@@ -1398,7 +1398,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 206 Partial Content — more results are available. Use `meta.after` as the next `page.cursor`.
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Search Agent Observability spans returns "Bad Request" response
     Given operation "SearchLLMObsSpans" enabled
     And new "SearchLLMObsSpans" request
@@ -1406,7 +1406,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Search Agent Observability spans returns "OK" response
     Given operation "SearchLLMObsSpans" enabled
     And new "SearchLLMObsSpans" request
@@ -1414,7 +1414,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Simple search experimentation entities returns "Bad Request" response
     Given operation "SimpleSearchLLMObsExperimentation" enabled
     And new "SimpleSearchLLMObsExperimentation" request
@@ -1422,7 +1422,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Simple search experimentation entities returns "OK" response
     Given operation "SimpleSearchLLMObsExperimentation" enabled
     And new "SimpleSearchLLMObsExperimentation" request
@@ -1430,7 +1430,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Trigger a patterns run returns "Accepted" response
     Given operation "TriggerLLMObsPatterns" enabled
     And new "TriggerLLMObsPatterns" request
@@ -1438,7 +1438,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Trigger a patterns run returns "Bad Request" response
     Given operation "TriggerLLMObsPatterns" enabled
     And new "TriggerLLMObsPatterns" request
@@ -1446,7 +1446,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Trigger a patterns run returns "Not Found" response
     Given operation "TriggerLLMObsPatterns" enabled
     And new "TriggerLLMObsPatterns" request
@@ -1454,7 +1454,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Unlock Agent Observability dataset draft state returns "Bad Request" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
@@ -1463,7 +1463,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Unlock Agent Observability dataset draft state returns "Not Found" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
@@ -1472,7 +1472,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Unlock Agent Observability dataset draft state returns "OK" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
@@ -1481,7 +1481,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update Agent Observability dataset records returns "Bad Request" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
@@ -1491,7 +1491,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update Agent Observability dataset records returns "Not Found" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
@@ -1501,7 +1501,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update Agent Observability dataset records returns "OK" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
@@ -1511,7 +1511,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability annotation queue returns "Bad Request" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
@@ -1520,7 +1520,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability annotation queue returns "Not Found" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
@@ -1529,7 +1529,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability annotation queue returns "OK" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
@@ -1538,7 +1538,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability dataset returns "Bad Request" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
@@ -1548,7 +1548,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability dataset returns "Not Found" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
@@ -1558,7 +1558,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability dataset returns "OK" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
@@ -1568,7 +1568,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability experiment returns "Bad Request" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
@@ -1577,7 +1577,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability experiment returns "Not Found" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
@@ -1586,7 +1586,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability experiment returns "OK" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
@@ -1595,7 +1595,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability project returns "Bad Request" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
@@ -1604,7 +1604,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability project returns "Not Found" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
@@ -1613,7 +1613,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability project returns "OK" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
@@ -1622,7 +1622,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt returns "Bad Request" response
     Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
@@ -1631,7 +1631,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt returns "Not Found" response
     Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
@@ -1640,7 +1640,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt returns "OK" response
     Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
@@ -1649,7 +1649,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt version returns "Bad Request" response
     Given operation "UpdateLLMObsPromptVersion" enabled
     And new "UpdateLLMObsPromptVersion" request
@@ -1659,7 +1659,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt version returns "Not Found" response
     Given operation "UpdateLLMObsPromptVersion" enabled
     And new "UpdateLLMObsPromptVersion" request
@@ -1669,7 +1669,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update an Agent Observability prompt version returns "OK" response
     Given operation "UpdateLLMObsPromptVersion" enabled
     And new "UpdateLLMObsPromptVersion" request
@@ -1679,7 +1679,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update annotation queue label schema returns "Bad Request" response
     Given operation "UpdateLLMObsAnnotationQueueLabelSchema" enabled
     And new "UpdateLLMObsAnnotationQueueLabelSchema" request
@@ -1688,7 +1688,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update annotation queue label schema returns "Not Found" response
     Given operation "UpdateLLMObsAnnotationQueueLabelSchema" enabled
     And new "UpdateLLMObsAnnotationQueueLabelSchema" request
@@ -1697,7 +1697,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Update annotation queue label schema returns "OK" response
     Given operation "UpdateLLMObsAnnotationQueueLabelSchema" enabled
     And new "UpdateLLMObsAnnotationQueueLabelSchema" request
@@ -1706,7 +1706,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Upload records to an Agent Observability dataset returns "Bad Request" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
@@ -1715,7 +1715,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Upload records to an Agent Observability dataset returns "Not Found" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
@@ -1724,7 +1724,7 @@ Feature: Agent Observability
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Upload records to an Agent Observability dataset returns "OK" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
diff --git a/features/v2/agentless_scanning.feature b/features/v2/agentless_scanning.feature
index 3b1344cb4ac8..bcfa9c44a847 100644
--- a/features/v2/agentless_scanning.feature
+++ b/features/v2/agentless_scanning.feature
@@ -12,7 +12,7 @@ Feature: Agentless Scanning
     And a valid "appKeyAuth" key in the system
     And an instance of "AgentlessScanning" API
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create AWS on demand task returns "AWS on demand task created successfully." response
     Given new "CreateAwsOnDemandTask" request
     And body with value {"data": {"attributes": {"arn": "arn:aws:lambda:us-west-2:123456789012:function:my-function"}, "type": "aws_resource"}}
@@ -21,35 +21,35 @@ Feature: Agentless Scanning
     And the response "data.attributes.arn" is equal to "arn:aws:lambda:us-west-2:123456789012:function:my-function"
     And the response "data.attributes.status" is equal to "QUEUED"
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create AWS on demand task returns "Bad Request" response
     Given new "CreateAwsOnDemandTask" request
     And body with value {"data": {"attributes": {"arn": "invalid-arn"}, "type": "aws_resource"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-agentless
+  @skip @team:ddoghq/k9-agentless
   Scenario: Create AWS scan options returns "Agentless scan options enabled successfully." response
     Given new "CreateAwsScanOptions" request
     And body with value {"data": {"id": "000000000003", "type": "aws_scan_options", "attributes": {"compliance_host": true, "lambda": true, "sensitive_data": false, "vuln_containers_os": true, "vuln_host_os": true}}}
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create AWS scan options returns "Bad Request" response
     Given new "CreateAwsScanOptions" request
     And body with value {"data": {"id": "123", "type": "aws_scan_options", "attributes": {"compliance_host": true, "lambda": true, "sensitive_data": false, "vuln_containers_os": true, "vuln_host_os": true}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create AWS scan options returns "Conflict" response
     Given new "CreateAwsScanOptions" request
     And body with value {"data":{"type":"aws_scan_options","id":"000000000002","attributes":{"compliance_host":true,"vuln_host_os":true,"vuln_containers_os":true,"sensitive_data":false,"lambda":false}}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip-validation @team:DataDog/k9-agentless
+  @skip-validation @team:ddoghq/k9-agentless
   Scenario: Create Azure scan options returns "Created" response
     Given new "CreateAzureScanOptions" request
     And body with value {"data": {"attributes": {"function": true, "vuln_containers_os": true, "vuln_host_os": true}, "id": "12345678-90ab-cdef-1234-567890abcdef", "type": "azure_scan_options"}}
@@ -57,7 +57,7 @@ Feature: Agentless Scanning
     Then the response status is 201 Created
     And the response "data.attributes.function" is equal to true
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create GCP scan options returns "Agentless scan options enabled successfully." response
     Given new "CreateGcpScanOptions" request
     And body with value {"data": {"id": "new-project", "type": "gcp_scan_options", "attributes": {"cloud_function": true, "vuln_host_os": true, "vuln_containers_os": true}}}
@@ -65,84 +65,84 @@ Feature: Agentless Scanning
     Then the response status is 201 Created
     And the response "data.attributes.cloud_function" is equal to true
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create GCP scan options returns "Bad Request" response
     Given new "CreateGcpScanOptions" request
     And body with value {"data": {"id": "no", "type": "gcp_scan_options", "attributes": {"vuln_host_os": true, "vuln_containers_os": true}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Create GCP scan options returns "Conflict" response
     Given new "CreateGcpScanOptions" request
     And body with value {"data": {"id": "api-spec-test", "type": "gcp_scan_options", "attributes": {"vuln_host_os": true, "vuln_containers_os": true}}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Delete AWS scan options returns "Bad Request" response
     Given new "DeleteAwsScanOptions" request
     And request contains "account_id" parameter with value "incorrectId"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-agentless
+  @generated @skip @team:ddoghq/k9-agentless
   Scenario: Delete AWS scan options returns "No Content" response
     Given new "DeleteAwsScanOptions" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Delete AWS scan options returns "Not Found" response
     Given new "DeleteAwsScanOptions" request
     And request contains "account_id" parameter with value "000000000005"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-agentless
+  @generated @skip @team:ddoghq/k9-agentless
   Scenario: Delete Azure scan options returns "No Content" response
     Given new "DeleteAzureScanOptions" request
     And request contains "subscription_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Delete GCP scan options returns "Bad Request" response
     Given new "DeleteGcpScanOptions" request
     And request contains "project_id" parameter with value "no"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-agentless
+  @generated @skip @team:ddoghq/k9-agentless
   Scenario: Delete GCP scan options returns "No Content" response
     Given new "DeleteGcpScanOptions" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Delete GCP scan options returns "Not Found" response
     Given new "DeleteGcpScanOptions" request
     And request contains "project_id" parameter with value "nonexistent-project-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS on demand task returns "Bad Request" response
     Given new "GetAwsOnDemandTask" request
     And request contains "task_id" parameter with value "invalid-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS on demand task returns "Not Found" response
     Given new "GetAwsOnDemandTask" request
     And request contains "task_id" parameter with value "00000000-0000-0000-824a-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS on demand task returns "OK." response
     Given new "GetAwsOnDemandTask" request
     And request contains "task_id" parameter with value "63d6b4f5-e5d0-4d90-824a-9580f05f026a"
@@ -150,21 +150,21 @@ Feature: Agentless Scanning
     Then the response status is 200 OK
     And the response "data.attributes.arn" is equal to "arn:aws:lambda:eu-west-3:376334461865:function:This-Is-An-Api-Spec-Test"
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS scan options returns "Bad Request" response
     Given new "GetAwsScanOptions" request
     And request contains "account_id" parameter with value "not-an-account-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS scan options returns "Not Found" response
     Given new "GetAwsScanOptions" request
     And request contains "account_id" parameter with value "404404404404"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get AWS scan options returns "OK" response
     Given there is a valid "aws_scan_options" in the system
     And new "GetAwsScanOptions" request
@@ -174,42 +174,42 @@ Feature: Agentless Scanning
     And the response "data.id" is equal to "{{ aws_scan_options.id }}"
     And the response "data.type" is equal to "{{ aws_scan_options.type }}"
 
-  @skip @team:DataDog/k9-agentless
+  @skip @team:ddoghq/k9-agentless
   Scenario: Get Azure scan options returns "Bad Request" response
     Given new "GetAzureScanOptions" request
     And request contains "subscription_id" parameter with value "invalid uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get Azure scan options returns "Not Found" response
     Given new "GetAzureScanOptions" request
     And request contains "subscription_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-agentless
+  @generated @skip @team:ddoghq/k9-agentless
   Scenario: Get Azure scan options returns "OK" response
     Given new "GetAzureScanOptions" request
     And request contains "subscription_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get GCP scan options returns "Bad Request" response
     Given new "GetGcpScanOptions" request
     And request contains "project_id" parameter with value "no"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get GCP scan options returns "Not Found" response
     Given new "GetGcpScanOptions" request
     And request contains "project_id" parameter with value "nonexistent-project-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Get GCP scan options returns "OK" response
     Given there is a valid "gcp_scan_options" in the system
     And new "GetGcpScanOptions" request
@@ -219,39 +219,39 @@ Feature: Agentless Scanning
     And the response "data.id" is equal to "api-spec-test"
     And the response "data.type" is equal to "{{ gcp_scan_options.type }}"
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: List AWS on demand tasks returns "OK" response
     Given new "ListAwsOnDemandTasks" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "aws_resource"
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: List AWS scan options returns "OK" response
     Given new "ListAwsScanOptions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: List Azure scan options returns "OK" response
     Given new "ListAzureScanOptions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: List GCP scan options returns "OK" response
     Given new "ListGcpScanOptions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/k9-agentless
+  @skip @team:ddoghq/k9-agentless
   Scenario: Update AWS scan options returns "Bad Request" response
     Given new "UpdateAwsScanOptions" request
     And request contains "account_id" parameter with value "000000000003"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update AWS scan options returns "Bad Request" response 2
     Given new "UpdateAwsScanOptions" request
     And request contains "account_id" parameter with value "000000000003"
@@ -259,7 +259,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update AWS scan options returns "No Content" response
     Given new "UpdateAwsScanOptions" request
     And request contains "account_id" parameter with value "000000000002"
@@ -267,7 +267,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update AWS scan options returns "Not Found" response
     Given new "UpdateAwsScanOptions" request
     And request contains "account_id" parameter with value "000000000005"
@@ -275,7 +275,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-agentless
+  @generated @skip @team:ddoghq/k9-agentless
   Scenario: Update Azure scan options returns "OK" response
     Given new "UpdateAzureScanOptions" request
     And request contains "subscription_id" parameter from "REPLACE.ME"
@@ -283,7 +283,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update GCP scan options returns "Bad Request" response
     Given new "UpdateGcpScanOptions" request
     And request contains "project_id" parameter with value "no"
@@ -291,7 +291,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update GCP scan options returns "Not Found" response
     Given new "UpdateGcpScanOptions" request
     And request contains "project_id" parameter with value "nonexistent-project-id"
@@ -299,7 +299,7 @@ Feature: Agentless Scanning
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-agentless
+  @team:ddoghq/k9-agentless
   Scenario: Update GCP scan options returns "OK" response
     Given new "UpdateGcpScanOptions" request
     And request contains "project_id" parameter with value "api-spec-test"
diff --git a/features/v2/annotations.feature b/features/v2/annotations.feature
index 0df59be81439..aaa04ace500b 100644
--- a/features/v2/annotations.feature
+++ b/features/v2/annotations.feature
@@ -8,7 +8,7 @@ Feature: Annotations
     And a valid "appKeyAuth" key in the system
     And an instance of "Annotations" API
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: Create an annotation returns "Bad Request" response
     Given operation "CreateAnnotation" enabled
     And new "CreateAnnotation" request
@@ -16,7 +16,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dataviz-advanced-analytics
+  @team:ddoghq/dataviz-advanced-analytics
   Scenario: Create an annotation returns "OK" response
     Given operation "CreateAnnotation" enabled
     And new "CreateAnnotation" request
@@ -24,7 +24,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: Delete an annotation returns "Bad Request" response
     Given operation "DeleteAnnotation" enabled
     And new "DeleteAnnotation" request
@@ -32,7 +32,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dataviz-advanced-analytics
+  @team:ddoghq/dataviz-advanced-analytics
   Scenario: Delete an annotation returns "No Content" response
     Given operation "DeleteAnnotation" enabled
     And there is a valid "annotation" in the system
@@ -41,7 +41,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: Get annotations for a page returns "Bad Request" response
     Given operation "GetPageAnnotations" enabled
     And new "GetPageAnnotations" request
@@ -51,7 +51,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dataviz-advanced-analytics
+  @team:ddoghq/dataviz-advanced-analytics
   Scenario: Get annotations for a page returns "OK" response
     Given there is a valid "annotation" in the system
     And operation "GetPageAnnotations" enabled
@@ -62,7 +62,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: List annotations returns "Bad Request" response
     Given operation "ListAnnotations" enabled
     And new "ListAnnotations" request
@@ -72,7 +72,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dataviz-advanced-analytics
+  @team:ddoghq/dataviz-advanced-analytics
   Scenario: List annotations returns "OK" response
     Given there is a valid "annotation" in the system
     And operation "ListAnnotations" enabled
@@ -83,7 +83,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: Update an annotation returns "Bad Request" response
     Given operation "UpdateAnnotation" enabled
     And new "UpdateAnnotation" request
@@ -92,7 +92,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dataviz-advanced-analytics
+  @generated @skip @team:ddoghq/dataviz-advanced-analytics
   Scenario: Update an annotation returns "Not Found" response
     Given operation "UpdateAnnotation" enabled
     And new "UpdateAnnotation" request
@@ -101,7 +101,7 @@ Feature: Annotations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dataviz-advanced-analytics
+  @team:ddoghq/dataviz-advanced-analytics
   Scenario: Update an annotation returns "OK" response
     Given there is a valid "annotation" in the system
     And operation "UpdateAnnotation" enabled
diff --git a/features/v2/api_management.feature b/features/v2/api_management.feature
index aefe9f319cce..c0a8f2d13954 100644
--- a/features/v2/api_management.feature
+++ b/features/v2/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/apm-aoe
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/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/apm-aoe
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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/apm-aoe
+  @generated @skip @team:ddoghq/apm-aoe
   Scenario: Update an API returns "Bad request" response
     Given operation "UpdateOpenAPI" enabled
     And new "UpdateOpenAPI" request
diff --git a/features/v2/apm.feature b/features/v2/apm.feature
index c286ba4f8ba7..10eb181e35a6 100644
--- a/features/v2/apm.feature
+++ b/features/v2/apm.feature
@@ -3,7 +3,7 @@ Feature: APM
   Observe, troubleshoot, and improve cloud-scale applications with all
   telemetry in context
 
-  @generated @skip @team:DataDog/apm-aoe
+  @generated @skip @team:ddoghq/apm-aoe
   Scenario: Get service list returns "OK" response
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
diff --git a/features/v2/apm_retention_filters.feature b/features/v2/apm_retention_filters.feature
index f3334c20e3ed..1787306ddf73 100644
--- a/features/v2/apm_retention_filters.feature
+++ b/features/v2/apm_retention_filters.feature
@@ -12,28 +12,28 @@ Feature: APM Retention Filters
     And a valid "appKeyAuth" key in the system
     And an instance of "APMRetentionFilters" API
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Create a default retention filter returns "Bad Request" response
     Given new "CreateApmRetentionFilter" request
     And body with value {"data": {"attributes": {"enabled": true, "filter": {"query": "@http.status_code:200 service:my-service"}, "filter_type": "spans-errors-sampling-processor", "name": "my retention filter", "rate": 1.0}, "type": "apm_retention_filter"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Create a retention filter returns "Bad Request" response
     Given new "CreateApmRetentionFilter" request
     And body with value {"data": {"attributes": {"enabled": true, "filter": {"query": "@http.status_code:200 service:my-service"}, "filter_type": "spans-sampling-processor", "name": "my retention filter", "rate": 2.0}, "type": "apm_retention_filter"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/apm-trace-intake
+  @generated @skip @team:ddoghq/apm-trace-intake
   Scenario: Create a retention filter returns "Conflict" response
     Given new "CreateApmRetentionFilter" request
     And body with value {"data": {"attributes": {"enabled": true, "filter": {"query": "@http.status_code:200 service:my-service"}, "filter_type": "spans-sampling-processor", "name": "my retention filter", "rate": 1.0, "trace_rate": 1.0}, "type": "apm_retention_filter"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Create a retention filter returns "OK" response
     Given new "CreateApmRetentionFilter" request
     And body with value {"data": {"attributes": {"enabled": true, "filter": {"query": "@http.status_code:200 service:my-service"}, "filter_type": "spans-sampling-processor", "name": "my retention filter", "rate": 1.0}, "type": "apm_retention_filter"}}
@@ -41,21 +41,21 @@ Feature: APM Retention Filters
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "my retention filter"
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Create a retention filter with trace rate returns "OK" response
     Given new "CreateApmRetentionFilter" request
     And body with value {"data": {"attributes": {"enabled": true, "filter": {"query": "@http.status_code:200 service:my-service"}, "filter_type": "spans-sampling-processor", "name": "my retention filter", "rate": 1.0, "trace_rate": 1.0}, "type": "apm_retention_filter"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Delete a retention filter returns "Not Found" response
     Given new "DeleteApmRetentionFilter" request
     And request contains "filter_id" parameter with value "not_found"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Delete a retention filter returns "OK" response
     Given there is a valid "retention_filter" in the system
     And new "DeleteApmRetentionFilter" request
@@ -63,14 +63,14 @@ Feature: APM Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Get a given APM retention filter returns "Not Found" response
     Given new "GetApmRetentionFilter" request
     And request contains "filter_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Get a given APM retention filter returns "OK" response
     Given there is a valid "retention_filter" in the system
     And new "GetApmRetentionFilter" request
@@ -78,7 +78,7 @@ Feature: APM Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: List all APM retention filters returns "OK" response
     Given there is a valid "retention_filter" in the system
     And new "ListApmRetentionFilters" request
@@ -86,21 +86,21 @@ Feature: APM Retention Filters
     Then the response status is 200 OK
     And the response "data" has item with field "id" with value "{{ retention_filter.data.id }}"
 
-  @generated @skip @team:DataDog/apm-trace-intake
+  @generated @skip @team:ddoghq/apm-trace-intake
   Scenario: Re-order retention filters returns "Bad Request" response
     Given new "ReorderApmRetentionFilters" request
     And body with value {"data": [{"id": "7RBOb7dLSYWI01yc3pIH8w", "type": "apm_retention_filter"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/apm-trace-intake
+  @replay-only @team:ddoghq/apm-trace-intake
   Scenario: Re-order retention filters returns "OK" response
     Given new "ReorderApmRetentionFilters" request
     And body with value {"data":[{"id":"jdZrilSJQLqzb6Cu7aub9Q","type":"apm_retention_filter"},{"id":"7RBOb7dLSYWI01yc3pIH8w","type":"apm_retention_filter"}]}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Update a retention filter returns "Bad Request" response
     Given there is a valid "retention_filter" in the system
     And new "UpdateApmRetentionFilter" request
@@ -109,7 +109,7 @@ Feature: APM Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Update a retention filter returns "Not Found" response
     Given new "UpdateApmRetentionFilter" request
     And request contains "filter_id" parameter with value "not_found"
@@ -117,7 +117,7 @@ Feature: APM Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Update a retention filter returns "OK" response
     Given there is a valid "retention_filter" in the system
     And new "UpdateApmRetentionFilter" request
@@ -126,7 +126,7 @@ Feature: APM Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/apm-trace-intake
+  @team:ddoghq/apm-trace-intake
   Scenario: Update a retention filter with trace rate returns "OK" response
     Given there is a valid "retention_filter" in the system
     And new "UpdateApmRetentionFilter" request
diff --git a/features/v2/apm_trace.feature b/features/v2/apm_trace.feature
index e5b706b19105..367d64732264 100644
--- a/features/v2/apm_trace.feature
+++ b/features/v2/apm_trace.feature
@@ -7,7 +7,7 @@ Feature: APM Trace
     And a valid "appKeyAuth" key in the system
     And an instance of "APMTrace" API
 
-  @generated @skip @team:DataDog/apm-reliability
+  @generated @skip @team:ddoghq/apm-reliability
   Scenario: Get a pruned trace by ID returns "Not Found" response
     Given operation "GetPrunedTraceByID" enabled
     And new "GetPrunedTraceByID" request
@@ -15,7 +15,7 @@ Feature: APM Trace
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/apm-reliability
+  @generated @skip @team:ddoghq/apm-reliability
   Scenario: Get a pruned trace by ID returns "OK" response
     Given operation "GetPrunedTraceByID" enabled
     And new "GetPrunedTraceByID" request
@@ -23,7 +23,7 @@ Feature: APM Trace
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/apm-reliability
+  @generated @skip @team:ddoghq/apm-reliability
   Scenario: Get a trace by ID returns "Not Found" response
     Given operation "GetTraceByID" enabled
     And new "GetTraceByID" request
@@ -31,7 +31,7 @@ Feature: APM Trace
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/apm-reliability
+  @generated @skip @team:ddoghq/apm-reliability
   Scenario: Get a trace by ID returns "OK" response
     Given operation "GetTraceByID" enabled
     And new "GetTraceByID" request
@@ -39,7 +39,7 @@ Feature: APM Trace
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/apm-reliability
+  @generated @skip @team:ddoghq/apm-reliability
   Scenario: Get a trace by ID returns "Payload Too Large" response
     Given operation "GetTraceByID" enabled
     And new "GetTraceByID" request
diff --git a/features/v2/app_builder.feature b/features/v2/app_builder.feature
index 782c77895fb3..5cc5901a6012 100644
--- a/features/v2/app_builder.feature
+++ b/features/v2/app_builder.feature
@@ -10,7 +10,7 @@ Feature: App Builder
     And a valid "appKeyAuth" key in the system
     And an instance of "AppBuilder" API
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Create App returns "Bad Request" response
     Given new "CreateApp" request
     And body with value {"data": {"attributes": {"description": "This is a bad example app", "queries": [], "rootInstanceName": "grid0"}, "type": "appDefinitions"}}
@@ -19,7 +19,7 @@ Feature: App Builder
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "missing required field"
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Create App returns "Created" response
     Given new "CreateApp" request
     And body with value {"data":{"type":"appDefinitions","attributes":{"rootInstanceName":"grid0","components":[{"name":"grid0","type":"grid","properties":{"children":[{"type":"gridCell","name":"gridCell0","properties":{"children":[{"name":"text0","type":"text","properties":{"content":"# Cat Facts","contentType":"markdown","textAlign":"left","verticalAlign":"top","isVisible":true},"events":[]}],"isVisible":"true","layout":{"default":{"x":0,"y":0,"width":4,"height":5}}},"events":[]},{"type":"gridCell","name":"gridCell2","properties":{"children":[{"name":"table0","type":"table","properties":{"data":"${fetchFacts?.outputs?.body?.data}","columns":[{"dataPath":"fact","header":"fact","isHidden":false,"id":"0ae2ae9e-0280-4389-83c6-1c5949f7e674"},{"dataPath":"length","header":"length","isHidden":true,"id":"c9048611-0196-4a00-9366-1ef9e3ec0408"},{"id":"8fa9284b-7a58-4f13-9959-57b7d8a7fe8f","dataPath":"Due Date","header":"Unused Old Column","disableSortBy":false,"formatter":{"type":"formatted_time","format":"LARGE_WITHOUT_TIME"},"isDeleted":true}],"summary":true,"pageSize":"${pageSize?.value}","paginationType":"server_side","isLoading":"${fetchFacts?.isLoading}","rowButtons":[],"isWrappable":false,"isScrollable":"vertical","isSubRowsEnabled":false,"globalFilter":false,"isVisible":true,"totalCount":"${fetchFacts?.outputs?.body?.total}"},"events":[]}],"isVisible":"true","layout":{"default":{"x":0,"y":5,"width":12,"height":96}}},"events":[]},{"type":"gridCell","name":"gridCell1","properties":{"children":[{"name":"text1","type":"text","properties":{"content":"## Random Fact\n\n${randomFact?.outputs?.fact}","contentType":"markdown","textAlign":"left","verticalAlign":"top","isVisible":true},"events":[]}],"isVisible":"true","layout":{"default":{"x":0,"y":101,"width":12,"height":16}}},"events":[]},{"type":"gridCell","name":"gridCell3","properties":{"children":[{"name":"button0","type":"button","properties":{"label":"Increase Page Size","level":"default","isPrimary":true,"isBorderless":false,"isLoading":false,"isDisabled":false,"isVisible":true,"iconLeft":"angleUp","iconRight":""},"events":[{"variableName":"pageSize","value":"${pageSize?.value + 1}","name":"click","type":"setStateVariableValue"}]}],"isVisible":"true","layout":{"default":{"x":10,"y":134,"width":2,"height":4}}},"events":[]},{"type":"gridCell","name":"gridCell4","properties":{"children":[{"name":"button1","type":"button","properties":{"label":"Decrease Page Size","level":"default","isPrimary":true,"isBorderless":false,"isLoading":false,"isDisabled":false,"isVisible":true,"iconLeft":"angleDown","iconRight":""},"events":[{"variableName":"pageSize","value":"${pageSize?.value - 1}","name":"click","type":"setStateVariableValue"}]}],"isVisible":"true","layout":{"default":{"x":10,"y":138,"width":2,"height":4}}},"events":[]}],"backgroundColor":"default"},"events":[]}],"queries":[{"id":"92ff0bb8-553b-4f31-87c7-ef5bd16d47d5","type":"action","name":"fetchFacts","events":[],"properties":{"spec":{"fqn":"com.datadoghq.http.request","connectionId":"5e63f4a8-4ce6-47de-ba11-f6617c1d54f3","inputs":{"verb":"GET","url":"https://catfact.ninja/facts","urlParams":[{"key":"limit","value":"${pageSize.value.toString()}"},{"key":"page","value":"${(table0.pageIndex + 1).toString()}"}]}}}},{"type":"stateVariable","name":"pageSize","properties":{"defaultValue":"${20}"},"id":"afd03c81-4075-4432-8618-ba09d52d2f2d"},{"type":"dataTransform","name":"randomFact","properties":{"outputs":"${(() => {const facts = fetchFacts.outputs.body.data\nreturn facts[Math.floor(Math.random()*facts.length)]\n})()}"},"id":"0fb22859-47dc-4137-9e41-7b67d04c525c"}],"name":"Example Cat Facts Viewer","description":"This is a slightly complicated example app that fetches and displays cat facts"}}}
@@ -27,7 +27,7 @@ Feature: App Builder
     Then the response status is 201 Created
     And the response "data.type" is equal to "appDefinitions"
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Create Publish Request returns "Bad Request" response
     Given new "CreatePublishRequest" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -35,7 +35,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Create Publish Request returns "Created" response
     Given new "CreatePublishRequest" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -43,7 +43,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 201 Created
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Create Publish Request returns "Not Found" response
     Given new "CreatePublishRequest" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -51,28 +51,28 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Delete App returns "Bad Request" response
     Given new "DeleteApp" request
     And request contains "app_id" parameter with value "bad-app-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Delete App returns "Gone" response
     Given new "DeleteApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 410 Gone
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Delete App returns "Not Found" response
     Given new "DeleteApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Delete App returns "OK" response
     Given there is a valid "app" in the system
     And new "DeleteApp" request
@@ -82,21 +82,21 @@ Feature: App Builder
     And the response "data.id" has the same value as "app.data.id"
     And the response "data.type" is equal to "appDefinitions"
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Delete Multiple Apps returns "Bad Request" response
     Given new "DeleteApps" request
     And body with value {"data": [{"id": "aea2ed17-b45f-40d0-ba59-c86b7972c901", "type": "appDefinitions"}, {"id": "f69bb8be-6168-4fe7-a30d-370256b6504a", "type": "appDefinitions"}, {"id": "ab1ed73e-13ad-4426-b0df-a0ff8876a088", "type": "appDefinitions"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Delete Multiple Apps returns "Not Found" response
     Given new "DeleteApps" request
     And body with value {"data": [{"id": "aea2ed17-b45f-40d0-ba59-c86b7972c901", "type": "appDefinitions"}, {"id": "f69bb8be-6168-4fe7-a30d-370256b6504a", "type": "appDefinitions"}, {"id": "ab1ed73e-13ad-4426-b0df-a0ff8876a088", "type": "appDefinitions"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Delete Multiple Apps returns "OK" response
     Given new "DeleteApps" request
     And there is a valid "app" in the system
@@ -106,14 +106,14 @@ Feature: App Builder
     And the response "data" has length 1
     And the response "data[0].id" has the same value as "app.data.id"
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Get App returns "Bad Request" response
     Given new "GetApp" request
     And request contains "app_id" parameter with value "invalid-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Get App returns "Gone" response
     Given new "GetApp" request
     And there is a valid "app" in the system
@@ -122,14 +122,14 @@ Feature: App Builder
     When the request is sent
     Then the response status is 410 Gone
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Get App returns "Not Found" response
     Given new "GetApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Get App returns "OK" response
     Given new "GetApp" request
     And there is a valid "app" in the system
@@ -139,49 +139,49 @@ Feature: App Builder
     And the response "data.id" has the same value as "app.data.id"
     And the response "data.type" is equal to "appDefinitions"
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get Blueprint returns "Not Found" response
     Given new "GetBlueprint" request
     And request contains "blueprint_id" parameter with value "00000000-0000-0000-0000-000000000001"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Get Blueprint returns "OK" response
     Given new "GetBlueprint" request
     And request contains "blueprint_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get Blueprints by Integration ID returns "OK" response
     Given new "GetBlueprintsByIntegrationId" request
     And request contains "integration_id" parameter with value "aws"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get Blueprints by Slugs returns "OK" response
     Given new "GetBlueprintsBySlugs" request
     And request contains "slugs" parameter with value "aws-service-manager"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: List App Versions returns "Bad Request" response
     Given new "ListAppVersions" request
     And request contains "app_id" parameter with value "bad-app-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: List App Versions returns "Not Found" response
     Given new "ListAppVersions" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: List App Versions returns "OK" response
     Given new "ListAppVersions" request
     And there is a valid "app" in the system
@@ -189,31 +189,31 @@ Feature: App Builder
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: List Apps returns "Bad Request" response
     Given new "ListApps" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: List Apps returns "OK" response
     Given new "ListApps" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List Blueprints returns "OK" response
     Given new "ListBlueprints" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List Tags returns "OK" response
     Given new "ListTags" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Name App Version returns "Bad Request" response
     Given new "UpdateAppVersionName" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -222,7 +222,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Name App Version returns "No Content" response
     Given new "UpdateAppVersionName" request
     And there is a valid "app" in the system
@@ -232,7 +232,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Name App Version returns "Not Found" response
     Given new "UpdateAppVersionName" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -241,14 +241,14 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Publish App returns "Bad Request" response
     Given new "PublishApp" request
     And request contains "app_id" parameter with value "invalid-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Publish App returns "Created" response
     Given new "PublishApp" request
     And there is a valid "app" in the system
@@ -256,14 +256,14 @@ Feature: App Builder
     When the request is sent
     Then the response status is 201 Created
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Publish App returns "Not Found" response
     Given new "PublishApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Revert App returns "Bad Request" response
     Given new "RevertApp" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -271,7 +271,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Revert App returns "Not Found" response
     Given new "RevertApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -279,7 +279,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Revert App returns "OK" response
     Given new "RevertApp" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -287,21 +287,21 @@ Feature: App Builder
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Unpublish App returns "Bad Request" response
     Given new "UnpublishApp" request
     And request contains "app_id" parameter with value "invalid-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Unpublish App returns "Not Found" response
     Given new "UnpublishApp" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Unpublish App returns "OK" response
     Given new "UnpublishApp" request
     And there is a valid "app" in the system
@@ -309,7 +309,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Update App Favorite Status returns "Bad Request" response
     Given new "UpdateAppFavorite" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -317,7 +317,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Favorite Status returns "No Content" response
     Given new "UpdateAppFavorite" request
     And there is a valid "app" in the system
@@ -326,7 +326,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Favorite Status returns "Not Found" response
     Given new "UpdateAppFavorite" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -334,7 +334,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Update App Protection Level returns "Bad Request" response
     Given new "UpdateProtectionLevel" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -342,7 +342,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Protection Level returns "Not Found" response
     Given new "UpdateProtectionLevel" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -350,7 +350,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Protection Level returns "OK" response
     Given new "UpdateProtectionLevel" request
     And there is a valid "app" in the system
@@ -360,7 +360,7 @@ Feature: App Builder
     Then the response status is 200 OK
     And the response "data.type" is equal to "appDefinitions"
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Update App Self-Service Status returns "Bad Request" response
     Given new "UpdateAppSelfService" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -368,7 +368,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Self-Service Status returns "No Content" response
     Given new "UpdateAppSelfService" request
     And there is a valid "app" in the system
@@ -377,7 +377,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Self-Service Status returns "Not Found" response
     Given new "UpdateAppSelfService" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -385,7 +385,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/app-builder-backend
+  @skip @team:ddoghq/app-builder-backend
   Scenario: Update App Tags returns "Bad Request" response
     Given new "UpdateAppTags" request
     And request contains "app_id" parameter with value "bad-app-id"
@@ -393,7 +393,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Tags returns "No Content" response
     Given new "UpdateAppTags" request
     And there is a valid "app" in the system
@@ -402,7 +402,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App Tags returns "Not Found" response
     Given new "UpdateAppTags" request
     And request contains "app_id" parameter with value "7addb29b-f935-472c-ae79-d1963979a23e"
@@ -410,7 +410,7 @@ Feature: App Builder
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App returns "Bad Request" response
     Given new "UpdateApp" request
     And there is a valid "app" in the system
@@ -421,7 +421,7 @@ Feature: App Builder
     And the response "errors" has length 1
     And the response "errors[0].title" is equal to "missing required field"
 
-  @skip-typescript @team:DataDog/app-builder-backend
+  @skip-typescript @team:ddoghq/app-builder-backend
   Scenario: Update App returns "OK" response
     Given new "UpdateApp" request
     And there is a valid "app" in the system
diff --git a/features/v2/application_security.feature b/features/v2/application_security.feature
index 710a60641417..e59e27cd74f8 100644
--- a/features/v2/application_security.feature
+++ b/features/v2/application_security.feature
@@ -13,63 +13,63 @@ Feature: Application Security
     And a valid "appKeyAuth" key in the system
     And an instance of "ApplicationSecurity" API
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF Policy returns "Bad Request" response
     Given new "CreateApplicationSecurityWafPolicy" request
     And body with value {"data": {"attributes": {"basedOn": "recommended", "description": "Policy applied to internal web applications.", "isDefault": false, "name": "Internal Network Policy", "protectionPresets": ["attack-tools"], "rules": [{"blocking": false, "enabled": true, "extended_data_collection": false, "id": "rasp-001-002"}], "rulesets": [{"blocking": false, "enabled": true, "id": "attack_tool"}], "scope": [{"env": "prod", "service": "billing-service"}], "version": 0}, "type": "policy"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF Policy returns "Concurrent Modification" response
     Given new "CreateApplicationSecurityWafPolicy" request
     And body with value {"data": {"attributes": {"basedOn": "recommended", "description": "Policy applied to internal web applications.", "isDefault": false, "name": "Internal Network Policy", "protectionPresets": ["attack-tools"], "rules": [{"blocking": false, "enabled": true, "extended_data_collection": false, "id": "rasp-001-002"}], "rulesets": [{"blocking": false, "enabled": true, "id": "attack_tool"}], "scope": [{"env": "prod", "service": "billing-service"}], "version": 0}, "type": "policy"}}
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Create a WAF Policy returns "Created" response
     Given new "CreateApplicationSecurityWafPolicy" request
     And body with value {"data": {"attributes": {"basedOn": "recommended", "description": "Policy applied to internal web applications.", "isDefault": false, "name": "Internal Network Policy", "protectionPresets": ["attack-tools"], "rules": [{"blocking": false, "enabled": true, "id": "rasp-001-002"}], "scope": [{"env": "prod", "service": "billing-service"}], "version": 0}, "type": "policy"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF custom rule returns "Bad Request" response
     Given new "CreateApplicationSecurityWafCustomRule" request
     And body with value {"data": {"attributes": {"action": {"action": "block_request", "parameters": {"location": "/blocking", "status_code": 403}}, "blocking": false, "conditions": [{"operator": "match_regex", "parameters": {"data": "blocked_users", "inputs": [{"address": "server.db.statement", "key_path": []}], "list": [], "options": {"case_sensitive": false, "min_length": 0}, "regex": "path.*", "type": "string", "value": "custom_tag"}}], "enabled": false, "name": "Block request from a bad useragent", "path_glob": "/api/search/*", "scope": [{"env": "prod", "service": "billing-service"}], "tags": {"category": "business_logic", "type": "users.login.success"}}, "type": "custom_rule"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF custom rule returns "Concurrent Modification" response
     Given new "CreateApplicationSecurityWafCustomRule" request
     And body with value {"data": {"attributes": {"action": {"action": "block_request", "parameters": {"location": "/blocking", "status_code": 403}}, "blocking": false, "conditions": [{"operator": "match_regex", "parameters": {"data": "blocked_users", "inputs": [{"address": "server.db.statement", "key_path": []}], "list": [], "options": {"case_sensitive": false, "min_length": 0}, "regex": "path.*", "type": "string", "value": "custom_tag"}}], "enabled": false, "name": "Block request from a bad useragent", "path_glob": "/api/search/*", "scope": [{"env": "prod", "service": "billing-service"}], "tags": {"category": "business_logic", "type": "users.login.success"}}, "type": "custom_rule"}}
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF custom rule returns "Created" response
     Given new "CreateApplicationSecurityWafCustomRule" request
     And body with value {"data": {"attributes": {"action": {"action": "block_request", "parameters": {"location": "/blocking", "status_code": 403}}, "blocking": false, "conditions": [{"operator": "match_regex", "parameters": {"data": "blocked_users", "inputs": [{"address": "server.db.statement", "key_path": []}], "list": [], "options": {"case_sensitive": false, "min_length": 0}, "regex": "path.*", "type": "string", "value": "custom_tag"}}], "enabled": false, "name": "Block request from a bad useragent", "path_glob": "/api/search/*", "scope": [{"env": "prod", "service": "billing-service"}], "tags": {"category": "business_logic", "type": "users.login.success"}}, "type": "custom_rule"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF exclusion filter returns "Bad Request" response
     Given new "CreateApplicationSecurityWafExclusionFilter" request
     And body with value {"data": {"attributes": {"description": "Exclude false positives on a path", "enabled": true, "ip_list": ["198.51.100.72"], "on_match": "monitor", "parameters": ["list.search.query"], "path_glob": "/accounts/*", "rules_target": [{"rule_id": "dog-913-009", "tags": {"category": "attack_attempt", "type": "lfi"}}], "scope": [{"env": "www", "service": "prod"}]}, "type": "exclusion_filter"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Create a WAF exclusion filter returns "Concurrent Modification" response
     Given new "CreateApplicationSecurityWafExclusionFilter" request
     And body with value {"data": {"attributes": {"description": "Exclude false positives on a path", "enabled": true, "ip_list": ["198.51.100.72"], "on_match": "monitor", "parameters": ["list.search.query"], "path_glob": "/accounts/*", "rules_target": [{"rule_id": "dog-913-009", "tags": {"category": "attack_attempt", "type": "lfi"}}], "scope": [{"env": "www", "service": "prod"}]}, "type": "exclusion_filter"}}
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Create a WAF exclusion filter returns "OK" response
     Given new "CreateApplicationSecurityWafExclusionFilter" request
     And body with value {"data": {"attributes": {"description": "Exclude false positives on a path", "enabled": true, "parameters": ["list.search.query"], "path_glob": "/accounts/*", "rules_target": [{"tags": {"category": "attack_attempt", "type": "lfi"}}], "scope": [{"env": "www", "service": "prod"}]}, "type": "exclusion_filter"}}
@@ -77,70 +77,70 @@ Feature: Application Security
     Then the response status is 200 OK
     And the response "data.attributes.enabled" is equal to true
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Create a legacy WAF exclusion filter returns "Bad Request" response
     Given new "CreateApplicationSecurityWafExclusionFilter" request
     And body with value {"data": {"attributes": {"description": "Exclude false positives on a path", "enabled": true, "event_query": "test:1"}, "type": "exclusion_filter"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Custom Rule returns "Concurrent Modification" response
     Given new "DeleteApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Custom Rule returns "No Content" response
     Given new "DeleteApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Custom Rule returns "Not Found" response
     Given new "DeleteApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Policy returns "Concurrent Modification" response
     Given new "DeleteApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Policy returns "No Content" response
     Given new "DeleteApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF Policy returns "Not Found" response
     Given new "DeleteApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Delete a WAF exclusion filter returns "Concurrent Modification" response
     Given new "DeleteApplicationSecurityWafExclusionFilter" request
     And request contains "exclusion_filter_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Delete a WAF exclusion filter returns "Not Found" response
     Given new "DeleteApplicationSecurityWafExclusionFilter" request
     And request contains "exclusion_filter_id" parameter with value "unknown"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Delete a WAF exclusion filter returns "OK" response
     Given there is a valid "exclusion_filter" in the system
     And new "DeleteApplicationSecurityWafExclusionFilter" request
@@ -148,7 +148,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Get Application Security details for a service returns "OK" response
     Given operation "GetAsmServiceByName" enabled
     And new "GetAsmServiceByName" request
@@ -156,7 +156,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Get a WAF Policy returns "OK" response
     Given there is a valid "policy" in the system
     And new "GetApplicationSecurityWafPolicy" request
@@ -164,21 +164,21 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Get a WAF custom rule returns "OK" response
     Given new "GetApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Get a WAF exclusion filter returns "Not Found" response
     Given new "GetApplicationSecurityWafExclusionFilter" request
     And request contains "exclusion_filter_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Get a WAF exclusion filter returns "OK" response
     Given there is a valid "exclusion_filter" in the system
     And new "GetApplicationSecurityWafExclusionFilter" request
@@ -186,25 +186,25 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: List all WAF custom rules returns "OK" response
     Given new "ListApplicationSecurityWAFCustomRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: List all WAF exclusion filters returns "OK" response
     Given new "ListApplicationSecurityWafExclusionFilters" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: List all WAF policies returns "OK" response
     Given new "ListApplicationSecurityWAFPolicies" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a WAF Custom Rule returns "Bad Request" response
     Given there is a valid "custom_rule" in the system
     And new "UpdateApplicationSecurityWafCustomRule" request
@@ -213,7 +213,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Custom Rule returns "Concurrent Modification" response
     Given new "UpdateApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
@@ -221,7 +221,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Custom Rule returns "Not Found" response
     Given new "UpdateApplicationSecurityWafCustomRule" request
     And request contains "custom_rule_id" parameter from "REPLACE.ME"
@@ -229,7 +229,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a WAF Custom Rule returns "OK" response
     Given there is a valid "custom_rule" in the system
     And new "UpdateApplicationSecurityWafCustomRule" request
@@ -238,7 +238,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Policy returns "Bad Request" response
     Given new "UpdateApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -246,7 +246,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Policy returns "Concurrent Modification" response
     Given new "UpdateApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -254,7 +254,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Policy returns "Not Found" response
     Given new "UpdateApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -262,7 +262,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF Policy returns "OK" response
     Given new "UpdateApplicationSecurityWafPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -270,7 +270,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a WAF exclusion filter returns "Bad Request" response
     Given there is a valid "custom_rule" in the system
     And new "UpdateApplicationSecurityWafExclusionFilter" request
@@ -279,7 +279,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/asm-backend
+  @generated @skip @team:ddoghq/asm-backend
   Scenario: Update a WAF exclusion filter returns "Concurrent Modification" response
     Given new "UpdateApplicationSecurityWafExclusionFilter" request
     And request contains "exclusion_filter_id" parameter from "REPLACE.ME"
@@ -287,7 +287,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a WAF exclusion filter returns "Not Found" response
     Given new "UpdateApplicationSecurityWafExclusionFilter" request
     And request contains "exclusion_filter_id" parameter with value "unknown"
@@ -295,7 +295,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a WAF exclusion filter returns "OK" response
     Given there is a valid "exclusion_filter" in the system
     And new "UpdateApplicationSecurityWafExclusionFilter" request
@@ -304,7 +304,7 @@ Feature: Application Security
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/asm-backend
+  @team:ddoghq/asm-backend
   Scenario: Update a legacy WAF exclusion filter returns "Bad Request" response
     Given there is a valid "exclusion_filter" in the system
     And new "UpdateApplicationSecurityWafExclusionFilter" request
diff --git a/features/v2/audit.feature b/features/v2/audit.feature
index 20a2c45f342c..0c6139bc184e 100644
--- a/features/v2/audit.feature
+++ b/features/v2/audit.feature
@@ -7,19 +7,19 @@ Feature: Audit
     And a valid "appKeyAuth" key in the system
     And an instance of "Audit" API
 
-  @generated @skip @team:DataDog/audit-trail
+  @generated @skip @team:ddoghq/audit-trail
   Scenario: Get a list of Audit Logs events returns "Bad Request" response
     Given new "ListAuditLogs" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/audit-trail
+  @team:ddoghq/audit-trail
   Scenario: Get a list of Audit Logs events returns "OK" response
     Given new "ListAuditLogs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/audit-trail @with-pagination
+  @replay-only @skip-validation @team:ddoghq/audit-trail @with-pagination
   Scenario: Get a list of Audit Logs events returns "OK" response with pagination
     Given new "ListAuditLogs" request
     And request contains "page[limit]" parameter with value 2
@@ -27,21 +27,21 @@ Feature: Audit
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/audit-trail
+  @generated @skip @team:ddoghq/audit-trail
   Scenario: Search Audit Logs events returns "Bad Request" response
     Given new "SearchAuditLogs" request
     And body with value {"filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/audit-trail
+  @team:ddoghq/audit-trail
   Scenario: Search Audit Logs events returns "OK" response
     Given new "SearchAuditLogs" request
     And body with value {"filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "options": {"time_offset": 0, "timezone": "GMT"}, "page": {"limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/audit-trail @with-pagination
+  @replay-only @skip-validation @team:ddoghq/audit-trail @with-pagination
   Scenario: Search Audit Logs events returns "OK" response with pagination
     Given new "SearchAuditLogs" request
     And body with value {"filter": {"from": "now-15m", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"limit": 2}, "sort": "timestamp"}
diff --git a/features/v2/authn_mappings.feature b/features/v2/authn_mappings.feature
index 0065724463dc..a38037da41b8 100644
--- a/features/v2/authn_mappings.feature
+++ b/features/v2/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @team:ddoghq/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/delegated-auth-login
+  @team:ddoghq/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/features/v2/aws_integration.feature b/features/v2/aws_integration.feature
index 8d91676e64bb..ed35928deb3c 100644
--- a/features/v2/aws_integration.feature
+++ b/features/v2/aws_integration.feature
@@ -9,7 +9,7 @@ Feature: AWS Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "AWSIntegration" API
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Create AWS CCM config returns "AWS CCM Config object" response
     Given operation "CreateAWSAccountCCMConfig" enabled
     And new "CreateAWSAccountCCMConfig" request
@@ -18,7 +18,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS CCM Config object
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Create AWS CCM config returns "Conflict" response
     Given operation "CreateAWSAccountCCMConfig" enabled
     And new "CreateAWSAccountCCMConfig" request
@@ -27,7 +27,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Create AWS CCM config returns "Not Found" response
     Given operation "CreateAWSAccountCCMConfig" enabled
     And new "CreateAWSAccountCCMConfig" request
@@ -36,28 +36,28 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Create an AWS account returns "AWS Account object" response
     Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "AWS Account object" response
     Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 200 AWS Account object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "Bad Request" response
     Given new "CreateAWSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws-invalid", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Create an AWS integration returns "Conflict" response
     Given there is a valid "aws_account_v2" in the system
     And new "CreateAWSAccount" request
@@ -65,28 +65,28 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an Amazon EventBridge source returns "Amazon EventBridge source created." response
     Given new "CreateAWSEventBridgeSource" request
     And body with value {"data": {"attributes": {"account_id": "123456789012", "create_event_bus": true, "event_generator_name": "app-alerts", "region": "us-east-1"}, "type": "event_bridge"}}
     When the request is sent
     Then the response status is 200 Amazon EventBridge source created.
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an Amazon EventBridge source returns "Bad Request" response
     Given new "CreateAWSEventBridgeSource" request
     And body with value {"data": {"attributes": {"account_id": "123456789012", "create_event_bus": true, "event_generator_name": "app-alerts", "region": "us-east-1"}, "type": "event_bridge"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Create an Amazon EventBridge source returns "Conflict" response
     Given new "CreateAWSEventBridgeSource" request
     And body with value {"data": {"attributes": {"account_id": "123456789012", "create_event_bus": true, "event_generator_name": "app-alerts", "region": "us-east-1"}, "type": "event_bridge"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Delete AWS CCM config returns "No Content" response
     Given operation "DeleteAWSAccountCCMConfig" enabled
     And new "DeleteAWSAccountCCMConfig" request
@@ -94,7 +94,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Delete AWS CCM config returns "Not Found" response
     Given operation "DeleteAWSAccountCCMConfig" enabled
     And new "DeleteAWSAccountCCMConfig" request
@@ -102,14 +102,14 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "Bad Request" response
     Given new "DeleteAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "not-a-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "No Content" response
     Given there is a valid "aws_account_v2" in the system
     And new "DeleteAWSAccount" request
@@ -117,7 +117,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Delete an AWS integration returns "Not Found" response
     Given there is a valid "aws_account_v2" in the system
     And new "DeleteAWSAccount" request
@@ -125,33 +125,33 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an Amazon EventBridge source returns "Amazon EventBridge source deleted." response
     Given new "DeleteAWSEventBridgeSource" request
     And body with value {"data": {"attributes": {"account_id": "123456789012", "event_generator_name": "app-alerts-zyxw3210", "region": "us-east-1"}, "type": "event_bridge"}}
     When the request is sent
     Then the response status is 200 Amazon EventBridge source deleted.
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Delete an Amazon EventBridge source returns "Bad Request" response
     Given new "DeleteAWSEventBridgeSource" request
     And body with value {"data": {"attributes": {"account_id": "123456789012", "event_generator_name": "app-alerts-zyxw3210", "region": "us-east-1"}, "type": "event_bridge"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Generate a new external ID returns "AWS External ID object" response
     Given new "CreateNewAWSExternalID" request
     When the request is sent
     Then the response status is 200 AWS External ID object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Generate new external ID returns "AWS External ID object" response
     Given new "CreateNewAWSExternalID" request
     When the request is sent
     Then the response status is 200 AWS External ID object
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS CCM config returns "AWS CCM Config object" response
     Given operation "GetAWSAccountCCMConfig" enabled
     And new "GetAWSAccountCCMConfig" request
@@ -159,7 +159,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS CCM Config object
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS CCM config returns "Not Found" response
     Given operation "GetAWSAccountCCMConfig" enabled
     And new "GetAWSAccountCCMConfig" request
@@ -167,25 +167,25 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS integration IAM permissions returns "AWS IAM Permissions object" response
     Given new "GetAWSIntegrationIAMPermissions" request
     When the request is sent
     Then the response status is 200 AWS IAM Permissions object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get AWS integration standard IAM permissions returns "AWS IAM Permissions object" response
     Given new "GetAWSIntegrationIAMPermissionsStandard" request
     When the request is sent
     Then the response status is 200 AWS IAM Permissions object
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS integration standard IAM permissions returns "AWS integration standard IAM permissions." response
     Given new "GetAWSIntegrationIAMPermissionsStandard" request
     When the request is sent
     Then the response status is 200 AWS integration standard IAM permissions.
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS metric name filter preview returns "AWS metric name filter preview result" response
     Given operation "GetAWSMetricNameFilterPreview" enabled
     And new "GetAWSMetricNameFilterPreview" request
@@ -193,7 +193,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS metric name filter preview result
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get AWS metric name filter preview returns "Not Found" response
     Given operation "GetAWSMetricNameFilterPreview" enabled
     And new "GetAWSMetricNameFilterPreview" request
@@ -201,19 +201,19 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all Amazon EventBridge sources returns "Amazon EventBridge sources list." response
     Given new "ListAWSEventBridgeSources" request
     When the request is sent
     Then the response status is 200 Amazon EventBridge sources list.
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get all Amazon EventBridge sources returns "Bad Request" response
     Given new "ListAWSEventBridgeSources" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get an AWS integration by config ID returns "AWS Account object" response
     Given there is a valid "aws_account_v2" in the system
     And new "GetAWSAccount" request
@@ -221,51 +221,51 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS Account object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get an AWS integration by config ID returns "Bad Request" response
     Given new "GetAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "not-a-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get an AWS integration by config ID returns "Not Found" response
     Given new "GetAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get resource collection IAM permissions returns "AWS IAM Permissions object" response
     Given new "GetAWSIntegrationIAMPermissionsResourceCollection" request
     When the request is sent
     Then the response status is 200 AWS IAM Permissions object
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Get resource collection IAM permissions returns "AWS integration resource collection IAM permissions." response
     Given new "GetAWSIntegrationIAMPermissionsResourceCollection" request
     When the request is sent
     Then the response status is 200 AWS integration resource collection IAM permissions.
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: List all AWS integrations returns "AWS Accounts List object" response
     Given new "ListAWSAccounts" request
     When the request is sent
     Then the response status is 200 AWS Accounts List object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: List available namespaces returns "AWS Namespaces List object" response
     Given new "ListAWSNamespaces" request
     When the request is sent
     Then the response status is 200 AWS Namespaces List object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: List namespaces returns "AWS Namespaces List object" response
     Given new "ListAWSNamespaces" request
     When the request is sent
     Then the response status is 200 AWS Namespaces List object
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Preview AWS metric name filter returns "AWS metric name filter preview result" response
     Given operation "PreviewAWSMetricNameFilter" enabled
     And new "PreviewAWSMetricNameFilter" request
@@ -274,7 +274,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS metric name filter preview result
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Preview AWS metric name filter returns "Bad Request" response
     Given operation "PreviewAWSMetricNameFilter" enabled
     And new "PreviewAWSMetricNameFilter" request
@@ -283,7 +283,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Preview AWS metric name filter returns "Not Found" response
     Given operation "PreviewAWSMetricNameFilter" enabled
     And new "PreviewAWSMetricNameFilter" request
@@ -292,7 +292,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Update AWS CCM config returns "AWS CCM Config object" response
     Given operation "UpdateAWSAccountCCMConfig" enabled
     And new "UpdateAWSAccountCCMConfig" request
@@ -301,7 +301,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS CCM Config object
 
-  @skip @team:DataDog/aws-integrations
+  @skip @team:ddoghq/aws-integrations
   Scenario: Update AWS CCM config returns "Not Found" response
     Given operation "UpdateAWSAccountCCMConfig" enabled
     And new "UpdateAWSAccountCCMConfig" request
@@ -310,7 +310,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "AWS Account object" response
     Given there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
@@ -319,7 +319,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS Account object
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "Bad Request" response
     Given there is a valid "aws_account_v2" in the system
     And new "UpdateAWSAccount" request
@@ -328,7 +328,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Update an AWS integration returns "Not Found" response
     Given new "UpdateAWSAccount" request
     And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a"
@@ -336,7 +336,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Validate AWS CCM config returns "AWS CCM Config validation result" response
     Given operation "ValidateAWSCCMConfig" enabled
     And new "ValidateAWSCCMConfig" request
@@ -344,7 +344,7 @@ Feature: AWS Integration
     When the request is sent
     Then the response status is 200 AWS CCM Config validation result
 
-  @generated @skip @team:DataDog/aws-integrations
+  @generated @skip @team:ddoghq/aws-integrations
   Scenario: Validate AWS CCM config returns "Bad Request" response
     Given operation "ValidateAWSCCMConfig" enabled
     And new "ValidateAWSCCMConfig" request
diff --git a/features/v2/aws_logs_integration.feature b/features/v2/aws_logs_integration.feature
index 0dc915e57948..133c2fa1be0f 100644
--- a/features/v2/aws_logs_integration.feature
+++ b/features/v2/aws_logs_integration.feature
@@ -5,7 +5,7 @@ Feature: AWS Logs Integration
   page](https://docs.datadoghq.com/integrations/amazon_web_services/#log-
   collection).
 
-  @team:DataDog/aws-integrations
+  @team:ddoghq/aws-integrations
   Scenario: Get list of AWS log ready services returns "AWS Logs Services List object" response
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
diff --git a/features/v2/bits_ai.feature b/features/v2/bits_ai.feature
index bc5ec941d8fa..52c8a9b56fbe 100644
--- a/features/v2/bits_ai.feature
+++ b/features/v2/bits_ai.feature
@@ -7,7 +7,7 @@ Feature: Bits AI
     And a valid "appKeyAuth" key in the system
     And an instance of "BitsAI" API
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: Get a Bits AI investigation returns "Bad Request" response
     Given operation "GetInvestigation" enabled
     And new "GetInvestigation" request
@@ -15,7 +15,7 @@ Feature: Bits AI
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: Get a Bits AI investigation returns "Not Found" response
     Given operation "GetInvestigation" enabled
     And new "GetInvestigation" request
@@ -23,7 +23,7 @@ Feature: Bits AI
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: Get a Bits AI investigation returns "OK" response
     Given operation "GetInvestigation" enabled
     And new "GetInvestigation" request
@@ -31,28 +31,28 @@ Feature: Bits AI
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: List Bits AI investigations returns "Bad Request" response
     Given operation "ListInvestigations" enabled
     And new "ListInvestigations" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: List Bits AI investigations returns "OK" response
     Given operation "ListInvestigations" enabled
     And new "ListInvestigations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/bits-ai @with-pagination
+  @generated @skip @team:ddoghq/bits-ai @with-pagination
   Scenario: List Bits AI investigations returns "OK" response with pagination
     Given operation "ListInvestigations" enabled
     And new "ListInvestigations" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: Trigger a Bits AI investigation returns "Bad Request" response
     Given operation "TriggerInvestigation" enabled
     And new "TriggerInvestigation" request
@@ -60,7 +60,7 @@ Feature: Bits AI
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/bits-ai
+  @generated @skip @team:ddoghq/bits-ai
   Scenario: Trigger a Bits AI investigation returns "OK" response
     Given operation "TriggerInvestigation" enabled
     And new "TriggerInvestigation" request
diff --git a/features/v2/case_management.feature b/features/v2/case_management.feature
index b3b7a0a72e55..d46c12b3c2e2 100644
--- a/features/v2/case_management.feature
+++ b/features/v2/case_management.feature
@@ -11,7 +11,7 @@ Feature: Case Management
     And a valid "appKeyAuth" key in the system
     And an instance of "CaseManagement" API
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Add insights to a case returns "Bad Request" response
     Given new "AddCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -19,7 +19,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Add insights to a case returns "Not Found" response
     Given new "AddCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -27,7 +27,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Add insights to a case returns "OK" response
     Given new "AddCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -35,28 +35,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Aggregate cases returns "Bad Request" response
     Given new "AggregateCases" request
     And body with value {"data": {"attributes": {"group_by": {"groups": ["status"], "limit": 14}, "query_filter": "service:case-api"}, "type": "aggregate"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Aggregate cases returns "Not Found" response
     Given new "AggregateCases" request
     And body with value {"data": {"attributes": {"group_by": {"groups": ["status"], "limit": 14}, "query_filter": "service:case-api"}, "type": "aggregate"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Aggregate cases returns "OK" response
     Given new "AggregateCases" request
     And body with value {"data": {"attributes": {"group_by": {"groups": ["status"], "limit": 14}, "query_filter": "service:case-api"}, "type": "aggregate"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Archive case returns "Bad Request" response
     Given new "ArchiveCase" request
     And there is a valid "case" in the system
@@ -65,7 +65,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Archive case returns "Not Found" response
     Given new "ArchiveCase" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -73,7 +73,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Archive case returns "OK" response
     Given new "ArchiveCase" request
     And there is a valid "case" in the system
@@ -82,7 +82,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Assign case returns "Bad Request" response
     Given new "AssignCase" request
     And there is a valid "case" in the system
@@ -91,7 +91,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Assign case returns "Not Found" response
     Given new "AssignCase" request
     And there is a valid "user" in the system
@@ -100,7 +100,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Assign case returns "OK" response
     Given new "AssignCase" request
     And there is a valid "case" in the system
@@ -110,28 +110,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Bulk update cases returns "Bad Request" response
     Given new "BulkUpdateCases" request
     And body with value {"data": {"attributes": {"case_ids": ["case-id-1", "case-id-2"], "payload": {"priority": "P1"}, "type": "priority"}, "type": "bulk"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Bulk update cases returns "Not Found" response
     Given new "BulkUpdateCases" request
     And body with value {"data": {"attributes": {"case_ids": ["case-id-1", "case-id-2"], "payload": {"priority": "P1"}, "type": "priority"}, "type": "bulk"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Bulk update cases returns "OK" response
     Given new "BulkUpdateCases" request
     And body with value {"data": {"attributes": {"case_ids": ["case-id-1", "case-id-2"], "payload": {"priority": "P1"}, "type": "priority"}, "type": "bulk"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Comment case returns "Bad Request" response
     Given new "CommentCase" request
     And there is a valid "case" in the system
@@ -140,7 +140,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Comment case returns "Not Found" response
     Given new "CommentCase" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -148,7 +148,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Comment case returns "OK" response
     Given new "CommentCase" request
     And there is a valid "case" in the system
@@ -157,25 +157,25 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Count cases returns "Bad Request" response
     Given new "CountCases" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Count cases returns "Not Found" response
     Given new "CountCases" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Count cases returns "OK" response
     Given new "CountCases" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create Jira issue for case returns "Accepted" response
     Given new "CreateCaseJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -183,7 +183,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create Jira issue for case returns "Bad Request" response
     Given new "CreateCaseJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -191,7 +191,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create Jira issue for case returns "Not Found" response
     Given new "CreateCaseJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -199,7 +199,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create ServiceNow ticket for case returns "Accepted" response
     Given new "CreateCaseServiceNowTicket" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -207,7 +207,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create ServiceNow ticket for case returns "Bad Request" response
     Given new "CreateCaseServiceNowTicket" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -215,7 +215,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create ServiceNow ticket for case returns "Not Found" response
     Given new "CreateCaseServiceNowTicket" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -223,35 +223,35 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case link returns "Bad Request" response
     Given new "CreateCaseLink" request
     And body with value {"data": {"attributes": {"child_entity_id": "4417921d-0866-4a38-822c-6f2a0f65f77d", "child_entity_type": "CASE", "parent_entity_id": "bf0cbac6-4c16-4cfb-b6bf-ca5e0ec37a4f", "parent_entity_type": "CASE", "relationship": "BLOCKS"}, "type": "link"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case link returns "Created" response
     Given new "CreateCaseLink" request
     And body with value {"data": {"attributes": {"child_entity_id": "4417921d-0866-4a38-822c-6f2a0f65f77d", "child_entity_type": "CASE", "parent_entity_id": "bf0cbac6-4c16-4cfb-b6bf-ca5e0ec37a4f", "parent_entity_type": "CASE", "relationship": "BLOCKS"}, "type": "link"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case link returns "Not Found" response
     Given new "CreateCaseLink" request
     And body with value {"data": {"attributes": {"child_entity_id": "4417921d-0866-4a38-822c-6f2a0f65f77d", "child_entity_type": "CASE", "parent_entity_id": "bf0cbac6-4c16-4cfb-b6bf-ca5e0ec37a4f", "parent_entity_type": "CASE", "relationship": "BLOCKS"}, "type": "link"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create a case returns "Bad Request" response
     Given new "CreateCase" request
     And body with value {"data": {"attributes": {"priority": "NOT_DEFINED", "title": "Security breach investigation", "type_id": "00000000-0000-0000-0000-000000000001"}, "relationships": {"assignee": {"data": {"id": "e555e290-ed65-49bd-ae18-8acbfcf18db7", "type": "userx"}}, "project": {"data": {"id": "e555e290-ed65-49bd-ae18-8acbfcf18db7", "type": "project"}}}, "type": "case"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create a case returns "CREATED" response
     Given new "CreateCase" request
     And there is a valid "user" in the system
@@ -263,56 +263,56 @@ Feature: Case Management
     And the response "data.attributes.type" is equal to "STANDARD"
     And the response "data.attributes.priority" is equal to "NOT_DEFINED"
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create a case returns "Not Found" response
     Given new "CreateCase" request
     And body with value {"data": {"attributes": {"priority": "NOT_DEFINED", "title": "Security breach investigation", "type_id": "00000000-0000-0000-0000-000000000001"}, "relationships": {"assignee": {"data": {"id": "721074c8-63df-4d8f-a43d-ab41dd24ec35", "type": "user"}}, "project": {"data": {"id": "721074c8-63df-4d8f-a43d-ab41dd24ec35", "type": "project"}}}, "type": "case"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case view returns "Bad Request" response
     Given new "CreateCaseView" request
     And body with value {"data": {"attributes": {"name": "Open bugs", "project_id": "e555e290-ed65-49bd-ae18-8acbfcf18db7", "query": "status:open type:bug"}, "type": "view"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case view returns "Created" response
     Given new "CreateCaseView" request
     And body with value {"data": {"attributes": {"name": "Open bugs", "project_id": "e555e290-ed65-49bd-ae18-8acbfcf18db7", "query": "status:open type:bug"}, "type": "view"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a case view returns "Not Found" response
     Given new "CreateCaseView" request
     And body with value {"data": {"attributes": {"name": "Open bugs", "project_id": "e555e290-ed65-49bd-ae18-8acbfcf18db7", "query": "status:open type:bug"}, "type": "view"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a maintenance window returns "Bad Request" response
     Given new "CreateMaintenanceWindow" request
     And body with value {"data": {"attributes": {"end_at": "2026-06-01T06:00:00Z", "name": "Weekly maintenance", "query": "project:SEC", "start_at": "2026-06-01T00:00:00Z"}, "type": "maintenance_window"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a maintenance window returns "Created" response
     Given new "CreateMaintenanceWindow" request
     And body with value {"data": {"attributes": {"end_at": "2026-06-01T06:00:00Z", "name": "Weekly maintenance", "query": "project:SEC", "start_at": "2026-06-01T00:00:00Z"}, "type": "maintenance_window"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a maintenance window returns "Not Found" response
     Given new "CreateMaintenanceWindow" request
     And body with value {"data": {"attributes": {"end_at": "2026-06-01T06:00:00Z", "name": "Weekly maintenance", "query": "project:SEC", "start_at": "2026-06-01T00:00:00Z"}, "type": "maintenance_window"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a notification rule returns "Bad Request" response
     Given new "CreateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -320,7 +320,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a notification rule returns "CREATED" response
     Given new "CreateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -328,7 +328,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a notification rule returns "Not Found" response
     Given new "CreateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -336,28 +336,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a project returns "Bad Request" response
     Given new "CreateProject" request
     And body with value {"data": {"attributes": {"enabled_custom_case_types": [], "key": "SEC", "name": "Security Investigation"}, "type": "project"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a project returns "CREATED" response
     Given new "CreateProject" request
     And body with value {"data": {"attributes": {"enabled_custom_case_types": [], "key": "SEC", "name": "Security Investigation"}, "type": "project"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a project returns "Not Found" response
     Given new "CreateProject" request
     And body with value {"data": {"attributes": {"enabled_custom_case_types": [], "key": "SEC", "name": "Security Investigation"}, "type": "project"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create an automation rule returns "Bad Request" response
     Given new "CreateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -365,7 +365,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create an automation rule returns "Created" response
     Given new "CreateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -373,7 +373,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create an automation rule returns "Not Found" response
     Given new "CreateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -381,7 +381,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create investigation notebook for case returns "Bad Request" response
     Given new "CreateCaseNotebook" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -389,7 +389,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create investigation notebook for case returns "No Content" response
     Given new "CreateCaseNotebook" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -397,7 +397,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create investigation notebook for case returns "Not Found" response
     Given new "CreateCaseNotebook" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -405,70 +405,70 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case link returns "Bad Request" response
     Given new "DeleteCaseLink" request
     And request contains "link_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case link returns "No Content" response
     Given new "DeleteCaseLink" request
     And request contains "link_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case link returns "Not Found" response
     Given new "DeleteCaseLink" request
     And request contains "link_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case view returns "Bad Request" response
     Given new "DeleteCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case view returns "No Content" response
     Given new "DeleteCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case view returns "Not Found" response
     Given new "DeleteCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a maintenance window returns "Bad Request" response
     Given new "DeleteMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a maintenance window returns "No Content" response
     Given new "DeleteMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a maintenance window returns "Not Found" response
     Given new "DeleteMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a notification rule returns "API error response" response
     Given new "DeleteProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -476,7 +476,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 API error response
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a notification rule returns "No Content" response
     Given new "DeleteProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -484,7 +484,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete an automation rule returns "No Content" response
     Given new "DeleteCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -492,7 +492,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete an automation rule returns "Not Found" response
     Given new "DeleteCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -500,7 +500,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Delete case comment returns "Bad Request" response
     Given new "DeleteCaseComment" request
     And there is a valid "case" in the system
@@ -509,7 +509,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Delete case comment returns "No Content" response
     Given new "DeleteCaseComment" request
     And there is a valid "case" in the system
@@ -519,7 +519,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Delete case comment returns "Not Found" response
     Given new "DeleteCaseComment" request
     And there is a valid "case" in the system
@@ -528,7 +528,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Delete custom attribute from case returns "Not Found" response
     Given new "DeleteCaseCustomAttribute" request
     And there is a valid "case" in the system
@@ -537,7 +537,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Delete custom attribute from case returns "OK" response
     Given new "DeleteCaseCustomAttribute" request
     And there is a valid "case_type" in the system
@@ -548,7 +548,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Disable an automation rule returns "Bad Request" response
     Given new "DisableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -556,7 +556,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Disable an automation rule returns "Not Found" response
     Given new "DisableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -564,7 +564,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Disable an automation rule returns "OK" response
     Given new "DisableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -572,7 +572,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Enable an automation rule returns "Bad Request" response
     Given new "EnableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -580,7 +580,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Enable an automation rule returns "Not Found" response
     Given new "EnableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -588,7 +588,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Enable an automation rule returns "OK" response
     Given new "EnableCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -596,67 +596,67 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Favorite a project returns "Bad Request" response
     Given new "FavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Favorite a project returns "No Content" response
     Given new "FavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Favorite a project returns "Not Found" response
     Given new "FavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a case view returns "Bad Request" response
     Given new "GetCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a case view returns "Not Found" response
     Given new "GetCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a case view returns "OK" response
     Given new "GetCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get all projects returns "Bad Request" response
     Given new "GetProjects" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get all projects returns "Not Found" response
     Given new "GetProjects" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get all projects returns "OK" response
     Given new "GetProjects" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get an automation rule returns "Bad Request" response
     Given new "GetCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -664,7 +664,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get an automation rule returns "Not Found" response
     Given new "GetCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -672,7 +672,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get an automation rule returns "OK" response
     Given new "GetCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -680,49 +680,49 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get case timeline returns "Bad Request" response
     Given new "ListCaseTimeline" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get case timeline returns "Not Found" response
     Given new "ListCaseTimeline" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get case timeline returns "OK" response
     Given new "ListCaseTimeline" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get notification rules returns "Bad Request" response
     Given new "GetProjectNotificationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get notification rules returns "Not Found" response
     Given new "GetProjectNotificationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get notification rules returns "OK" response
     Given new "GetProjectNotificationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Get the details of a case returns "Bad Request" response
     Given new "GetCase" request
     And there is a valid "case" in the system
@@ -730,14 +730,14 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Get the details of a case returns "Not Found" response
     Given new "GetCase" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Get the details of a case returns "OK" response
     Given new "GetCase" request
     And there is a valid "case" in the system
@@ -745,28 +745,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get the details of a project returns "Bad Request" response
     Given new "GetProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get the details of a project returns "Not Found" response
     Given new "GetProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get the details of a project returns "OK" response
     Given new "GetProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link existing Jira issue to case returns "Bad Request" response
     Given new "LinkJiraIssueToCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -774,7 +774,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link existing Jira issue to case returns "Conflict" response
     Given new "LinkJiraIssueToCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -782,7 +782,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link existing Jira issue to case returns "No Content" response
     Given new "LinkJiraIssueToCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -790,7 +790,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link existing Jira issue to case returns "Not Found" response
     Given new "LinkJiraIssueToCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -798,7 +798,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link incident to case returns "Bad Request" response
     Given new "LinkIncident" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -806,7 +806,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link incident to case returns "Created" response
     Given new "LinkIncident" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -814,7 +814,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Link incident to case returns "Not Found" response
     Given new "LinkIncident" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -822,28 +822,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List automation rules returns "Bad Request" response
     Given new "ListCaseAutomationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List automation rules returns "Not Found" response
     Given new "ListCaseAutomationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List automation rules returns "OK" response
     Given new "ListCaseAutomationRules" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case links returns "Bad Request" response
     Given new "ListCaseLinks" request
     And request contains "entity_type" parameter from "REPLACE.ME"
@@ -851,7 +851,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case links returns "Not Found" response
     Given new "ListCaseLinks" request
     And request contains "entity_type" parameter from "REPLACE.ME"
@@ -859,7 +859,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case links returns "OK" response
     Given new "ListCaseLinks" request
     And request contains "entity_type" parameter from "REPLACE.ME"
@@ -867,120 +867,120 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case views returns "Bad Request" response
     Given new "ListCaseViews" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case views returns "Not Found" response
     Given new "ListCaseViews" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case views returns "OK" response
     Given new "ListCaseViews" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case watchers returns "Bad Request" response
     Given new "ListCaseWatchers" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case watchers returns "Not Found" response
     Given new "ListCaseWatchers" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List case watchers returns "OK" response
     Given new "ListCaseWatchers" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List maintenance windows returns "Bad Request" response
     Given new "ListMaintenanceWindows" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List maintenance windows returns "Not Found" response
     Given new "ListMaintenanceWindows" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List maintenance windows returns "OK" response
     Given new "ListMaintenanceWindows" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List project favorites returns "Bad Request" response
     Given new "ListUserCaseProjectFavorites" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List project favorites returns "Not Found" response
     Given new "ListUserCaseProjectFavorites" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: List project favorites returns "OK" response
     Given new "ListUserCaseProjectFavorites" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove Jira issue link from case returns "Bad Request" response
     Given new "UnlinkJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove Jira issue link from case returns "No Content" response
     Given new "UnlinkJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove Jira issue link from case returns "Not Found" response
     Given new "UnlinkJiraIssue" request
     And request contains "case_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove a project returns "API error response" response
     Given new "DeleteProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove a project returns "No Content" response
     Given new "DeleteProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove insights from a case returns "Bad Request" response
     Given new "RemoveCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -988,7 +988,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove insights from a case returns "Not Found" response
     Given new "RemoveCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -996,7 +996,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Remove insights from a case returns "OK" response
     Given new "RemoveCaseInsights" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1004,25 +1004,25 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Search cases returns "Bad Request" response
     Given new "SearchCases" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Search cases returns "Not Found" response
     Given new "SearchCases" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Search cases returns "OK" response
     Given new "SearchCases" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/case-management @with-pagination
+  @replay-only @skip-validation @team:ddoghq/case-management @with-pagination
   Scenario: Search cases returns "OK" response with pagination
     Given new "SearchCases" request
     And request contains "page[size]" parameter with value 2
@@ -1031,7 +1031,7 @@ Feature: Case Management
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unarchive case returns "Bad Request" response
     Given new "UnarchiveCase" request
     And there is a valid "case" in the system
@@ -1040,7 +1040,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unarchive case returns "Not Found" response
     Given new "UnarchiveCase" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1048,7 +1048,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unarchive case returns "OK" response
     Given new "UnarchiveCase" request
     And there is a valid "case" in the system
@@ -1057,7 +1057,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unassign case returns "Bad Request" response
     Given new "UnassignCase" request
     And there is a valid "case" in the system
@@ -1066,7 +1066,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unassign case returns "Not Found" response
     Given new "UnassignCase" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1074,7 +1074,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Unassign case returns "OK" response
     Given new "UnassignCase" request
     And there is a valid "case" in the system
@@ -1083,28 +1083,28 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unfavorite a project returns "Bad Request" response
     Given new "UnfavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unfavorite a project returns "No Content" response
     Given new "UnfavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unfavorite a project returns "Not Found" response
     Given new "UnfavoriteCaseProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unwatch a case returns "Bad Request" response
     Given new "UnwatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1112,7 +1112,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unwatch a case returns "No Content" response
     Given new "UnwatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1120,7 +1120,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Unwatch a case returns "Not Found" response
     Given new "UnwatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1128,7 +1128,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case view returns "Bad Request" response
     Given new "UpdateCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
@@ -1136,7 +1136,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case view returns "Not Found" response
     Given new "UpdateCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
@@ -1144,7 +1144,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case view returns "OK" response
     Given new "UpdateCaseView" request
     And request contains "view_id" parameter from "REPLACE.ME"
@@ -1152,7 +1152,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a maintenance window returns "Bad Request" response
     Given new "UpdateMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
@@ -1160,7 +1160,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a maintenance window returns "Not Found" response
     Given new "UpdateMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
@@ -1168,7 +1168,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a maintenance window returns "OK" response
     Given new "UpdateMaintenanceWindow" request
     And request contains "maintenance_window_id" parameter from "REPLACE.ME"
@@ -1176,7 +1176,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a notification rule returns "Bad Request" response
     Given new "UpdateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1185,7 +1185,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a notification rule returns "No Content" response
     Given new "UpdateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1194,7 +1194,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a notification rule returns "Not Found" response
     Given new "UpdateProjectNotificationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1203,7 +1203,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update a project returns "Bad Request" response
     Given new "UpdateProject" request
     And request contains "project_id" parameter with value "d4bbe1af-f36e-42f1-87c1-493ca35c320e"
@@ -1211,7 +1211,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update a project returns "Not Found" response
     Given new "UpdateProject" request
     And request contains "project_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1219,7 +1219,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update a project returns "OK" response
     Given new "UpdateProject" request
     And request contains "project_id" parameter with value "d4bbe1af-f36e-42f1-87c1-493ca35c320e"
@@ -1229,7 +1229,7 @@ Feature: Case Management
     And the response "data" has field "id"
     And the response "data.attributes.name" is equal to "Updated Project Name {{ unique }}"
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update an automation rule returns "Bad Request" response
     Given new "UpdateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1238,7 +1238,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update an automation rule returns "Not Found" response
     Given new "UpdateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1247,7 +1247,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update an automation rule returns "OK" response
     Given new "UpdateCaseAutomationRule" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1256,7 +1256,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Update case attributes returns "Bad Request" response
     Given new "UpdateAttributes" request
     And there is a valid "case" in the system
@@ -1265,7 +1265,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case attributes returns "Not Found" response
     Given new "UpdateAttributes" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1273,7 +1273,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case attributes returns "OK" response
     Given new "UpdateAttributes" request
     And there is a valid "case" in the system
@@ -1282,7 +1282,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case comment returns "Bad Request" response
     Given new "UpdateCaseComment" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1291,7 +1291,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case comment returns "Not Found" response
     Given new "UpdateCaseComment" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1300,7 +1300,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case comment returns "OK" response
     Given new "UpdateCaseComment" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1309,7 +1309,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Update case custom attribute returns "Bad Request" response
     Given new "UpdateCaseCustomAttribute" request
     And there is a valid "case_type" in the system
@@ -1321,7 +1321,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case custom attribute returns "Not Found" response
     Given new "UpdateCaseCustomAttribute" request
     And there is a valid "case" in the system
@@ -1331,7 +1331,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Update case custom attribute returns "OK" response
     Given new "UpdateCaseCustomAttribute" request
     And there is a valid "case_type" in the system
@@ -1343,7 +1343,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Update case description returns "Bad Request" response
     Given new "UpdateCaseDescription" request
     And there is a valid "case" in the system
@@ -1352,7 +1352,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case description returns "Not Found" response
     Given new "UpdateCaseDescription" request
     And request contains "case_id" parameter with value "0198c6b0-2a0a-7bea-87ff-3876f119aebb"
@@ -1360,7 +1360,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case description returns "OK" response
     Given new "UpdateCaseDescription" request
     And there is a valid "case" in the system
@@ -1369,7 +1369,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case due date returns "Bad Request" response
     Given new "UpdateCaseDueDate" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1377,7 +1377,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case due date returns "Not Found" response
     Given new "UpdateCaseDueDate" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1385,7 +1385,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case due date returns "OK" response
     Given new "UpdateCaseDueDate" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1393,7 +1393,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case priority returns "Bad Request" response
     Given new "UpdatePriority" request
     And there is a valid "case" in the system
@@ -1402,7 +1402,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case priority returns "Not Found" response
     Given new "UpdatePriority" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1410,7 +1410,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case priority returns "OK" response
     Given new "UpdatePriority" request
     And there is a valid "case" in the system
@@ -1420,7 +1420,7 @@ Feature: Case Management
     Then the response status is 200 OK
     And the response "data.attributes.priority" is equal to "P3"
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case project returns "Bad Request" response
     Given new "MoveCaseToProject" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1428,7 +1428,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case project returns "Not Found" response
     Given new "MoveCaseToProject" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1436,7 +1436,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case project returns "OK" response
     Given new "MoveCaseToProject" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1444,7 +1444,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case resolved reason returns "Bad Request" response
     Given new "UpdateCaseResolvedReason" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1452,7 +1452,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case resolved reason returns "Not Found" response
     Given new "UpdateCaseResolvedReason" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1460,7 +1460,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update case resolved reason returns "OK" response
     Given new "UpdateCaseResolvedReason" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1468,7 +1468,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case status returns "Bad Request" response
     Given new "UpdateStatus" request
     And there is a valid "case" in the system
@@ -1477,7 +1477,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case status returns "Not Found" response
     Given new "UpdateStatus" request
     And request contains "case_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -1485,7 +1485,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case status returns "OK" response
     Given new "UpdateStatus" request
     And there is a valid "case" in the system
@@ -1495,7 +1495,7 @@ Feature: Case Management
     Then the response status is 200 OK
     And the response "data.attributes.status" is equal to "IN_PROGRESS"
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case title returns "Bad Request" response
     Given new "UpdateCaseTitle" request
     And there is a valid "case" in the system
@@ -1504,7 +1504,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case title returns "Not Found" response
     Given new "UpdateCaseTitle" request
     And request contains "case_id" parameter with value "0198c6b8-b08f-7c08-978a-d95217f2eeac"
@@ -1512,7 +1512,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Update case title returns "OK" response
     Given new "UpdateCaseTitle" request
     And there is a valid "case" in the system
@@ -1521,7 +1521,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Watch a case returns "Bad Request" response
     Given new "WatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1529,7 +1529,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Watch a case returns "Created" response
     Given new "WatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
@@ -1537,7 +1537,7 @@ Feature: Case Management
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Watch a case returns "Not Found" response
     Given new "WatchCase" request
     And request contains "case_id" parameter from "REPLACE.ME"
diff --git a/features/v2/case_management_attribute.feature b/features/v2/case_management_attribute.feature
index b7e1006103be..46526218fa6d 100644
--- a/features/v2/case_management_attribute.feature
+++ b/features/v2/case_management_attribute.feature
@@ -10,7 +10,7 @@ Feature: Case Management Attribute
     And a valid "appKeyAuth" key in the system
     And an instance of "CaseManagementAttribute" API
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create custom attribute config for a case type returns "Bad Request" response
     Given new "CreateCustomAttributeConfig" request
     And there is a valid "case_type" in the system
@@ -19,7 +19,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create custom attribute config for a case type returns "CREATED" response
     Given new "CreateCustomAttributeConfig" request
     And there is a valid "case_type" in the system
@@ -28,7 +28,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 201 CREATED
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create custom attribute config for a case type returns "Not Found" response
     Given new "CreateCustomAttributeConfig" request
     And request contains "case_type_id" parameter with value "9fd476d7-a955-454a-851d-980c655c02d3"
@@ -36,7 +36,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Delete custom attributes config returns "Bad Request" response
     Given new "DeleteCustomAttributeConfig" request
     And there is a valid "case_type" in the system
@@ -45,7 +45,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Delete custom attributes config returns "No Content" response
     Given new "DeleteCustomAttributeConfig" request
     And there is a valid "case_type" in the system
@@ -55,14 +55,14 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/case-management
+  @skip @team:ddoghq/case-management
   Scenario: Get all custom attributes config of case type returns "Bad Request" response
     Given new "GetAllCustomAttributeConfigsByCaseType" request
     And request contains "case_type_id" parameter with value "not-an-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Get all custom attributes config of case type returns "OK" response
     Given new "GetAllCustomAttributeConfigsByCaseType" request
     And there is a valid "case_type" in the system
@@ -70,13 +70,13 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Get all custom attributes returns "OK" response
     Given new "GetAllCustomAttributes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update custom attribute config returns "Bad Request" response
     Given new "UpdateCustomAttributeConfig" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
@@ -85,7 +85,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update custom attribute config returns "Not Found" response
     Given new "UpdateCustomAttributeConfig" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
@@ -94,7 +94,7 @@ Feature: Case Management Attribute
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update custom attribute config returns "OK" response
     Given new "UpdateCustomAttributeConfig" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
diff --git a/features/v2/case_management_type.feature b/features/v2/case_management_type.feature
index 6415083b6990..166fe6a706b3 100644
--- a/features/v2/case_management_type.feature
+++ b/features/v2/case_management_type.feature
@@ -10,28 +10,28 @@ Feature: Case Management Type
     And a valid "appKeyAuth" key in the system
     And an instance of "CaseManagementType" API
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create a case type returns "Bad Request" response
     Given new "CreateCaseType" request
     And body with value {"data": {"attributes": {"description": "Investigations done in case management", "emoji": "notanemoji", "name": "Investigation"}, "type": "case_type"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Create a case type returns "CREATED" response
     Given new "CreateCaseType" request
     And body with value {"data": {"attributes": {"description": "Investigations done in case management", "emoji": "👑", "name": "Investigation"}, "type": "case_type"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a case type returns "No Content" response
     Given new "DeleteCaseType" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Delete a case type returns "NotContent" response
     Given new "DeleteCaseType" request
     And there is a valid "case_type" in the system
@@ -39,13 +39,13 @@ Feature: Case Management Type
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/case-management
+  @team:ddoghq/case-management
   Scenario: Get all case types returns "OK" response
     Given new "GetAllCaseTypes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case type returns "Bad Request" response
     Given new "UpdateCaseType" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
@@ -53,7 +53,7 @@ Feature: Case Management Type
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case type returns "Not Found" response
     Given new "UpdateCaseType" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
@@ -61,7 +61,7 @@ Feature: Case Management Type
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a case type returns "OK" response
     Given new "UpdateCaseType" request
     And request contains "case_type_id" parameter from "REPLACE.ME"
diff --git a/features/v2/change_management.feature b/features/v2/change_management.feature
index dbbae657bb80..3335b3bac7d0 100644
--- a/features/v2/change_management.feature
+++ b/features/v2/change_management.feature
@@ -10,7 +10,7 @@ Feature: Change Management
     And a valid "appKeyAuth" key in the system
     And an instance of "ChangeManagement" API
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a change request branch returns "Bad Request" response
     Given operation "CreateChangeRequestBranch" enabled
     And new "CreateChangeRequestBranch" request
@@ -19,7 +19,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a change request branch returns "Not Found" response
     Given operation "CreateChangeRequestBranch" enabled
     And new "CreateChangeRequestBranch" request
@@ -28,7 +28,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a change request branch returns "OK" response
     Given operation "CreateChangeRequestBranch" enabled
     And new "CreateChangeRequestBranch" request
@@ -37,7 +37,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a change request returns "Bad Request" response
     Given operation "CreateChangeRequest" enabled
     And new "CreateChangeRequest" request
@@ -45,7 +45,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Create a change request returns "Created" response
     Given operation "CreateChangeRequest" enabled
     And new "CreateChangeRequest" request
@@ -53,7 +53,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a change request decision returns "Bad Request" response
     Given operation "DeleteChangeRequestDecision" enabled
     And new "DeleteChangeRequestDecision" request
@@ -62,7 +62,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a change request decision returns "Not Found" response
     Given operation "DeleteChangeRequestDecision" enabled
     And new "DeleteChangeRequestDecision" request
@@ -71,7 +71,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Delete a change request decision returns "OK" response
     Given operation "DeleteChangeRequestDecision" enabled
     And new "DeleteChangeRequestDecision" request
@@ -80,7 +80,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a change request returns "Bad Request" response
     Given operation "GetChangeRequest" enabled
     And new "GetChangeRequest" request
@@ -88,7 +88,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a change request returns "Not Found" response
     Given operation "GetChangeRequest" enabled
     And new "GetChangeRequest" request
@@ -96,7 +96,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Get a change request returns "OK" response
     Given operation "GetChangeRequest" enabled
     And new "GetChangeRequest" request
@@ -104,7 +104,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request decision returns "Bad Request" response
     Given operation "UpdateChangeRequestDecision" enabled
     And new "UpdateChangeRequestDecision" request
@@ -114,7 +114,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request decision returns "Not Found" response
     Given operation "UpdateChangeRequestDecision" enabled
     And new "UpdateChangeRequestDecision" request
@@ -124,7 +124,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request decision returns "OK" response
     Given operation "UpdateChangeRequestDecision" enabled
     And new "UpdateChangeRequestDecision" request
@@ -134,7 +134,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request returns "Bad Request" response
     Given operation "UpdateChangeRequest" enabled
     And new "UpdateChangeRequest" request
@@ -143,7 +143,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request returns "Not Found" response
     Given operation "UpdateChangeRequest" enabled
     And new "UpdateChangeRequest" request
@@ -152,7 +152,7 @@ Feature: Change Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/case-management
+  @generated @skip @team:ddoghq/case-management
   Scenario: Update a change request returns "OK" response
     Given operation "UpdateChangeRequest" enabled
     And new "UpdateChangeRequest" request
diff --git a/features/v2/ci_visibility_github_accounts.feature b/features/v2/ci_visibility_github_accounts.feature
index ad57cc983628..06ebeb3ccf10 100644
--- a/features/v2/ci_visibility_github_accounts.feature
+++ b/features/v2/ci_visibility_github_accounts.feature
@@ -10,46 +10,46 @@ Feature: CI Visibility GitHub Accounts
     And a valid "appKeyAuth" key in the system
     And an instance of "CIVisibilityGitHubAccounts" API
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: List GitHub CI Visibility status returns "Bad Request" response
     Given new "ListCIAppGitHubAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: List GitHub CI Visibility status returns "Not Found" response
     Given new "ListCIAppGitHubAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: List GitHub CI Visibility status returns "OK" response
     Given new "ListCIAppGitHubAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update GitHub CI Visibility status returns "Bad Request" response
     Given new "UpdateCIAppGitHubAccount" request
     And body with value {"data": {"attributes": {"account": "datadog", "enabled": true, "host": "github.com", "repository": {"enabled": true, "name": "shopist"}}, "type": "ci_github_account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update GitHub CI Visibility status returns "Conflict" response
     Given new "UpdateCIAppGitHubAccount" request
     And body with value {"data": {"attributes": {"account": "datadog", "enabled": true, "host": "github.com", "repository": {"enabled": true, "name": "shopist"}}, "type": "ci_github_account"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update GitHub CI Visibility status returns "Not Found" response
     Given new "UpdateCIAppGitHubAccount" request
     And body with value {"data": {"attributes": {"account": "datadog", "enabled": true, "host": "github.com", "repository": {"enabled": true, "name": "shopist"}}, "type": "ci_github_account"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update GitHub CI Visibility status returns "OK" response
     Given new "UpdateCIAppGitHubAccount" request
     And body with value {"data": {"attributes": {"account": "datadog", "enabled": true, "host": "github.com", "repository": {"enabled": true, "name": "shopist"}}, "type": "ci_github_account"}}
diff --git a/features/v2/ci_visibility_pipelines.feature b/features/v2/ci_visibility_pipelines.feature
index c81cb9ec82e8..702de50b0421 100644
--- a/features/v2/ci_visibility_pipelines.feature
+++ b/features/v2/ci_visibility_pipelines.feature
@@ -9,7 +9,7 @@ Feature: CI Visibility Pipelines
     Given a valid "apiKeyAuth" key in the system
     And an instance of "CIVisibilityPipelines" API
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Aggregate pipelines events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateCIAppPipelineEvents" request
@@ -17,7 +17,7 @@ Feature: CI Visibility Pipelines
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Aggregate pipelines events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateCIAppPipelineEvents" request
@@ -26,14 +26,14 @@ Feature: CI Visibility Pipelines
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of pipelines events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListCIAppPipelineEvents" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Get a list of pipelines events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListCIAppPipelineEvents" request
@@ -44,7 +44,7 @@ Feature: CI Visibility Pipelines
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-java @skip-python @skip-typescript @skip-validation @team:DataDog/ci-app-backend @with-pagination
+  @replay-only @skip-java @skip-python @skip-typescript @skip-validation @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Get a list of pipelines events returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListCIAppPipelineEvents" request
@@ -55,7 +55,7 @@ Feature: CI Visibility Pipelines
     Then the response status is 200 OK
     And the response has 2 items
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Search pipelines events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "SearchCIAppPipelineEvents" request
@@ -63,7 +63,7 @@ Feature: CI Visibility Pipelines
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Search pipelines events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "SearchCIAppPipelineEvents" request
@@ -71,7 +71,7 @@ Feature: CI Visibility Pipelines
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-java @skip-python @skip-typescript @skip-validation @team:DataDog/ci-app-backend @with-pagination
+  @replay-only @skip-java @skip-python @skip-typescript @skip-validation @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Search pipelines events returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "SearchCIAppPipelineEvents" request
@@ -80,63 +80,63 @@ Feature: CI Visibility Pipelines
     Then the response status is 200 OK
     And the response has 2 items
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send pipeline event returns "Bad Request" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": "Details TBD"}, "type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send pipeline event returns "Payload Too Large" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": "Details TBD"}, "type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 413 Payload Too Large
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send pipeline event returns "Request Timeout" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": "Details TBD"}, "type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 408 Request Timeout
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send pipeline event returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": {"level": "pipeline","unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a","name": "Deploy to AWS","url": "https://my-ci-provider.example/pipelines/my-pipeline/run/1","start": "{{ timeISO('now - 120s') }}","end": "{{ timeISO('now - 30s') }}","status": "success","partial_retry": false,"git": {"repository_url": "https://github.com/DataDog/datadog-agent","sha": "7f263865994b76066c4612fd1965215e7dcb4cd2","author_email": "john.doe@email.com"}}},"type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 202 Request accepted for processing
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send pipeline event with custom provider returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"provider_name": "example-provider", "resource": {"level": "pipeline","unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a","name": "Deploy to AWS","url": "https://my-ci-provider.example/pipelines/my-pipeline/run/1","start": "{{ timeISO('now - 120s') }}","end": "{{ timeISO('now - 30s') }}","status": "success","partial_retry": false,"git": {"repository_url": "https://github.com/DataDog/datadog-agent","sha": "7f263865994b76066c4612fd1965215e7dcb4cd2","author_email": "john.doe@email.com"}}},"type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 202 Request accepted for processing
 
-  @skip @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send pipeline job event returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": {"level": "job", "id": "cf9456de-8b9e-4c27-aa79-27b1e78c1a33", "name": "Build image", "pipeline_unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a", "pipeline_name": "Deploy to AWS", "start": "{{ timeISO('now - 120s') }}", "end": "{{ timeISO('now - 30s') }}", "status": "error", "url": "https://my-ci-provider.example/jobs/my-jobs/run/1"}}, "type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 202 Request accepted for processing
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send running job event returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": {"level": "job", "id": "cf9456de-8b9e-4c27-aa79-27b1e78c1a33", "name": "Build image", "pipeline_unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a", "pipeline_name": "Deploy to AWS", "start": "{{ timeISO('now - 120s') }}", "status": "running", "url": "https://my-ci-provider.example/jobs/my-jobs/run/1"}}, "type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 202 Request accepted for processing
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send running pipeline event returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": {"attributes": {"resource": {"level": "pipeline","unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a","name": "Deploy to AWS","url": "https://my-ci-provider.example/pipelines/my-pipeline/run/1","start": "{{ timeISO('now - 120s') }}","status": "running","partial_retry": false,"git": {"repository_url": "https://github.com/DataDog/datadog-agent","sha": "7f263865994b76066c4612fd1965215e7dcb4cd2","author_email": "john.doe@email.com"}}},"type": "cipipeline_resource_request"}}
     When the request is sent
     Then the response status is 202 Request accepted for processing
 
-  @skip-java @skip-python @skip-typescript @team:DataDog/ci-app-backend
+  @skip-java @skip-python @skip-typescript @team:ddoghq/ci-app-backend
   Scenario: Send several pipeline events returns "Request accepted for processing" response
     Given new "CreateCIAppPipelineEvent" request
     And body with value {"data": [{"attributes": {"provider_name": "example-provider", "resource": {"level": "pipeline","unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a","name": "Deploy to AWS","url": "https://my-ci-provider.example/pipelines/my-pipeline/run/1","start": "{{ timeISO('now - 120s') }}","end": "{{ timeISO('now - 30s') }}","status": "success","partial_retry": false,"git": {"repository_url": "https://github.com/DataDog/datadog-agent","sha": "7f263865994b76066c4612fd1965215e7dcb4cd2","author_email": "john.doe@email.com"}}},"type": "cipipeline_resource_request"},{"attributes": {"provider_name": "example-provider", "resource": {"level": "pipeline","unique_id": "7b2c8f9e-aa15-4d22-9c7d-83f4e065138b","name": "Deploy to Production","url": "https://my-ci-provider.example/pipelines/prod-pipeline/run/2","start": "{{ timeISO('now - 180s') }}","end": "{{ timeISO('now - 45s') }}","status": "success","partial_retry": false,"git": {"repository_url": "https://github.com/DataDog/datadog-agent","sha": "9a4f7c28b3e5d12f8e6c9b2a5d8f3e1c7b4a6d9e","author_email": "jane.smith@email.com"}}},"type": "cipipeline_resource_request"}]}
diff --git a/features/v2/ci_visibility_tests.feature b/features/v2/ci_visibility_tests.feature
index 612c77805327..df975dd7ae46 100644
--- a/features/v2/ci_visibility_tests.feature
+++ b/features/v2/ci_visibility_tests.feature
@@ -9,14 +9,14 @@ Feature: CI Visibility Tests
     And a valid "appKeyAuth" key in the system
     And an instance of "CIVisibilityTests" API
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Aggregate tests events returns "Bad Request" response
     Given new "AggregateCIAppTestEvents" request
     And body with value {"compute": [{"aggregation": "pc90", "interval": "5m", "metric": "@duration", "type": "total"}], "filter": {"from": "now-15m", "query": "@test.service:web-ui-tests AND @test.status:fail", "to": "now"}, "group_by": [{"facet": "@test.service", "histogram": {"interval": 10, "max": 100, "min": 50}, "limit": 10, "sort": {"aggregation": "count", "order": "asc"}, "total": false}], "options": {"timezone": "GMT"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Aggregate tests events returns "OK" response
     Given new "AggregateCIAppTestEvents" request
     And body with value {"compute": [{"aggregation": "count", "metric": "@test.is_flaky", "type": "total"}], "filter": {"from": "now-15m", "query": "@language:(python OR go)", "to": "now"}, "group_by": [{"facet": "@git.branch", "limit": 10, "sort": {"order": "asc"}, "total": false}], "options": {"timezone": "GMT"}}
@@ -24,13 +24,13 @@ Feature: CI Visibility Tests
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of tests events returns "Bad Request" response
     Given new "ListCIAppTestEvents" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get a list of tests events returns "OK" response
     Given new "ListCIAppTestEvents" request
     And request contains "filter[query]" parameter with value "@test.service:web-ui-tests"
@@ -40,7 +40,7 @@ Feature: CI Visibility Tests
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/ci-app-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Get a list of tests events returns "OK" response with pagination
     Given new "ListCIAppTestEvents" request
     And request contains "filter[from]" parameter with value "{{ timeISO('now - 30s') }}"
@@ -50,21 +50,21 @@ Feature: CI Visibility Tests
     Then the response status is 200 OK
     And the response has 2 items
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Search tests events returns "Bad Request" response
     Given new "SearchCIAppTestEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@test.service:web-ui-tests AND @test.status:fail", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Search tests events returns "OK" response
     Given new "SearchCIAppTestEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@test.service:web-ui-tests AND @test.status:skip", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/ci-app-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Search tests events returns "OK" response with pagination
     Given new "SearchCIAppTestEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@test.status:pass AND -@language:python", "to": "now"}, "page": {"limit": 2}, "sort": "timestamp"}
diff --git a/features/v2/cloud_authentication.feature b/features/v2/cloud_authentication.feature
index c444f1469c23..5833fe530368 100644
--- a/features/v2/cloud_authentication.feature
+++ b/features/v2/cloud_authentication.feature
@@ -8,7 +8,7 @@ Feature: Cloud Authentication
     And a valid "appKeyAuth" key in the system
     And an instance of "CloudAuthentication" API
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Create an AWS cloud authentication persona mapping returns "Bad Request" response
     Given operation "CreateAWSCloudAuthPersonaMapping" enabled
     And new "CreateAWSCloudAuthPersonaMapping" request
@@ -16,7 +16,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Create an AWS cloud authentication persona mapping returns "Conflict" response
     Given operation "CreateAWSCloudAuthPersonaMapping" enabled
     And new "CreateAWSCloudAuthPersonaMapping" request
@@ -24,7 +24,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Create an AWS cloud authentication persona mapping returns "Created" response
     Given operation "CreateAWSCloudAuthPersonaMapping" enabled
     And new "CreateAWSCloudAuthPersonaMapping" request
@@ -32,7 +32,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Delete an AWS cloud authentication persona mapping returns "No Content" response
     Given operation "DeleteAWSCloudAuthPersonaMapping" enabled
     And new "DeleteAWSCloudAuthPersonaMapping" request
@@ -40,7 +40,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Delete an AWS cloud authentication persona mapping returns "Not Found" response
     Given operation "DeleteAWSCloudAuthPersonaMapping" enabled
     And new "DeleteAWSCloudAuthPersonaMapping" request
@@ -48,7 +48,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Get an AWS cloud authentication persona mapping returns "Not Found" response
     Given operation "GetAWSCloudAuthPersonaMapping" enabled
     And new "GetAWSCloudAuthPersonaMapping" request
@@ -56,7 +56,7 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: Get an AWS cloud authentication persona mapping returns "OK" response
     Given operation "GetAWSCloudAuthPersonaMapping" enabled
     And new "GetAWSCloudAuthPersonaMapping" request
@@ -64,14 +64,14 @@ Feature: Cloud Authentication
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: List AWS cloud authentication persona mappings returns "Bad Request" response
     Given operation "ListAWSCloudAuthPersonaMappings" enabled
     And new "ListAWSCloudAuthPersonaMappings" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/team-aaaauthn
+  @generated @skip @team:ddoghq/team-aaaauthn
   Scenario: List AWS cloud authentication persona mappings returns "OK" response
     Given operation "ListAWSCloudAuthPersonaMappings" enabled
     And new "ListAWSCloudAuthPersonaMappings" request
diff --git a/features/v2/cloud_cost_management.feature b/features/v2/cloud_cost_management.feature
index be04d5c8e007..40e14ef053a6 100644
--- a/features/v2/cloud_cost_management.feature
+++ b/features/v2/cloud_cost_management.feature
@@ -13,14 +13,14 @@ Feature: Cloud Cost Management
     And a valid "appKeyAuth" key in the system
     And an instance of "CloudCostManagement" API
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create Cloud Cost Management AWS CUR config returns "Bad Request" response
     Given new "CreateCostAWSCURConfig" request
     And body with value {"data": {"attributes": {"account_filters": {"excluded_accounts": ["123456789123", "123456789143"], "include_new_accounts": true, "included_accounts": ["123456789123", "123456789143"]}, "account_id": "123456789123", "bucket_name": "dd-cost-bucket", "bucket_region": "us-east-1", "report_name": "dd-report-name", "report_prefix": "dd-report-prefix"}, "type": "aws_cur_config_post_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create Cloud Cost Management AWS CUR config returns "OK" response
     Given new "CreateCostAWSCURConfig" request
     And body with value {"data": {"attributes": {"account_id": "123456789123", "bucket_name": "dd-cost-bucket", "bucket_region": "us-east-1", "report_name": "dd-report-name", "report_prefix": "dd-report-prefix"}, "type": "aws_cur_config_post_request"}}
@@ -28,14 +28,14 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data.attributes.account_id" is equal to "123456789123"
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Create Cloud Cost Management Azure configs returns "Bad Request" response
     Given new "CreateCostAzureUCConfigs" request
     And body with value {"data": {"attributes": {"account_id": "1234abcd-1234-abcd-1234-1234abcd1234", "actual_bill_config": {"export_name": "dd-actual-export", "export_path": "dd-export-path", "storage_account": "dd-storage-account", "storage_container": "dd-storage-container"}, "amortized_bill_config": {"export_name": "dd-actual-export", "export_path": "dd-export-path", "storage_account": "dd-storage-account", "storage_container": "dd-storage-container"}, "client_id": "1234abcd-1234-abcd-1234-1234abcd1234", "scope": "this_is_an_invalid_scope"}, "type": "azure_uc_config_post_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create Cloud Cost Management Azure configs returns "OK" response
     Given new "CreateCostAzureUCConfigs" request
     And body with value {"data": {"attributes": {"account_id": "1234abcd-1234-abcd-1234-1234abcd1234", "actual_bill_config": {"export_name": "dd-actual-export", "export_path": "dd-export-path", "storage_account": "dd-storage-account", "storage_container": "dd-storage-container"}, "amortized_bill_config": {"export_name": "dd-actual-export", "export_path": "dd-export-path", "storage_account": "dd-storage-account", "storage_container": "dd-storage-container"}, "client_id": "1234abcd-1234-abcd-1234-1234abcd1234", "scope": "subscriptions/1234abcd-1234-abcd-1234-1234abcd1234"}, "type": "azure_uc_config_post_request"}}
@@ -43,14 +43,14 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data.attributes.configs[0].account_id" is equal to "1234abcd-1234-abcd-1234-1234abcd1234"
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Create Google Cloud Usage Cost config returns "Bad Request" response
     Given new "CreateCostGCPUsageCostConfig" request
     And body with value {"data": {"attributes": {"billing_account_id": "123456_A123BC_12AB34", "bucket_name": "dd-cost-bucket", "export_dataset_name": "billing", "export_prefix": "datadog_cloud_cost_usage_export", "export_project_name": "dd-cloud-cost-report", "service_account": "InvalidServiceAccount"}, "type": "gcp_uc_config_post_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create Google Cloud Usage Cost config returns "OK" response
     Given new "CreateCostGCPUsageCostConfig" request
     And body with value {"data": {"attributes": {"billing_account_id": "123456_A123BC_12AB34", "bucket_name": "dd-cost-bucket", "export_dataset_name": "billing", "export_prefix": "datadog_cloud_cost_usage_export", "export_project_name": "dd-cloud-cost-report", "service_account": "dd-ccm-gcp-integration@my-environment.iam.gserviceaccount.com"}, "type": "gcp_uc_config_post_request"}}
@@ -58,7 +58,7 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data.attributes.account_id" is equal to "123456_A123BC_12AB34"
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Create a unit cost returns "Bad Request" response
     Given operation "CreateUnitCost" enabled
     And new "CreateUnitCost" request
@@ -66,7 +66,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Create a unit cost returns "Created" response
     Given operation "CreateUnitCost" enabled
     And new "CreateUnitCost" request
@@ -74,7 +74,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 201 Created
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create custom allocation rule returns "OK" response
     Given new "CreateCustomAllocationRule" request
     And body with value {"data": {"attributes": {"costs_to_allocate": [{"condition": "is", "tag": "account_id", "value": "123456789"}, {"condition": "in", "tag": "environment", "value": "", "values": ["production", "staging"]}], "enabled": true, "order_id": 1, "provider": ["aws", "gcp"], "rule_name": "example-arbitrary-cost-rule", "strategy": {"allocated_by_tag_keys": ["team", "environment"], "based_on_costs": [{"condition": "is", "tag": "service", "value": "web-api"}, {"condition": "not in", "tag": "team", "value": "", "values": ["legacy", "deprecated"]}], "granularity": "daily", "method": "proportional"}, "type": "shared"}, "type": "upsert_arbitrary_rule"}}
@@ -83,49 +83,49 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "arbitrary_rule"
     And the response "data.attributes.rule_name" is equal to "example-arbitrary-cost-rule"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or replace a budget's custom forecast returns "Bad Request" response
     Given new "UpsertCustomForecast" request
     And body with value {"data": {"attributes": {"budget_uid": "00000000-0000-0000-0000-000000000001", "entries": [{"amount": 400, "month": 202501, "tag_filters": [{"tag_key": "service", "tag_value": "ec2"}]}]}, "id": "", "type": "custom_forecast"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or replace a budget's custom forecast returns "Not Found" response
     Given new "UpsertCustomForecast" request
     And body with value {"data": {"attributes": {"budget_uid": "00000000-0000-0000-0000-000000000001", "entries": [{"amount": 400, "month": 202501, "tag_filters": [{"tag_key": "service", "tag_value": "ec2"}]}]}, "id": "", "type": "custom_forecast"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or replace a budget's custom forecast returns "OK" response
     Given new "UpsertCustomForecast" request
     And body with value {"data": {"attributes": {"budget_uid": "00000000-0000-0000-0000-000000000001", "entries": [{"amount": 400, "month": 202501, "tag_filters": [{"tag_key": "service", "tag_value": "ec2"}]}]}, "id": "", "type": "custom_forecast"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or update a budget returns "Bad Request" response
     Given new "UpsertBudget" request
     And body with value {"data": {"attributes": {"costs": {"actual": null, "amount": null, "forecast": null, "ootb_forecast": null}, "costs_unit": {"id": 42}, "created_at": 1738258683590, "created_by": "00000000-0a0a-0a0a-aaa0-00000000000a", "end_month": 202502, "entries": [{"costs": {"actual": null, "amount": null, "custom_forecast": null, "forecast": null, "ootb_forecast": null}, "tag_filters": [{}]}], "metrics_query": "aws.cost.amortized{service:ec2} by {service}", "name": "my budget", "org_id": 123, "start_month": 202501, "tags": ["service"], "total_amount": 1000, "updated_at": 1738258683590, "updated_by": "00000000-0a0a-0a0a-aaa0-00000000000a"}, "id": "00000000-0a0a-0a0a-aaa0-00000000000a", "type": ""}, "meta": {"error": ""}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or update a budget returns "Not Found" response
     Given new "UpsertBudget" request
     And body with value {"data": {"attributes": {"costs": {"actual": null, "amount": null, "forecast": null, "ootb_forecast": null}, "costs_unit": {"id": 42}, "created_at": 1738258683590, "created_by": "00000000-0a0a-0a0a-aaa0-00000000000a", "end_month": 202502, "entries": [{"costs": {"actual": null, "amount": null, "custom_forecast": null, "forecast": null, "ootb_forecast": null}, "tag_filters": [{}]}], "metrics_query": "aws.cost.amortized{service:ec2} by {service}", "name": "my budget", "org_id": 123, "start_month": 202501, "tags": ["service"], "total_amount": 1000, "updated_at": 1738258683590, "updated_by": "00000000-0a0a-0a0a-aaa0-00000000000a"}, "id": "00000000-0a0a-0a0a-aaa0-00000000000a", "type": ""}, "meta": {"error": ""}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Create or update a budget returns "OK" response
     Given new "UpsertBudget" request
     And body with value {"data": {"attributes": {"costs": {"actual": null, "amount": null, "forecast": null, "ootb_forecast": null}, "costs_unit": {"id": 42}, "created_at": 1738258683590, "created_by": "00000000-0a0a-0a0a-aaa0-00000000000a", "end_month": 202502, "entries": [{"costs": {"actual": null, "amount": null, "custom_forecast": null, "forecast": null, "ootb_forecast": null}, "tag_filters": [{}]}], "metrics_query": "aws.cost.amortized{service:ec2} by {service}", "name": "my budget", "org_id": 123, "start_month": 202501, "tags": ["service"], "total_amount": 1000, "updated_at": 1738258683590, "updated_by": "00000000-0a0a-0a0a-aaa0-00000000000a"}, "id": "00000000-0a0a-0a0a-aaa0-00000000000a", "type": ""}, "meta": {"error": ""}}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create tag pipeline ruleset returns "OK" response
     Given new "CreateTagPipelinesRuleset" request
     And body with value {"data": {"attributes": {"enabled": true, "rules": [{"enabled": true, "mapping": null, "name": "Add Cost Center Tag", "query": {"addition": {"key": "cost_center", "value": "engineering"}, "case_insensitivity": false, "if_not_exists": true, "query": "account_id:\"123456789\" AND service:\"web-api\""}, "reference_table": null}]}, "id": "New Ruleset", "type": "create_ruleset"}}
@@ -134,7 +134,7 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "ruleset"
     And the response "data.attributes.name" is equal to "New Ruleset"
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Create tag pipeline ruleset with if_tag_exists returns "OK" response
     Given new "CreateTagPipelinesRuleset" request
     And body with value {"data": {"attributes": {"enabled": true, "rules": [{"enabled": true, "mapping": null, "name": "Add Cost Center Tag", "query": {"addition": {"key": "cost_center", "value": "engineering"}, "case_insensitivity": false, "if_tag_exists": "replace", "query": "account_id:\"123456789\" AND service:\"web-api\""}, "reference_table": null}]}, "id": "New Ruleset", "type": "create_ruleset"}}
@@ -143,133 +143,133 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "ruleset"
     And the response "data.attributes.name" is equal to "New Ruleset"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management AWS CUR config returns "Bad Request" response
     Given new "DeleteCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management AWS CUR config returns "No Content" response
     Given new "DeleteCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter with value 100
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management AWS CUR config returns "Not Found" response
     Given new "DeleteCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter with value 123456
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management Azure config returns "Bad Request" response
     Given new "DeleteCostAzureUCConfig" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management Azure config returns "No Content" response
     Given new "DeleteCostAzureUCConfig" request
     And request contains "cloud_account_id" parameter with value 100
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Delete Cloud Cost Management Azure config returns "Not Found" response
     Given new "DeleteCostAzureUCConfig" request
     And request contains "cloud_account_id" parameter with value 123456
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete Custom Costs File returns "No Content" response
     Given new "DeleteCustomCostsFile" request
     And request contains "file_id" parameter with value "9d055d22-a838-4e9f-bc34-a4f9ab66280c"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete Custom Costs file returns "No Content" response
     Given new "DeleteCustomCostsFile" request
     And request contains "file_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Delete Custom Costs file returns "Not Found" response
     Given new "DeleteCustomCostsFile" request
     And request contains "file_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete Google Cloud Usage Cost config returns "Bad Request" response
     Given new "DeleteCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete Google Cloud Usage Cost config returns "No Content" response
     Given new "DeleteCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter with value 100
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Delete Google Cloud Usage Cost config returns "Not Found" response
     Given new "DeleteCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter with value 123456
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete a Cloud Cost Management tag description returns "Bad Request" response
     Given new "DeleteCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete a Cloud Cost Management tag description returns "No Content" response
     Given new "DeleteCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Delete a budget returns "Bad Request" response
     Given new "DeleteBudget" request
     And request contains "budget_id" parameter with value "1"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete a budget's custom forecast returns "Bad Request" response
     Given new "DeleteCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete a budget's custom forecast returns "No Content" response
     Given new "DeleteCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete a budget's custom forecast returns "Not Found" response
     Given new "DeleteCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Delete a unit cost returns "Bad Request" response
     Given operation "DeleteUnitCost" enabled
     And new "DeleteUnitCost" request
@@ -277,7 +277,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Delete a unit cost returns "No Content" response
     Given operation "DeleteUnitCost" enabled
     And new "DeleteUnitCost" request
@@ -285,7 +285,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Delete a unit cost returns "Not Found" response
     Given operation "DeleteUnitCost" enabled
     And new "DeleteUnitCost" request
@@ -293,42 +293,42 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Delete budget returns "No Content" response
     Given new "DeleteBudget" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete custom allocation rule returns "No Content" response
     Given new "DeleteCustomAllocationRule" request
     And request contains "rule_id" parameter with value 683
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Delete tag pipeline ruleset returns "No Content" response
     Given new "DeleteTagPipelinesRuleset" request
     And request contains "ruleset_id" parameter with value "ee10c3ff-312f-464c-b4f6-46adaa6d00a1"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Generate a Cloud Cost Management tag description returns "Bad Request" response
     Given new "GenerateCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Generate a Cloud Cost Management tag description returns "OK" response
     Given new "GenerateCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get Custom Costs File returns "OK" response
     Given new "GetCustomCostsFile" request
     And request contains "file_id" parameter with value "9d055d22-a838-4e9f-bc34-a4f9ab66280c"
@@ -337,21 +337,21 @@ Feature: Cloud Cost Management
     And the response "data.attributes.name" is equal to "data.json"
     And the response "data.attributes.content[0].ChargeDescription" is equal to "my_description"
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Get Custom Costs file returns "Not Found" response
     Given new "GetCustomCostsFile" request
     And request contains "file_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get Custom Costs file returns "OK" response
     Given new "GetCustomCostsFile" request
     And request contains "file_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get Google Cloud Usage Cost config returns "OK" response
     Given new "GetCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -360,77 +360,77 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "gcp_uc_config"
     And the response "data.attributes.account_id" is equal to "123456_ABCDEF_123ABC"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag description returns "Bad Request" response
     Given new "GetCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag description returns "Not Found" response
     Given new "GetCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag description returns "OK" response
     Given new "GetCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag key returns "Bad Request" response
     Given new "GetCostTagKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag key returns "Not Found" response
     Given new "GetCostTagKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a Cloud Cost Management tag key returns "OK" response
     Given new "GetCostTagKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Get a budget returns "Not Found" response
     Given new "GetBudget" request
     And request contains "budget_id" parameter with value "9d055d22-0a0a-0a0a-aaa0-00000000000a"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a budget's custom forecast returns "Bad Request" response
     Given new "GetCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a budget's custom forecast returns "Not Found" response
     Given new "GetCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get a budget's custom forecast returns "OK" response
     Given new "GetCustomForecast" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get a tag pipeline ruleset returns "OK" response
     Given new "GetTagPipelinesRuleset" request
     And request contains "ruleset_id" parameter with value "a1e9de9b-b88e-41c6-a0cd-cc0ebd7092de"
@@ -439,7 +439,7 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "ruleset"
     And the response "data.attributes.name" is equal to "EVP Cost Tags"
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Get a unit cost returns "Bad Request" response
     Given operation "GetUnitCost" enabled
     And new "GetUnitCost" request
@@ -447,7 +447,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Get a unit cost returns "Not Found" response
     Given operation "GetUnitCost" enabled
     And new "GetUnitCost" request
@@ -455,7 +455,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Get a unit cost returns "OK" response
     Given operation "GetUnitCost" enabled
     And new "GetUnitCost" request
@@ -463,49 +463,49 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get account filters returns "Bad Request" response
     Given new "GetCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get account filters returns "Not Found" response
     Given new "GetCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get account filters returns "OK" response
     Given new "GetCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get budget returns "Bad Request" response
     Given new "GetBudget" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get budget returns "Not Found" response
     Given new "GetBudget" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get budget returns "OK" response
     Given new "GetBudget" request
     And request contains "budget_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments coverage (scalar) returns "Bad Request" response
     Given operation "GetCommitmentsCoverageScalar" enabled
     And new "GetCommitmentsCoverageScalar" request
@@ -516,7 +516,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments coverage (scalar) returns "OK" response
     Given operation "GetCommitmentsCoverageScalar" enabled
     And new "GetCommitmentsCoverageScalar" request
@@ -527,7 +527,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments coverage (timeseries) returns "Bad Request" response
     Given operation "GetCommitmentsCoverageTimeseries" enabled
     And new "GetCommitmentsCoverageTimeseries" request
@@ -538,7 +538,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments coverage (timeseries) returns "OK" response
     Given operation "GetCommitmentsCoverageTimeseries" enabled
     And new "GetCommitmentsCoverageTimeseries" request
@@ -549,7 +549,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments list returns "Bad Request" response
     Given operation "GetCommitmentsCommitmentList" enabled
     And new "GetCommitmentsCommitmentList" request
@@ -560,7 +560,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments list returns "OK" response
     Given operation "GetCommitmentsCommitmentList" enabled
     And new "GetCommitmentsCommitmentList" request
@@ -571,7 +571,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments on-demand hot spots (scalar) returns "Bad Request" response
     Given operation "GetCommitmentsOnDemandHotspotsScalar" enabled
     And new "GetCommitmentsOnDemandHotspotsScalar" request
@@ -582,7 +582,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments on-demand hot spots (scalar) returns "OK" response
     Given operation "GetCommitmentsOnDemandHotspotsScalar" enabled
     And new "GetCommitmentsOnDemandHotspotsScalar" request
@@ -593,7 +593,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments savings (scalar) returns "Bad Request" response
     Given operation "GetCommitmentsSavingsScalar" enabled
     And new "GetCommitmentsSavingsScalar" request
@@ -604,7 +604,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments savings (scalar) returns "OK" response
     Given operation "GetCommitmentsSavingsScalar" enabled
     And new "GetCommitmentsSavingsScalar" request
@@ -615,7 +615,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments savings (timeseries) returns "Bad Request" response
     Given operation "GetCommitmentsSavingsTimeseries" enabled
     And new "GetCommitmentsSavingsTimeseries" request
@@ -626,7 +626,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments savings (timeseries) returns "OK" response
     Given operation "GetCommitmentsSavingsTimeseries" enabled
     And new "GetCommitmentsSavingsTimeseries" request
@@ -637,7 +637,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments utilization (scalar) returns "Bad Request" response
     Given operation "GetCommitmentsUtilizationScalar" enabled
     And new "GetCommitmentsUtilizationScalar" request
@@ -648,7 +648,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments utilization (scalar) returns "OK" response
     Given operation "GetCommitmentsUtilizationScalar" enabled
     And new "GetCommitmentsUtilizationScalar" request
@@ -659,7 +659,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments utilization (timeseries) returns "Bad Request" response
     Given operation "GetCommitmentsUtilizationTimeseries" enabled
     And new "GetCommitmentsUtilizationTimeseries" request
@@ -670,7 +670,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get commitments utilization (timeseries) returns "OK" response
     Given operation "GetCommitmentsUtilizationTimeseries" enabled
     And new "GetCommitmentsUtilizationTimeseries" request
@@ -681,7 +681,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get cost AWS CUR config returns "OK" response
     Given new "GetCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -690,7 +690,7 @@ Feature: Cloud Cost Management
     And the response "data.type" is equal to "aws_cur_config"
     And the response "data.attributes.account_id" is equal to "123456123456"
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get cost Azure UC config returns "OK" response
     Given new "GetCostAzureUCConfig" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -700,7 +700,7 @@ Feature: Cloud Cost Management
     And the response "data.attributes.configs[0].dataset_type" is equal to "amortized"
     And the response "data.attributes.configs[1].dataset_type" is equal to "actual"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get cost anomaly returns "Bad Request" response
     Given operation "GetCostAnomaly" enabled
     And new "GetCostAnomaly" request
@@ -708,7 +708,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get cost anomaly returns "Not Found" response
     Given operation "GetCostAnomaly" enabled
     And new "GetCostAnomaly" request
@@ -716,7 +716,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get cost anomaly returns "OK" response
     Given operation "GetCostAnomaly" enabled
     And new "GetCostAnomaly" request
@@ -724,14 +724,14 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Get custom allocation rule returns "OK" response
     Given new "GetCustomAllocationRule" request
     And request contains "rule_id" parameter with value 683
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get the Cloud Cost Management billing currency returns "Bad Request" response
     Given operation "GetCostTagMetadataCurrency" enabled
     And new "GetCostTagMetadataCurrency" request
@@ -739,7 +739,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Get the Cloud Cost Management billing currency returns "OK" response
     Given operation "GetCostTagMetadataCurrency" enabled
     And new "GetCostTagMetadataCurrency" request
@@ -747,27 +747,27 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management AWS CUR configs returns "OK" response
     Given new "ListCostAWSCURConfigs" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.bucket_name" is equal to "test_bucket_name"
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management Azure configs returns "OK" response
     Given new "ListCostAzureUCConfigs" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.configs[0].export_name" is equal to "test_export_name"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management OCI configs returns "OK" response
     Given new "ListCostOCIConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management orchestrators returns "Bad Request" response
     Given operation "ListCostTagMetadataOrchestrators" enabled
     And new "ListCostTagMetadataOrchestrators" request
@@ -775,7 +775,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management orchestrators returns "OK" response
     Given operation "ListCostTagMetadataOrchestrators" enabled
     And new "ListCostTagMetadataOrchestrators" request
@@ -783,13 +783,13 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag descriptions returns "OK" response
     Given new "ListCostTagDescriptions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag key metadata returns "Bad Request" response
     Given operation "ListCostTagMetadata" enabled
     And new "ListCostTagMetadata" request
@@ -797,7 +797,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag key metadata returns "OK" response
     Given operation "ListCostTagMetadata" enabled
     And new "ListCostTagMetadata" request
@@ -805,19 +805,19 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag keys returns "Bad Request" response
     Given new "ListCostTagKeys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag keys returns "OK" response
     Given new "ListCostTagKeys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag metadata months returns "Bad Request" response
     Given operation "ListCostTagMetadataMonths" enabled
     And new "ListCostTagMetadataMonths" request
@@ -825,7 +825,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag metadata months returns "OK" response
     Given operation "ListCostTagMetadataMonths" enabled
     And new "ListCostTagMetadataMonths" request
@@ -833,7 +833,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag sources returns "Bad Request" response
     Given operation "ListCostTagKeySources" enabled
     And new "ListCostTagKeySources" request
@@ -841,7 +841,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tag sources returns "OK" response
     Given operation "ListCostTagKeySources" enabled
     And new "ListCostTagKeySources" request
@@ -849,45 +849,45 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tags returns "Bad Request" response
     Given new "ListCostTags" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Cloud Cost Management tags returns "OK" response
     Given new "ListCostTags" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: List Custom Costs Files returns "OK" response
     Given new "ListCustomCostsFiles" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "data.json"
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: List Custom Costs files returns "Bad Request" response
     Given new "ListCustomCostsFiles" request
     And request contains "filter[status]" parameter with value "invalid_file_status"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List Custom Costs files returns "OK" response
     Given new "ListCustomCostsFiles" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: List Google Cloud Usage Cost configs returns "OK" response
     Given new "ListCostGCPUsageCostConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List available Cloud Cost Management metrics returns "Bad Request" response
     Given operation "ListCostTagMetadataMetrics" enabled
     And new "ListCostTagMetadataMetrics" request
@@ -895,7 +895,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List available Cloud Cost Management metrics returns "OK" response
     Given operation "ListCostTagMetadataMetrics" enabled
     And new "ListCostTagMetadataMetrics" request
@@ -903,74 +903,74 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: List budgets returns "OK" response
     Given new "ListBudgets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List cost anomalies returns "Bad Request" response
     Given operation "ListCostAnomalies" enabled
     And new "ListCostAnomalies" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List cost anomalies returns "OK" response
     Given operation "ListCostAnomalies" enabled
     And new "ListCostAnomalies" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List custom allocation rule statuses returns "OK" response
     Given new "ListCustomAllocationRulesStatus" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: List custom allocation rules returns "OK" response
     Given new "ListCustomAllocationRules" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.rule_name" is equal to "example-arbitrary-cost-rule"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: List tag pipeline ruleset statuses returns "OK" response
     Given new "ListTagPipelinesRulesetsStatus" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: List tag pipeline rulesets returns "OK" response
     Given new "ListTagPipelinesRulesets" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "New Ruleset"
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: List unit costs returns "OK" response
     Given operation "ListUnitCosts" enabled
     And new "ListUnitCosts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Reorder custom allocation rules returns "Successfully reordered rules" response
     Given new "ReorderCustomAllocationRules" request
     And body with value {"data": [{"id": "456", "type": "arbitrary_rule"}, {"id": "123", "type": "arbitrary_rule"}, {"id": "789", "type": "arbitrary_rule"}]}
     When the request is sent
     Then the response status is 204 Successfully reordered rules
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Reorder tag pipeline rulesets returns "Successfully reordered rulesets" response
     Given new "ReorderTagPipelinesRulesets" request
     And body with value {"data": [{"id": "55ef2385-9ae1-4410-90c4-5ac1b60fec10", "type": "ruleset"}, {"id": "a7b8c9d0-1234-5678-9abc-def012345678", "type": "ruleset"}, {"id": "f1e2d3c4-b5a6-9780-1234-567890abcdef", "type": "ruleset"}]}
     When the request is sent
     Then the response status is 204 Successfully reordered rulesets
 
-  @generated @skip @team:DataDog/ccm-optimize
+  @generated @skip @team:ddoghq/ccm-optimize
   Scenario: Search cost recommendations returns "OK" response
     Given operation "SearchCostRecommendations" enabled
     And new "SearchCostRecommendations" request
@@ -978,7 +978,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Update Cloud Cost Management AWS CUR config returns "Not Found" response
     Given new "UpdateCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -986,7 +986,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update Cloud Cost Management AWS CUR config returns "OK" response
     Given new "UpdateCostAWSCURConfig" request
     And request contains "cloud_account_id" parameter with value 100
@@ -995,7 +995,7 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data[0].attributes.account_id" is equal to "000000000000"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Update Cloud Cost Management Azure config returns "Bad Request" response
     Given new "UpdateCostAzureUCConfigs" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
@@ -1003,7 +1003,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Update Cloud Cost Management Azure config returns "Not Found" response
     Given new "UpdateCostAzureUCConfigs" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -1011,7 +1011,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update Cloud Cost Management Azure config returns "OK" response
     Given new "UpdateCostAzureUCConfigs" request
     And request contains "cloud_account_id" parameter with value 100
@@ -1020,7 +1020,7 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data.type" is equal to "azure_uc_configs"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Update Google Cloud Usage Cost config returns "Bad Request" response
     Given new "UpdateCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
@@ -1028,7 +1028,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Update Google Cloud Usage Cost config returns "Not Found" response
     Given new "UpdateCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter with value 123456
@@ -1036,7 +1036,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update Google Cloud Usage Cost config returns "OK" response
     Given new "UpdateCostGCPUsageCostConfig" request
     And request contains "cloud_account_id" parameter with value 100
@@ -1045,7 +1045,7 @@ Feature: Cloud Cost Management
     Then the response status is 200 OK
     And the response "data.attributes.account_id" is equal to "123456_A123BC_12AB34"
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Update a unit cost returns "Bad Request" response
     Given operation "UpdateUnitCost" enabled
     And new "UpdateUnitCost" request
@@ -1054,7 +1054,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Update a unit cost returns "Not Found" response
     Given operation "UpdateUnitCost" enabled
     And new "UpdateUnitCost" request
@@ -1063,7 +1063,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ccm-roi
+  @generated @skip @team:ddoghq/ccm-roi
   Scenario: Update a unit cost returns "OK" response
     Given operation "UpdateUnitCost" enabled
     And new "UpdateUnitCost" request
@@ -1072,7 +1072,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Update account filters returns "Bad Request" response
     Given new "UpdateCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
@@ -1080,7 +1080,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Update account filters returns "Not Found" response
     Given new "UpdateCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
@@ -1088,7 +1088,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Update account filters returns "OK" response
     Given new "UpdateCostAccountFilters" request
     And request contains "cloud_account_id" parameter from "REPLACE.ME"
@@ -1096,7 +1096,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update custom allocation rule returns "OK" response
     Given new "UpdateCustomAllocationRule" request
     And request contains "rule_id" parameter with value 683
@@ -1104,7 +1104,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update tag pipeline ruleset returns "OK" response
     Given new "UpdateTagPipelinesRuleset" request
     And request contains "ruleset_id" parameter with value "ee10c3ff-312f-464c-b4f6-46adaa6d00a1"
@@ -1112,7 +1112,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Update tag pipeline ruleset with if_tag_exists returns "OK" response
     Given new "UpdateTagPipelinesRuleset" request
     And request contains "ruleset_id" parameter with value "ee10c3ff-312f-464c-b4f6-46adaa6d00a1"
@@ -1120,7 +1120,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Upload Custom Costs File returns "Accepted" response
     Given new "UploadCustomCostsFile" request
     And body with value [{ "ProviderName": "my_provider", "ChargePeriodStart": "2023-05-06", "ChargePeriodEnd": "2023-06-06","ChargeDescription": "my_description","BilledCost": 250,"BillingCurrency": "USD","Tags": {"key": "value"}}]
@@ -1128,21 +1128,21 @@ Feature: Cloud Cost Management
     Then the response status is 202 Accepted
     And the response "data.attributes.name" is equal to "data.json"
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Upload Custom Costs file returns "Accepted" response
     Given new "UploadCustomCostsFile" request
     And body with value [{"BilledCost": 100.5, "BillingCurrency": "USD", "ChargeDescription": "Monthly usage charge for my service", "ChargePeriodEnd": "2023-02-28", "ChargePeriodStart": "2023-02-01"}]
     When the request is sent
     Then the response status is 202 Accepted
 
-  @team:DataDog/cloud-cost-management
+  @team:ddoghq/cloud-cost-management
   Scenario: Upload Custom Costs file returns "Bad Request" response
     Given new "UploadCustomCostsFile" request
     And body with value [{"BilledCost": 100.5, "BillingCurrency": "USD", "ChargeDescription": "Monthly usage charge for my service", "ChargePeriodEnd": "2023-02-28", "ChargePeriodStart": "2023-02-01"}]
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Upsert a Cloud Cost Management tag description returns "Bad Request" response
     Given new "UpsertCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
@@ -1150,7 +1150,7 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Upsert a Cloud Cost Management tag description returns "No Content" response
     Given new "UpsertCostTagDescriptionByKey" request
     And request contains "tag_key" parameter from "REPLACE.ME"
@@ -1158,20 +1158,20 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Validate CSV budget returns "OK" response
     Given new "ValidateCsvBudget" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-cost-management
+  @generated @skip @team:ddoghq/cloud-cost-management
   Scenario: Validate budget returns "OK" response
     Given new "ValidateBudget" request
     And body with value {"data": {"attributes": {"created_at": 1738258683590, "created_by": "00000000-0a0a-0a0a-aaa0-00000000000a", "end_month": 202502, "entries": [{"amount": 500, "month": 202501, "tag_filters": [{"tag_key": "service", "tag_value": "ec2"}]}, {"amount": 500, "month": 202502, "tag_filters": [{"tag_key": "service", "tag_value": "ec2"}]}], "metrics_query": "aws.cost.amortized{service:ec2} by {service}", "name": "my budget", "org_id": 123, "start_month": 202501, "total_amount": 1000, "updated_at": 1738258683590, "updated_by": "00000000-0a0a-0a0a-aaa0-00000000000a"}, "id": "1", "type": "budget"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/cloud-cost-management
+  @replay-only @team:ddoghq/cloud-cost-management
   Scenario: Validate query returns "OK" response
     Given new "ValidateQuery" request
     And body with value {"data": {"attributes": {"Query": "example:query AND test:true"}, "type": "validate_query"}}
diff --git a/features/v2/cloud_network_monitoring.feature b/features/v2/cloud_network_monitoring.feature
index 12064508f1ee..98622ed45c2c 100644
--- a/features/v2/cloud_network_monitoring.feature
+++ b/features/v2/cloud_network_monitoring.feature
@@ -12,33 +12,33 @@ Feature: Cloud Network Monitoring
     And a valid "appKeyAuth" key in the system
     And an instance of "CloudNetworkMonitoring" API
 
-  @team:Datadog/networks
+  @team:ddoghq/networks
   Scenario: Get aggregated connections returns "OK" response
     Given new "GetAggregatedConnections" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:Datadog/networks
+  @team:ddoghq/networks
   Scenario: Get all aggregated DNS traffic returns "Bad Request" response
     Given new "GetAggregatedDns" request
     And request contains "group_by" parameter with value "server_ungrouped,server_service"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/networks
+  @team:ddoghq/networks
   Scenario: Get all aggregated DNS traffic returns "OK" response
     Given new "GetAggregatedDns" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-python @skip-ruby @team:Datadog/networks
+  @skip-python @skip-ruby @team:ddoghq/networks
   Scenario: Get all aggregated connections returns "Bad Request" response
     Given new "GetAggregatedConnections" request
     And request contains "limit" parameter with value 8000
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/networks
+  @generated @skip @team:ddoghq/networks
   Scenario: Get all aggregated connections returns "OK" response
     Given new "GetAggregatedConnections" request
     When the request is sent
diff --git a/features/v2/cloudflare_integration.feature b/features/v2/cloudflare_integration.feature
index 506d440826d1..944425bbcc55 100644
--- a/features/v2/cloudflare_integration.feature
+++ b/features/v2/cloudflare_integration.feature
@@ -10,28 +10,28 @@ Feature: Cloudflare Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "CloudflareIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Cloudflare account returns "Bad Request" response
     Given new "CreateCloudflareAccount" request
     And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Add Cloudflare account returns "Bad Request" response due to missing email
     Given new "CreateCloudflareAccount" request
     And body with value {"data": {"attributes": {"api_key": "fakekey", "name": "{{ unique_lower_alnum }}"}, "type": "cloudflare-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Add Cloudflare account returns "Bad Request" response using invalid auth key
     Given new "CreateCloudflareAccount" request
     And body with value {"data": {"attributes": {"api_key": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "name": "{{ unique_lower_alnum }}"}, "type": "cloudflare-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Add Cloudflare account returns "CREATED" response
     Given new "CreateCloudflareAccount" request
     And body with value {"data": {"attributes": {"api_key": "fakekey", "email": "dev@datadoghq.com", "name": "{{ unique_lower_alnum }}"}, "type": "cloudflare-accounts"}}
@@ -41,49 +41,49 @@ Feature: Cloudflare Integration
     And the response "data.attributes.email" is equal to "dev@datadoghq.com"
     And the response "data.attributes.name" is equal to "{{ unique_lower_alnum }}"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Cloudflare account returns "Not Found" response
     Given new "CreateCloudflareAccount" request
     And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Cloudflare account returns "Bad Request" response
     Given new "DeleteCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Cloudflare account returns "Not Found" response
     Given new "DeleteCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Cloudflare account returns "OK" response
     Given new "DeleteCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Cloudflare account returns "Bad Request" response
     Given new "GetCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Cloudflare account returns "Not Found" response
     Given new "GetCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Get Cloudflare account returns "OK" response
     Given there is a valid "cloudflare_account" in the system
     And new "GetCloudflareAccount" request
@@ -94,19 +94,19 @@ Feature: Cloudflare Integration
     And the response "data.attributes.email" is equal to "dev@datadog.com"
     And the response "data.attributes.name" is equal to "{{ unique_lower_alnum }}"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Cloudflare accounts returns "Bad Request" response
     Given new "ListCloudflareAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Cloudflare accounts returns "Not Found" response
     Given new "ListCloudflareAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: List Cloudflare accounts returns "OK" response
     Given there is a valid "cloudflare_account" in the system
     And new "ListCloudflareAccounts" request
@@ -114,7 +114,7 @@ Feature: Cloudflare Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "cloudflare-accounts"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Cloudflare account returns "Bad Request" response
     Given new "UpdateCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -122,7 +122,7 @@ Feature: Cloudflare Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Update Cloudflare account returns "Bad Request" response due to invalid api key
     Given there is a valid "cloudflare_account" in the system
     And new "UpdateCloudflareAccount" request
@@ -131,7 +131,7 @@ Feature: Cloudflare Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Update Cloudflare account returns "Bad Request" response due to missing required email
     Given there is a valid "cloudflare_account" in the system
     And new "UpdateCloudflareAccount" request
@@ -140,7 +140,7 @@ Feature: Cloudflare Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Cloudflare account returns "Not Found" response
     Given new "UpdateCloudflareAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -148,7 +148,7 @@ Feature: Cloudflare Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/saas-integrations
+  @replay-only @team:ddoghq/saas-integrations
   Scenario: Update Cloudflare account returns "OK" response
     Given there is a valid "cloudflare_account" in the system
     And new "UpdateCloudflareAccount" request
diff --git a/features/v2/code_coverage.feature b/features/v2/code_coverage.feature
index 217c50edf8c1..5c7f9916c395 100644
--- a/features/v2/code_coverage.feature
+++ b/features/v2/code_coverage.feature
@@ -9,28 +9,28 @@ Feature: Code Coverage
     And a valid "appKeyAuth" key in the system
     And an instance of "CodeCoverage" API
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a branch returns "Bad Request" response
     Given new "GetCodeCoverageBranchSummary" request
     And body with value {"data": {"attributes": {"branch": "prod", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_branch_summary_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a branch returns "Not Found" response
     Given new "GetCodeCoverageBranchSummary" request
     And body with value {"data": {"attributes": {"branch": "prod", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_branch_summary_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a branch returns "OK" response
     Given new "GetCodeCoverageBranchSummary" request
     And body with value {"data": {"attributes": {"branch": "prod", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_branch_summary_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a branch with empty branch name returns bad request
     Given operation "GetCodeCoverageBranchSummary" enabled
     And new "GetCodeCoverageBranchSummary" request
@@ -38,7 +38,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a branch with empty repository_id returns bad request
     Given operation "GetCodeCoverageBranchSummary" enabled
     And new "GetCodeCoverageBranchSummary" request
@@ -46,7 +46,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit in nonexistent repository returns not found
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -54,28 +54,28 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit returns "Bad Request" response
     Given new "GetCodeCoverageCommitSummary" request
     And body with value {"data": {"attributes": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_commit_summary_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit returns "Not Found" response
     Given new "GetCodeCoverageCommitSummary" request
     And body with value {"data": {"attributes": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_commit_summary_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit returns "OK" response
     Given new "GetCodeCoverageCommitSummary" request
     And body with value {"data": {"attributes": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_commit_summary_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit with empty commit_sha returns bad request
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -83,7 +83,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit with empty repository_id returns bad request
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -91,7 +91,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a commit with invalid commit SHA returns bad request
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -99,7 +99,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a nonexistent branch returns not found
     Given operation "GetCodeCoverageBranchSummary" enabled
     And new "GetCodeCoverageBranchSummary" request
@@ -107,7 +107,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a nonexistent commit returns not found
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -115,7 +115,7 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a nonexistent repository returns not found
     Given operation "GetCodeCoverageBranchSummary" enabled
     And new "GetCodeCoverageBranchSummary" request
@@ -123,28 +123,28 @@ Feature: Code Coverage
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a pull request returns "Bad Request" response
     Given new "GetCodeCoveragePRSummary" request
     And body with value {"data": {"attributes": {"pr_number": 42, "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_pr_summary_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a pull request returns "Not Found" response
     Given new "GetCodeCoveragePRSummary" request
     And body with value {"data": {"attributes": {"pr_number": 42, "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_pr_summary_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for a pull request returns "OK" response
     Given new "GetCodeCoveragePRSummary" request
     And body with value {"data": {"attributes": {"pr_number": 42, "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_pr_summary_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for an existing branch with valid repository
     Given operation "GetCodeCoverageBranchSummary" enabled
     And new "GetCodeCoverageBranchSummary" request
@@ -157,7 +157,7 @@ Feature: Code Coverage
     And the response "data.attributes" has field "evaluated_reports_count"
     And the response "data.attributes" has field "evaluated_flags_count"
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get code coverage summary for an existing commit with valid repository
     Given operation "GetCodeCoverageCommitSummary" enabled
     And new "GetCodeCoverageCommitSummary" request
@@ -170,21 +170,21 @@ Feature: Code Coverage
     And the response "data.attributes" has field "evaluated_reports_count"
     And the response "data.attributes" has field "evaluated_flags_count"
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get per-file code coverage data returns "Bad Request" response
     Given new "GetCodeCoverageFiles" request
     And body with value {"data": {"attributes": {"branch": "main", "changed_only": true, "codeowner": "@my-team", "commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "flag": "unit-tests", "pr_number": 42, "repository_id": "github.com/datadog/shopist", "repository_url": "https://github.com/datadog/shopist", "service": "my-service"}, "type": "ci_app_coverage_files_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get per-file code coverage data returns "Not Found" response
     Given new "GetCodeCoverageFiles" request
     And body with value {"data": {"attributes": {"changed_only": true, "commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_files_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get per-file code coverage data returns "OK" response
     Given new "GetCodeCoverageFiles" request
     And body with value {"data": {"attributes": {"changed_only": true, "commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/datadog/shopist"}, "type": "ci_app_coverage_files_request"}}
diff --git a/features/v2/compliance.feature b/features/v2/compliance.feature
index e59eba055be3..284488bc481d 100644
--- a/features/v2/compliance.feature
+++ b/features/v2/compliance.feature
@@ -14,13 +14,13 @@ Feature: Compliance
     And operation "GetRuleBasedView" enabled
     And new "GetRuleBasedView" request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get the rule-based view of compliance findings returns "Bad Request" response
     Given request contains "to" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get the rule-based view of compliance findings returns "OK" response
     Given request contains "to" parameter from "REPLACE.ME"
     When the request is sent
diff --git a/features/v2/confluent_cloud.feature b/features/v2/confluent_cloud.feature
index f81e01d0938d..07dc339fe60f 100644
--- a/features/v2/confluent_cloud.feature
+++ b/features/v2/confluent_cloud.feature
@@ -10,28 +10,28 @@ Feature: Confluent Cloud
     And a valid "appKeyAuth" key in the system
     And an instance of "ConfluentCloud" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Confluent account returns "Bad Request" response
     Given new "CreateConfluentAccount" request
     And body with value {"data": {"attributes": {"api_key": "TESTAPIKEY123", "api_secret": "test-api-secret-123", "resources": [{"enable_custom_metrics": false, "id": "resource-id-123", "resource_type": "kafka", "tags": ["myTag", "myTag2:myValue"]}], "tags": ["myTag", "myTag2:myValue"]}, "type": "confluent-cloud-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Confluent account returns "Not Found" response
     Given new "CreateConfluentAccount" request
     And body with value {"data": {"attributes": {"api_key": "TESTAPIKEY123", "api_secret": "test-api-secret-123", "resources": [{"enable_custom_metrics": false, "id": "resource-id-123", "resource_type": "kafka", "tags": ["myTag", "myTag2:myValue"]}], "tags": ["myTag", "myTag2:myValue"]}, "type": "confluent-cloud-accounts"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Confluent account returns "OK" response
     Given new "CreateConfluentAccount" request
     And body with value {"data": {"attributes": {"api_key": "TESTAPIKEY123", "api_secret": "test-api-secret-123", "resources": [{"enable_custom_metrics": false, "id": "resource-id-123", "resource_type": "kafka", "tags": ["myTag", "myTag2:myValue"]}], "tags": ["myTag", "myTag2:myValue"]}, "type": "confluent-cloud-accounts"}}
     When the request is sent
     Then the response status is 201 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add resource to Confluent account returns "Bad Request" response
     Given new "CreateConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -39,7 +39,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add resource to Confluent account returns "Not Found" response
     Given new "CreateConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -47,7 +47,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Add resource to Confluent account returns "OK" response
     Given there is a valid "confluent_account" in the system
     And new "CreateConfluentResource" request
@@ -59,21 +59,21 @@ Feature: Confluent Cloud
     And the response "data.attributes.resource_type" is equal to "kafka"
     And the response "data.attributes.tags[0]" is equal to "mytag"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Confluent account returns "Bad Request" response
     Given new "DeleteConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Confluent account returns "Not Found" response
     Given new "DeleteConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Delete Confluent account returns "OK" response
     Given there is a valid "confluent_account" in the system
     And new "DeleteConfluentAccount" request
@@ -81,7 +81,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete resource from Confluent account returns "Bad Request" response
     Given new "DeleteConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -89,7 +89,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete resource from Confluent account returns "Not Found" response
     Given new "DeleteConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -97,7 +97,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete resource from Confluent account returns "OK" response
     Given new "DeleteConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -105,21 +105,21 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Confluent account returns "Bad Request" response
     Given new "GetConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Confluent account returns "Not Found" response
     Given new "GetConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Get Confluent account returns "OK" response
     Given there is a valid "confluent_account" in the system
     And new "GetConfluentAccount" request
@@ -131,7 +131,7 @@ Feature: Confluent Cloud
     And the response "data.attributes.resources[0].resource_type" is equal to "kafka"
     And the response "data.attributes.resources[0].enable_custom_metrics" is equal to false
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get resource from Confluent account returns "Bad Request" response
     Given new "GetConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -139,7 +139,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get resource from Confluent account returns "Not Found" response
     Given new "GetConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -147,7 +147,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get resource from Confluent account returns "OK" response
     Given new "GetConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -155,40 +155,40 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Confluent Account resources returns "Bad Request" response
     Given new "ListConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Confluent Account resources returns "Not Found" response
     Given new "ListConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Confluent Account resources returns "OK" response
     Given new "ListConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Confluent accounts returns "Bad Request" response
     Given new "ListConfluentAccount" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Confluent accounts returns "Not Found" response
     Given new "ListConfluentAccount" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: List Confluent accounts returns "OK" response
     Given there is a valid "confluent_account" in the system
     And new "ListConfluentAccount" request
@@ -196,7 +196,7 @@ Feature: Confluent Cloud
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "confluent-cloud-accounts"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Confluent account returns "Bad Request" response
     Given new "UpdateConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -204,7 +204,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Confluent account returns "Not Found" response
     Given new "UpdateConfluentAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -212,7 +212,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Update Confluent account returns "OK" response
     Given there is a valid "confluent_account" in the system
     And new "UpdateConfluentAccount" request
@@ -223,7 +223,7 @@ Feature: Confluent Cloud
     And the response "data.attributes.tags[0]" is equal to "updated_tag:val"
     And the response "data.attributes.api_key" is equal to "{{ confluent_account.data.attributes.api_key }}"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update resource in Confluent account returns "Bad Request" response
     Given new "UpdateConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -232,7 +232,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update resource in Confluent account returns "Not Found" response
     Given new "UpdateConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -241,7 +241,7 @@ Feature: Confluent Cloud
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update resource in Confluent account returns "OK" response
     Given new "UpdateConfluentResource" request
     And request contains "account_id" parameter from "REPLACE.ME"
diff --git a/features/v2/container_images.feature b/features/v2/container_images.feature
index 8e9162526cf2..f49a8305ee82 100644
--- a/features/v2/container_images.feature
+++ b/features/v2/container_images.feature
@@ -10,25 +10,25 @@ Feature: Container Images
     And an instance of "ContainerImages" API
     And new "ListContainerImages" request
 
-  @replay-only @team:DataDog/container-experiences
+  @replay-only @team:ddoghq/container-experiences
   Scenario: Get all Container Image groups returns "OK" response
     Given request contains "group_by" parameter with value "short_image"
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "test_name"
 
-  @generated @skip @team:DataDog/container-experiences
+  @generated @skip @team:ddoghq/container-experiences
   Scenario: Get all Container Images returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/container-experiences
+  @replay-only @team:ddoghq/container-experiences
   Scenario: Get all Container Images returns "OK" response
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "test_name"
 
-  @replay-only @skip-validation @team:DataDog/container-experiences @with-pagination
+  @replay-only @skip-validation @team:ddoghq/container-experiences @with-pagination
   Scenario: Get all Container Images returns "OK" response with pagination
     Given request contains "page[size]" parameter with value 2
     When the request with pagination is sent
diff --git a/features/v2/containers.feature b/features/v2/containers.feature
index 1e1e842371a6..af908f79d08a 100644
--- a/features/v2/containers.feature
+++ b/features/v2/containers.feature
@@ -10,25 +10,25 @@ Feature: Containers
     And an instance of "Containers" API
     And new "ListContainers" request
 
-  @replay-only @team:DataDog/container-experiences
+  @replay-only @team:ddoghq/container-experiences
   Scenario: Get All Container groups returns "OK" response
     Given request contains "group_by" parameter with value "short_image"
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.count" is equal to 123
 
-  @generated @skip @team:DataDog/container-experiences
+  @generated @skip @team:ddoghq/container-experiences
   Scenario: Get All Containers returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/container-experiences
+  @replay-only @team:ddoghq/container-experiences
   Scenario: Get All Containers returns "OK" response
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "test_name"
 
-  @replay-only @skip-validation @team:DataDog/container-experiences @with-pagination
+  @replay-only @skip-validation @team:ddoghq/container-experiences @with-pagination
   Scenario: Get All Containers returns "OK" response with pagination
     Given request contains "page[size]" parameter with value 2
     When the request with pagination is sent
diff --git a/features/v2/csm_agents.feature b/features/v2/csm_agents.feature
index c5c25bb35e7a..a15b076d133c 100644
--- a/features/v2/csm_agents.feature
+++ b/features/v2/csm_agents.feature
@@ -12,13 +12,13 @@ Feature: CSM Agents
     And a valid "appKeyAuth" key in the system
     And an instance of "CSMAgents" API
 
-  @team:DataDog/k9-misconfigs
+  @team:ddoghq/k9-misconfigs
   Scenario: Get all CSM Agents returns "OK" response
     Given new "ListAllCSMAgents" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-misconfigs
+  @team:ddoghq/k9-misconfigs
   Scenario: Get all CSM Serverless Agents returns "OK" response
     Given new "ListAllCSMServerlessAgents" request
     When the request is sent
diff --git a/features/v2/csm_coverage_analysis.feature b/features/v2/csm_coverage_analysis.feature
index a6c05b8dfc15..cad2cc365602 100644
--- a/features/v2/csm_coverage_analysis.feature
+++ b/features/v2/csm_coverage_analysis.feature
@@ -12,19 +12,19 @@ Feature: CSM Coverage Analysis
     And a valid "appKeyAuth" key in the system
     And an instance of "CSMCoverageAnalysis" API
 
-  @team:DataDog/k9-misconfigs
+  @team:ddoghq/k9-misconfigs
   Scenario: Get the CSM Cloud Accounts Coverage Analysis returns "OK" response
     Given new "GetCSMCloudAccountsCoverageAnalysis" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-misconfigs
+  @team:ddoghq/k9-misconfigs
   Scenario: Get the CSM Hosts and Containers Coverage Analysis returns "OK" response
     Given new "GetCSMHostsAndContainersCoverageAnalysis" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-misconfigs
+  @team:ddoghq/k9-misconfigs
   Scenario: Get the CSM Serverless Coverage Analysis returns "OK" response
     Given new "GetCSMServerlessCoverageAnalysis" request
     When the request is sent
diff --git a/features/v2/csm_ownership.feature b/features/v2/csm_ownership.feature
index 4f54575387ee..29ce49e8e432 100644
--- a/features/v2/csm_ownership.feature
+++ b/features/v2/csm_ownership.feature
@@ -12,14 +12,14 @@ Feature: CSM Ownership
     And a valid "appKeyAuth" key in the system
     And an instance of "CSMOwnership" API
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Count untagged findings by ownership confidence returns "OK" response
     Given operation "GetOwnershipUntaggedFindings" enabled
     And new "GetOwnershipUntaggedFindings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get an ownership inference by owner type returns "Bad Request" response
     Given operation "GetOwnershipInference" enabled
     And new "GetOwnershipInference" request
@@ -28,7 +28,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get an ownership inference by owner type returns "Not Found" response
     Given operation "GetOwnershipInference" enabled
     And new "GetOwnershipInference" request
@@ -37,7 +37,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get an ownership inference by owner type returns "OK" response
     Given operation "GetOwnershipInference" enabled
     And new "GetOwnershipInference" request
@@ -46,14 +46,14 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get ownership settings for the org returns "OK" response
     Given operation "GetOwnershipSettings" enabled
     And new "GetOwnershipSettings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get the evidence for an ownership inference returns "Bad Request" response
     Given operation "GetOwnershipEvidence" enabled
     And new "GetOwnershipEvidence" request
@@ -62,7 +62,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get the evidence for an ownership inference returns "Not Found" response
     Given operation "GetOwnershipEvidence" enabled
     And new "GetOwnershipEvidence" request
@@ -71,7 +71,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get the evidence for an ownership inference returns "OK" response
     Given operation "GetOwnershipEvidence" enabled
     And new "GetOwnershipEvidence" request
@@ -80,7 +80,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership history by owner type returns "Bad Request" response
     Given operation "ListOwnershipHistoryByOwnerType" enabled
     And new "ListOwnershipHistoryByOwnerType" request
@@ -89,7 +89,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership history by owner type returns "OK" response
     Given operation "ListOwnershipHistoryByOwnerType" enabled
     And new "ListOwnershipHistoryByOwnerType" request
@@ -98,7 +98,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership inference history for a resource returns "Bad Request" response
     Given operation "ListOwnershipHistory" enabled
     And new "ListOwnershipHistory" request
@@ -106,7 +106,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership inference history for a resource returns "OK" response
     Given operation "ListOwnershipHistory" enabled
     And new "ListOwnershipHistory" request
@@ -114,7 +114,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership inferences for a resource returns "Bad Request" response
     Given operation "ListOwnershipInferences" enabled
     And new "ListOwnershipInferences" request
@@ -122,7 +122,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership inferences for a resource returns "Not Found" response
     Given operation "ListOwnershipInferences" enabled
     And new "ListOwnershipInferences" request
@@ -130,7 +130,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List ownership inferences for a resource returns "OK" response
     Given operation "ListOwnershipInferences" enabled
     And new "ListOwnershipInferences" request
@@ -138,7 +138,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Submit feedback on an ownership inference returns "Bad Request" response
     Given operation "CreateOwnershipFeedback" enabled
     And new "CreateOwnershipFeedback" request
@@ -148,7 +148,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Submit feedback on an ownership inference returns "Conflict" response
     Given operation "CreateOwnershipFeedback" enabled
     And new "CreateOwnershipFeedback" request
@@ -158,7 +158,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Submit feedback on an ownership inference returns "Created" response
     Given operation "CreateOwnershipFeedback" enabled
     And new "CreateOwnershipFeedback" request
@@ -168,7 +168,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Submit feedback on an ownership inference returns "Not Found" response
     Given operation "CreateOwnershipFeedback" enabled
     And new "CreateOwnershipFeedback" request
@@ -178,7 +178,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Update ownership settings for the org returns "Bad Request" response
     Given operation "PostOwnershipSettings" enabled
     And new "PostOwnershipSettings" request
@@ -186,7 +186,7 @@ Feature: CSM Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Update ownership settings for the org returns "OK" response
     Given operation "PostOwnershipSettings" enabled
     And new "PostOwnershipSettings" request
diff --git a/features/v2/csm_settings.feature b/features/v2/csm_settings.feature
index c28ca491f301..0b8fd4259cf0 100644
--- a/features/v2/csm_settings.feature
+++ b/features/v2/csm_settings.feature
@@ -10,7 +10,7 @@ Feature: CSM Settings
     And a valid "appKeyAuth" key in the system
     And an instance of "CSMSettings" API
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get agentless host facet info returns "Bad Request" response
     Given operation "GetCSMAgentlessHostFacetInfo" enabled
     And new "GetCSMAgentlessHostFacetInfo" request
@@ -18,7 +18,7 @@ Feature: CSM Settings
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get agentless host facet info returns "OK" response
     Given operation "GetCSMAgentlessHostFacetInfo" enabled
     And new "GetCSMAgentlessHostFacetInfo" request
@@ -26,7 +26,7 @@ Feature: CSM Settings
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get unified host facet info returns "Bad Request" response
     Given operation "GetCSMUnifiedHostFacetInfo" enabled
     And new "GetCSMUnifiedHostFacetInfo" request
@@ -34,7 +34,7 @@ Feature: CSM Settings
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: Get unified host facet info returns "OK" response
     Given operation "GetCSMUnifiedHostFacetInfo" enabled
     And new "GetCSMUnifiedHostFacetInfo" request
@@ -42,42 +42,42 @@ Feature: CSM Settings
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List agentless host facets returns "OK" response
     Given operation "ListCSMAgentlessHostFacets" enabled
     And new "ListCSMAgentlessHostFacets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List agentless hosts returns "Bad Request" response
     Given operation "ListCSMAgentlessHosts" enabled
     And new "ListCSMAgentlessHosts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List agentless hosts returns "OK" response
     Given operation "ListCSMAgentlessHosts" enabled
     And new "ListCSMAgentlessHosts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List unified host facets returns "OK" response
     Given operation "ListCSMUnifiedHostFacets" enabled
     And new "ListCSMUnifiedHostFacets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List unified hosts returns "Bad Request" response
     Given operation "ListCSMUnifiedHosts" enabled
     And new "ListCSMUnifiedHosts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-misconfigs
+  @generated @skip @team:ddoghq/k9-misconfigs
   Scenario: List unified hosts returns "OK" response
     Given operation "ListCSMUnifiedHosts" enabled
     And new "ListCSMUnifiedHosts" request
diff --git a/features/v2/csm_threats.feature b/features/v2/csm_threats.feature
index 2522d1efeb0a..ba99d2148647 100644
--- a/features/v2/csm_threats.feature
+++ b/features/v2/csm_threats.feature
@@ -13,7 +13,7 @@ Feature: CSM Threats
     And a valid "appKeyAuth" key in the system
     And an instance of "CSMThreats" API
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule (US1-FED) returns "Bad Request" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCloudWorkloadSecurityAgentRule" request
@@ -21,7 +21,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule (US1-FED) returns "Conflict" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCloudWorkloadSecurityAgentRule" request
@@ -29,7 +29,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 409 Conflict
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule (US1-FED) returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCloudWorkloadSecurityAgentRule" request
@@ -37,7 +37,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule returns "Bad Request" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCSMThreatsAgentRule" request
@@ -45,7 +45,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule returns "Conflict" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCSMThreatsAgentRule" request
@@ -53,7 +53,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCSMThreatsAgentRule" request
@@ -61,7 +61,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule with set action returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCSMThreatsAgentRule" request
@@ -69,7 +69,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection agent rule with set action with expression returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "CreateCSMThreatsAgentRule" request
@@ -77,35 +77,35 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection policy returns "Bad Request" response
     Given new "CreateCSMThreatsAgentPolicy" request
     And body with value {"data": {"attributes": {"description": "My agent policy", "enabled": true, "hostTags": [], "hostTagsLists": [], "name": "test"}, "type": "policy"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection policy returns "Conflict" response
     Given new "CreateCSMThreatsAgentPolicy" request
     And body with value {"data": {"attributes": {"description": "My agent policy", "enabled": true, "hostTags": [], "name": "my_agent_policy"}, "type": "policy"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Create a Workload Protection policy returns "OK" response
     Given new "CreateCSMThreatsAgentPolicy" request
     And body with value {"data": {"attributes": {"description": "My agent policy", "enabled": true, "hostTagsLists": [["env:test"]], "name": "my_agent_policy_2"}, "type": "policy"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection agent rule (US1-FED) returns "Not Found" response
     Given new "DeleteCloudWorkloadSecurityAgentRule" request
     And request contains "agent_rule_id" parameter with value "non-existent-rule-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection agent rule (US1-FED) returns "OK" response
     Given there is a valid "agent_rule" in the system
     And new "DeleteCloudWorkloadSecurityAgentRule" request
@@ -113,14 +113,14 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection agent rule returns "Not Found" response
     Given new "DeleteCSMThreatsAgentRule" request
     And request contains "agent_rule_id" parameter with value "non-existent-rule-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection agent rule returns "OK" response
     Given there is a valid "policy_rc" in the system
     And there is a valid "agent_rule_rc" in the system
@@ -130,14 +130,14 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection policy returns "Not Found" response
     Given new "DeleteCSMThreatsAgentPolicy" request
     And request contains "policy_id" parameter with value "non-existent-policy-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Delete a Workload Protection policy returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "DeleteCSMThreatsAgentPolicy" request
@@ -145,26 +145,26 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Download the Workload Protection policy (US1-FED) returns "OK" response
     Given new "DownloadCloudWorkloadPolicyFile" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Download the Workload Protection policy returns "OK" response
     Given new "DownloadCSMThreatsPolicy" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection agent rule (US1-FED) returns "Not Found" response
     Given new "GetCloudWorkloadSecurityAgentRule" request
     And request contains "agent_rule_id" parameter with value "abc-def-ghi"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection agent rule (US1-FED) returns "OK" response
     Given there is a valid "agent_rule" in the system
     And new "GetCloudWorkloadSecurityAgentRule" request
@@ -172,14 +172,14 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection agent rule returns "Not Found" response
     Given new "GetCSMThreatsAgentRule" request
     And request contains "agent_rule_id" parameter with value "abc-def-ghi"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection agent rule returns "OK" response
     Given there is a valid "policy_rc" in the system
     And there is a valid "agent_rule_rc" in the system
@@ -189,14 +189,14 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection policy returns "Not Found" response
     Given new "GetCSMThreatsAgentPolicy" request
     And request contains "policy_id" parameter with value "non-existent-policy-id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get a Workload Protection policy returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "GetCSMThreatsAgentPolicy" request
@@ -204,25 +204,25 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get all Workload Protection agent rules (US1-FED) returns "OK" response
     Given new "ListCloudWorkloadSecurityAgentRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get all Workload Protection agent rules returns "OK" response
     Given new "ListCSMThreatsAgentRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Get all Workload Protection policies returns "OK" response
     Given new "ListCSMThreatsAgentPolicies" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule (US1-FED) returns "Bad Request" response
     Given there is a valid "agent_rule" in the system
     And new "UpdateCloudWorkloadSecurityAgentRule" request
@@ -231,7 +231,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule (US1-FED) returns "Concurrent Modification" response
     Given there is a valid "agent_rule" in the system
     And new "UpdateCloudWorkloadSecurityAgentRule" request
@@ -240,7 +240,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule (US1-FED) returns "Not Found" response
     Given new "UpdateCloudWorkloadSecurityAgentRule" request
     And request contains "agent_rule_id" parameter with value "non-existent-rule-id"
@@ -248,7 +248,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/k9-cws-backend
+  @replay-only @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule (US1-FED) returns "OK" response
     Given there is a valid "agent_rule" in the system
     And new "UpdateCloudWorkloadSecurityAgentRule" request
@@ -257,7 +257,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule returns "Bad Request" response
     Given there is a valid "policy_rc" in the system
     And there is a valid "agent_rule_rc" in the system
@@ -267,7 +267,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule returns "Concurrent Modification" response
     Given there is a valid "agent_rule_rc" in the system
     And there is a valid "policy_rc" in the system
@@ -277,7 +277,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule returns "Not Found" response
     Given there is a valid "policy_rc" in the system
     And new "UpdateCSMThreatsAgentRule" request
@@ -286,7 +286,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection agent rule returns "OK" response
     Given there is a valid "policy_rc" in the system
     And there is a valid "agent_rule_rc" in the system
@@ -297,7 +297,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection policy returns "Bad Request" response
     Given there is a valid "policy_rc" in the system
     And new "UpdateCSMThreatsAgentPolicy" request
@@ -306,7 +306,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/k9-cws-backend
+  @skip @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection policy returns "Concurrent Modification" response
     Given there is a valid "policy_rc" in the system
     And new "UpdateCSMThreatsAgentPolicy" request
@@ -315,7 +315,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection policy returns "Not Found" response
     Given new "UpdateCSMThreatsAgentPolicy" request
     And request contains "policy_id" parameter with value "non-existent-policy-id"
@@ -323,7 +323,7 @@ Feature: CSM Threats
     When the request is sent
     Then the response status is 404 Bad Request
 
-  @team:DataDog/k9-cws-backend
+  @team:ddoghq/k9-cws-backend
   Scenario: Update a Workload Protection policy returns "OK" response
     Given there is a valid "policy_rc" in the system
     And new "UpdateCSMThreatsAgentPolicy" request
diff --git a/features/v2/customer_org.feature b/features/v2/customer_org.feature
index 361daf2716d2..8587db2dfa8e 100644
--- a/features/v2/customer_org.feature
+++ b/features/v2/customer_org.feature
@@ -12,17 +12,17 @@ Feature: Customer Org
     And new "DisableCustomerOrg" request
     And body with value {"data": {"attributes": {"org_uuid": "abcdef01-2345-6789-abcd-ef0123456789"}, "id": "1", "type": "customer_org_disable"}}
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Disable the authenticated customer organization returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Disable the authenticated customer organization returns "Conflict" response
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Disable the authenticated customer organization returns "OK" response
     When the request is sent
     Then the response status is 200 OK
diff --git a/features/v2/dashboard_lists.feature b/features/v2/dashboard_lists.feature
index 1d36afaadd5f..3601b1d2eb47 100644
--- a/features/v2/dashboard_lists.feature
+++ b/features/v2/dashboard_lists.feature
@@ -8,7 +8,7 @@ Feature: Dashboard Lists
     And a valid "appKeyAuth" key in the system
     And an instance of "DashboardLists" API
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Add Items to a Dashboard List returns "Bad Request" response
     Given new "CreateDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -16,7 +16,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Add Items to a Dashboard List returns "Not Found" response
     Given new "CreateDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -24,7 +24,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Add Items to a Dashboard List returns "OK" response
     Given new "CreateDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -32,7 +32,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Add custom screenboard dashboard to an existing dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "screenboard_dashboard" in the system
@@ -45,7 +45,7 @@ Feature: Dashboard Lists
     And the response "added_dashboards_to_list[0].id" is equal to "{{ screenboard_dashboard.id }}"
     And the response "added_dashboards_to_list" has length 1
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Add custom timeboard dashboard to an existing dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "dashboard" in the system
@@ -58,7 +58,7 @@ Feature: Dashboard Lists
     And the response "added_dashboards_to_list[0].id" is equal to "{{ dashboard.id }}"
     And the response "added_dashboards_to_list" has length 1
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete custom screenboard dashboard from an existing dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "screenboard_dashboard" in the system
@@ -72,7 +72,7 @@ Feature: Dashboard Lists
     And the response "deleted_dashboards_from_list[0].id" is equal to "{{ screenboard_dashboard.id }}"
     And the response "deleted_dashboards_from_list" has length 1
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete custom timeboard dashboard from an existing dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "dashboard" in the system
@@ -86,7 +86,7 @@ Feature: Dashboard Lists
     And the response "deleted_dashboards_from_list[0].id" is equal to "{{ dashboard.id }}"
     And the response "deleted_dashboards_from_list" has length 1
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete items from a dashboard list returns "Bad Request" response
     Given new "DeleteDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -94,7 +94,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete items from a dashboard list returns "Not Found" response
     Given new "DeleteDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -102,7 +102,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Delete items from a dashboard list returns "OK" response
     Given new "DeleteDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -110,14 +110,14 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Get items of a Dashboard List returns "Not Found" response
     Given new "GetDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get items of a Dashboard List returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "dashboard" in the system
@@ -130,7 +130,7 @@ Feature: Dashboard Lists
     And the response "dashboards[0].type" is equal to "custom_timeboard"
     And the response "dashboards" has length 1
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Update items of a dashboard list returns "Bad Request" response
     Given new "UpdateDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Update items of a dashboard list returns "Not Found" response
     Given new "UpdateDashboardListItems" request
     And request contains "dashboard_list_id" parameter from "REPLACE.ME"
@@ -146,7 +146,7 @@ Feature: Dashboard Lists
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update items of a dashboard list returns "OK" response
     Given there is a valid "dashboard_list" in the system
     And there is a valid "dashboard" in the system
diff --git a/features/v2/dashboard_secure_embed.feature b/features/v2/dashboard_secure_embed.feature
index ad268373fbc1..e29e7016b352 100644
--- a/features/v2/dashboard_secure_embed.feature
+++ b/features/v2/dashboard_secure_embed.feature
@@ -15,7 +15,7 @@ Feature: Dashboard Secure Embed
     And a valid "appKeyAuth" key in the system
     And an instance of "DashboardSecureEmbed" API
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Create a secure embed for a dashboard returns "Conflict — max 1000 share URLs per dashboard exceeded" response
     Given operation "CreateDashboardSecureEmbed" enabled
     And new "CreateDashboardSecureEmbed" request
@@ -24,7 +24,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 409 Conflict — max 1000 share URLs per dashboard exceeded
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Create a secure embed for a dashboard returns "Dashboard Not Found" response
     Given operation "CreateDashboardSecureEmbed" enabled
     And new "CreateDashboardSecureEmbed" request
@@ -33,7 +33,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 404 Dashboard Not Found
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Create a secure embed for a dashboard returns "OK" response
     Given operation "CreateDashboardSecureEmbed" enabled
     And new "CreateDashboardSecureEmbed" request
@@ -42,7 +42,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Delete a secure embed for a dashboard returns "No Content" response
     Given operation "DeleteDashboardSecureEmbed" enabled
     And new "DeleteDashboardSecureEmbed" request
@@ -51,7 +51,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Delete a secure embed for a dashboard returns "Not Found" response
     Given operation "DeleteDashboardSecureEmbed" enabled
     And new "DeleteDashboardSecureEmbed" request
@@ -60,7 +60,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Get a secure embed for a dashboard returns "Not Found" response
     Given operation "GetDashboardSecureEmbed" enabled
     And new "GetDashboardSecureEmbed" request
@@ -69,7 +69,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Get a secure embed for a dashboard returns "OK" response
     Given operation "GetDashboardSecureEmbed" enabled
     And new "GetDashboardSecureEmbed" request
@@ -78,7 +78,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Update a secure embed for a dashboard returns "Not Found" response
     Given operation "UpdateDashboardSecureEmbed" enabled
     And new "UpdateDashboardSecureEmbed" request
@@ -88,7 +88,7 @@ Feature: Dashboard Secure Embed
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dashboardsnotebooks-backend
+  @generated @skip @team:ddoghq/dashboardsnotebooks-backend
   Scenario: Update a secure embed for a dashboard returns "OK" response
     Given operation "UpdateDashboardSecureEmbed" enabled
     And new "UpdateDashboardSecureEmbed" request
diff --git a/features/v2/dashboard_sharing.feature b/features/v2/dashboard_sharing.feature
index 45257252d39e..507352004068 100644
--- a/features/v2/dashboard_sharing.feature
+++ b/features/v2/dashboard_sharing.feature
@@ -9,13 +9,13 @@ Feature: Dashboard Sharing
     And operation "ListSharedDashboardsByDashboardId" enabled
     And new "ListSharedDashboardsByDashboardId" request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List shared dashboards for a dashboard returns "Dashboard Not Found" response
     Given request contains "dashboard_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Dashboard Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List shared dashboards for a dashboard returns "OK" response
     Given request contains "dashboard_id" parameter from "REPLACE.ME"
     When the request is sent
diff --git a/features/v2/dashboards.feature b/features/v2/dashboards.feature
index 347955175ea0..ea90e9c6a161 100644
--- a/features/v2/dashboards.feature
+++ b/features/v2/dashboards.feature
@@ -10,7 +10,7 @@ Feature: Dashboards
     And a valid "appKeyAuth" key in the system
     And an instance of "Dashboards" API
 
-  @generated @skip @team:DataDog/dashboards-backend
+  @generated @skip @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for a dashboard returns "Bad Request" response
     Given operation "GetDashboardUsage" enabled
     And new "GetDashboardUsage" request
@@ -18,7 +18,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for a dashboard returns "Not Found" response
     Given operation "GetDashboardUsage" enabled
     And new "GetDashboardUsage" request
@@ -26,7 +26,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for a dashboard returns "OK" response
     Given operation "GetDashboardUsage" enabled
     And there is a valid "dashboard" in the system
@@ -41,7 +41,7 @@ Feature: Dashboards
     And the response "data.attributes" has field "total_views"
     And the response "data.attributes.author" has field "handle"
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for all dashboards returns "Bad Request" response
     Given operation "ListDashboardsUsage" enabled
     And new "ListDashboardsUsage" request
@@ -49,7 +49,7 @@ Feature: Dashboards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for all dashboards returns "OK" response
     Given operation "ListDashboardsUsage" enabled
     And there is a valid "dashboard" in the system
@@ -63,7 +63,7 @@ Feature: Dashboards
     And the response "meta.page" has field "total"
     And the response "links" has field "self"
 
-  @replay-only @skip-validation @team:DataDog/dashboards-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/dashboards-backend @with-pagination
   Scenario: Get usage stats for all dashboards returns "OK" response with pagination
     Given operation "ListDashboardsUsage" enabled
     And new "ListDashboardsUsage" request
@@ -72,7 +72,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response has 590 items
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for all dashboards with both filters returns "OK" response
     Given operation "ListDashboardsUsage" enabled
     And new "ListDashboardsUsage" request
@@ -82,7 +82,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "meta.page" has field "total"
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for all dashboards with edited_before filter returns "OK" response
     Given operation "ListDashboardsUsage" enabled
     And new "ListDashboardsUsage" request
@@ -91,7 +91,7 @@ Feature: Dashboards
     Then the response status is 200 OK
     And the response "meta.page" has field "total"
 
-  @replay-only @team:DataDog/dashboards-backend
+  @replay-only @team:ddoghq/dashboards-backend
   Scenario: Get usage stats for all dashboards with viewed_before filter returns "OK" response
     Given operation "ListDashboardsUsage" enabled
     And new "ListDashboardsUsage" request
diff --git a/features/v2/data_deletion.feature b/features/v2/data_deletion.feature
index 8c4359df0279..552b165f6f55 100644
--- a/features/v2/data_deletion.feature
+++ b/features/v2/data_deletion.feature
@@ -9,14 +9,14 @@ Feature: Data Deletion
     And a valid "appKeyAuth" key in the system
     And an instance of "DataDeletion" API
 
-  @replay-only @team:DataDog/governance-tooling-and-systems
+  @replay-only @team:ddoghq/governance-tooling-and-systems
   Scenario: Cancels a data deletion request returns "Bad Request" response
     Given new "CancelDataDeletionRequest" request
     And request contains "id" parameter with value "id-1"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/governance-tooling-and-systems
+  @team:ddoghq/governance-tooling-and-systems
   Scenario: Cancels a data deletion request returns "OK" response
     Given there is a valid "deletion_request" in the system
     And new "CancelDataDeletionRequest" request
@@ -28,14 +28,14 @@ Feature: Data Deletion
     And the response "data.attributes.product" is equal to "{{ deletion_request.data.attributes.product }}"
     And the response "data.attributes.status" is equal to "canceled"
 
-  @replay-only @team:DataDog/governance-tooling-and-systems
+  @replay-only @team:ddoghq/governance-tooling-and-systems
   Scenario: Cancels a data deletion request returns "Precondition failed error" response
     Given new "CancelDataDeletionRequest" request
     And request contains "id" parameter with value "-1"
     When the request is sent
     Then the response status is 412 Precondition failed error
 
-  @generated @skip @team:DataDog/governance-tooling-and-systems
+  @generated @skip @team:ddoghq/governance-tooling-and-systems
   Scenario: Creates a data deletion request returns "Bad Request" response
     Given new "CreateDataDeletionRequest" request
     And request contains "product" parameter from "REPLACE.ME"
@@ -43,7 +43,7 @@ Feature: Data Deletion
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/governance-tooling-and-systems
+  @team:ddoghq/governance-tooling-and-systems
   Scenario: Creates a data deletion request returns "OK" response
     Given new "CreateDataDeletionRequest" request
     And request contains "product" parameter with value "logs"
@@ -54,7 +54,7 @@ Feature: Data Deletion
     And the response "data.attributes.product" is equal to "logs"
     And the response "data.attributes.status" is equal to "pending"
 
-  @replay-only @team:DataDog/governance-tooling-and-systems
+  @replay-only @team:ddoghq/governance-tooling-and-systems
   Scenario: Creates a data deletion request returns "Precondition failed error" response
     Given new "CreateDataDeletionRequest" request
     And request contains "product" parameter with value "logs"
@@ -62,13 +62,13 @@ Feature: Data Deletion
     When the request is sent
     Then the response status is 412 Precondition failed error
 
-  @generated @skip @team:DataDog/governance-tooling-and-systems
+  @generated @skip @team:ddoghq/governance-tooling-and-systems
   Scenario: Gets a list of data deletion requests returns "Bad Request" response
     Given new "GetDataDeletionRequests" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/governance-tooling-and-systems
+  @team:ddoghq/governance-tooling-and-systems
   Scenario: Gets a list of data deletion requests returns "OK" response
     Given there is a valid "deletion_request" in the system
     And new "GetDataDeletionRequests" request
diff --git a/features/v2/databricks_integration.feature b/features/v2/databricks_integration.feature
index 0518707d9a2b..21fe9e038ae0 100644
--- a/features/v2/databricks_integration.feature
+++ b/features/v2/databricks_integration.feature
@@ -10,7 +10,7 @@ Feature: Databricks Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "DatabricksIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Databricks integration account returns "Bad Request" response
     Given operation "CreateDatabricksIntegrationAccount" enabled
     And new "CreateDatabricksIntegrationAccount" request
@@ -18,7 +18,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Databricks integration account returns "Created" response
     Given operation "CreateDatabricksIntegrationAccount" enabled
     And new "CreateDatabricksIntegrationAccount" request
@@ -26,7 +26,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Databricks integration account returns "Not Found" response
     Given operation "CreateDatabricksIntegrationAccount" enabled
     And new "CreateDatabricksIntegrationAccount" request
@@ -34,7 +34,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Databricks integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "CreateDatabricksIntegrationAccount" enabled
     And new "CreateDatabricksIntegrationAccount" request
@@ -42,7 +42,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Databricks integration account returns "Bad Request" response
     Given operation "DeleteDatabricksIntegrationAccount" enabled
     And new "DeleteDatabricksIntegrationAccount" request
@@ -50,7 +50,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Databricks integration account returns "Not Found" response
     Given operation "DeleteDatabricksIntegrationAccount" enabled
     And new "DeleteDatabricksIntegrationAccount" request
@@ -58,7 +58,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Databricks integration account returns "OK" response
     Given operation "DeleteDatabricksIntegrationAccount" enabled
     And new "DeleteDatabricksIntegrationAccount" request
@@ -66,7 +66,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Databricks integration account returns "Bad Request" response
     Given operation "GetDatabricksIntegrationAccount" enabled
     And new "GetDatabricksIntegrationAccount" request
@@ -74,7 +74,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Databricks integration account returns "Not Found" response
     Given operation "GetDatabricksIntegrationAccount" enabled
     And new "GetDatabricksIntegrationAccount" request
@@ -82,7 +82,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Databricks integration account returns "OK" response
     Given operation "GetDatabricksIntegrationAccount" enabled
     And new "GetDatabricksIntegrationAccount" request
@@ -90,28 +90,28 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Databricks integration accounts returns "Bad Request" response
     Given operation "ListDatabricksIntegrationAccounts" enabled
     And new "ListDatabricksIntegrationAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Databricks integration accounts returns "Not Found" response
     Given operation "ListDatabricksIntegrationAccounts" enabled
     And new "ListDatabricksIntegrationAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Databricks integration accounts returns "OK" response
     Given operation "ListDatabricksIntegrationAccounts" enabled
     And new "ListDatabricksIntegrationAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Databricks integration account returns "Bad Request" response
     Given operation "UpdateDatabricksIntegrationAccount" enabled
     And new "UpdateDatabricksIntegrationAccount" request
@@ -120,7 +120,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Databricks integration account returns "Not Found" response
     Given operation "UpdateDatabricksIntegrationAccount" enabled
     And new "UpdateDatabricksIntegrationAccount" request
@@ -129,7 +129,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Databricks integration account returns "OK" response
     Given operation "UpdateDatabricksIntegrationAccount" enabled
     And new "UpdateDatabricksIntegrationAccount" request
@@ -138,7 +138,7 @@ Feature: Databricks Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Databricks integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "UpdateDatabricksIntegrationAccount" enabled
     And new "UpdateDatabricksIntegrationAccount" request
diff --git a/features/v2/datasets.feature b/features/v2/datasets.feature
index 1efcaeb6690e..f36b847938ae 100644
--- a/features/v2/datasets.feature
+++ b/features/v2/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/access-enforcement
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:ddoghq/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/access-enforcement
+  @skip @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/features/v2/dem.feature b/features/v2/dem.feature
index c596de0c3432..b1aca93d687a 100644
--- a/features/v2/dem.feature
+++ b/features/v2/dem.feature
@@ -7,35 +7,35 @@ Feature: DEM
     And a valid "appKeyAuth" key in the system
     And an instance of "DEM" API
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Batch get DEM journeys by test suite IDs returns "Bad Request" response
     Given new "BatchGetJourneysByTestSuiteIDs" request
     And body with value {"data": {"attributes": {"test_suite_ids": ["suite-abc123", "suite-def456"]}, "type": "batch_get_journeys_by_test_suite_ids_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Batch get DEM journeys by test suite IDs returns "Not Found" response
     Given new "BatchGetJourneysByTestSuiteIDs" request
     And body with value {"data": {"attributes": {"test_suite_ids": ["suite-abc123", "suite-def456"]}, "type": "batch_get_journeys_by_test_suite_ids_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Batch get DEM journeys by test suite IDs returns "OK" response
     Given new "BatchGetJourneysByTestSuiteIDs" request
     And body with value {"data": {"attributes": {"test_suite_ids": ["suite-abc123", "suite-def456"]}, "type": "batch_get_journeys_by_test_suite_ids_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a DEM journey returns "OK" response
     Given new "CreateJourney" request
     And body with value {"data": {"attributes": {"description": "Tracks the user checkout flow from cart to confirmation.", "journey_rum": {"filter": "env:prod", "rum_steps": [{"nodes": [{"query": "action.name:'checkout'"}], "type": "start"}, {"nodes": [{"query": "action.name:'confirmation'"}], "type": "stop"}], "variants": [{"name": "Mobile checkout", "rum_steps": [{"nodes": [{"query": "action.name:'checkout'"}], "type": "start"}, {"nodes": [{"query": "action.name:'confirmation'"}], "type": "stop"}]}]}, "name": "Checkout Flow", "tags": ["team:synthetics", "env:prod"], "variants": [{"name": "Mobile checkout", "rum_steps": [{"nodes": [{"query": "action.name:'checkout'"}], "type": "start"}, {"nodes": [{"query": "action.name:'confirmation'"}], "type": "stop"}]}]}, "type": "journeys"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a DEM journey variant returns "Bad Request" response
     Given new "CreateJourneyVariant" request
     And request contains "journey_id" parameter from "REPLACE.ME"
@@ -43,7 +43,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a DEM journey variant returns "Not Found" response
     Given new "CreateJourneyVariant" request
     And request contains "journey_id" parameter from "REPLACE.ME"
@@ -51,7 +51,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a DEM journey variant returns "OK" response
     Given new "CreateJourneyVariant" request
     And request contains "journey_id" parameter from "REPLACE.ME"
@@ -59,7 +59,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a test suite for a DEM journey returns "Created" response
     Given new "CreateTestSuiteForJourney" request
     And request contains "public_journey_id" parameter from "REPLACE.ME"
@@ -67,7 +67,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Create a test suite for a DEM journey returns "Not Found" response
     Given new "CreateTestSuiteForJourney" request
     And request contains "public_journey_id" parameter from "REPLACE.ME"
@@ -75,127 +75,127 @@ Feature: DEM
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete a DEM journey returns "No Content" response
     Given new "DeleteJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete a DEM journey returns "Not Found" response
     Given new "DeleteJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete a DEM journey variant returns "No Content" response
     Given new "DeleteJourneyVariant" request
     And request contains "variant_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete a DEM journey variant returns "Not Found" response
     Given new "DeleteJourneyVariant" request
     And request contains "variant_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete an ignored inferred DEM journey returns "No Content" response
     Given new "DeleteIgnoredInferredJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Delete an ignored inferred DEM journey returns "Not Found" response
     Given new "DeleteIgnoredInferredJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Get a DEM journey returns "Not Found" response
     Given new "GetJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Get a DEM journey returns "OK" response
     Given new "GetJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Get recommended tests for a DEM journey returns "Not Found" response
     Given new "GetJourneyRecommendedTests" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Get recommended tests for a DEM journey returns "OK" response
     Given new "GetJourneyRecommendedTests" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Ignore an inferred DEM journey returns "No Content" response
     Given new "IgnoreInferredJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Ignore an inferred DEM journey returns "Not Found" response
     Given new "IgnoreInferredJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search DEM journeys returns "Bad Request" response
     Given new "SearchJourneys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search DEM journeys returns "Not Found" response
     Given new "SearchJourneys" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search DEM journeys returns "OK" response
     Given new "SearchJourneys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search inferred DEM journeys returns "Bad Request" response
     Given new "SearchInferredJourneys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search inferred DEM journeys returns "Not Found" response
     Given new "SearchInferredJourneys" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Search inferred DEM journeys returns "OK" response
     Given new "SearchInferredJourneys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Update a DEM journey returns "Not Found" response
     Given new "UpdateJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
@@ -203,7 +203,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Update a DEM journey returns "OK" response
     Given new "UpdateJourney" request
     And request contains "journey_id" parameter from "REPLACE.ME"
@@ -211,7 +211,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Update a DEM journey variant returns "Bad Request" response
     Given new "UpdateJourneyVariant" request
     And request contains "variant_id" parameter from "REPLACE.ME"
@@ -219,7 +219,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Update a DEM journey variant returns "Not Found" response
     Given new "UpdateJourneyVariant" request
     And request contains "variant_id" parameter from "REPLACE.ME"
@@ -227,7 +227,7 @@ Feature: DEM
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/dem-features
+  @generated @skip @team:ddoghq/dem-features
   Scenario: Update a DEM journey variant returns "OK" response
     Given new "UpdateJourneyVariant" request
     And request contains "variant_id" parameter from "REPLACE.ME"
diff --git a/features/v2/deployment_gates.feature b/features/v2/deployment_gates.feature
index b4ccba22c50d..7037aacc3c69 100644
--- a/features/v2/deployment_gates.feature
+++ b/features/v2/deployment_gates.feature
@@ -10,7 +10,7 @@ Feature: Deployment Gates
     And a valid "appKeyAuth" key in the system
     And an instance of "DeploymentGates" API
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create deployment gate returns "Bad Request" response
     Given operation "CreateDeploymentGate" enabled
     And new "CreateDeploymentGate" request
@@ -18,7 +18,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Create deployment gate returns "Bad request." response
     Given operation "CreateDeploymentGate" enabled
     And new "CreateDeploymentGate" request
@@ -26,7 +26,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create deployment gate returns "OK" response
     Given operation "CreateDeploymentGate" enabled
     And new "CreateDeploymentGate" request
@@ -34,7 +34,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create deployment rule returns "Bad Request" response
     Given there is a valid "deployment_gate" in the system
     And operation "CreateDeploymentRule" enabled
@@ -44,7 +44,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Create deployment rule returns "Bad request." response
     Given operation "CreateDeploymentRule" enabled
     And new "CreateDeploymentRule" request
@@ -53,7 +53,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create deployment rule returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And operation "CreateDeploymentRule" enabled
@@ -63,7 +63,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create monitor deployment rule with monitor IDs returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "monitor" in the system
@@ -74,7 +74,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create monitor deployment rule with query and monitor IDs returns "Bad Request" response
     Given there is a valid "deployment_gate" in the system
     And operation "CreateDeploymentRule" enabled
@@ -84,7 +84,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Create monitor deployment rule with query returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And operation "CreateDeploymentRule" enabled
@@ -94,7 +94,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment gate returns "Bad Request" response
     Given operation "DeleteDeploymentGate" enabled
     And new "DeleteDeploymentGate" request
@@ -102,7 +102,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete deployment gate returns "Bad request." response
     Given operation "DeleteDeploymentGate" enabled
     And new "DeleteDeploymentGate" request
@@ -110,7 +110,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment gate returns "Deployment gate not found." response
     Given operation "DeleteDeploymentGate" enabled
     And new "DeleteDeploymentGate" request
@@ -118,7 +118,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment gate returns "No Content" response
     Given there is a valid "deployment_gate" in the system
     And operation "DeleteDeploymentGate" enabled
@@ -127,7 +127,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment rule returns "Bad Request" response
     Given operation "DeleteDeploymentRule" enabled
     And new "DeleteDeploymentRule" request
@@ -136,7 +136,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete deployment rule returns "Bad request." response
     Given operation "DeleteDeploymentRule" enabled
     And new "DeleteDeploymentRule" request
@@ -145,7 +145,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment rule returns "Deployment gate not found." response
     Given operation "DeleteDeploymentRule" enabled
     And new "DeleteDeploymentRule" request
@@ -154,7 +154,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Delete deployment rule returns "No Content" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "deployment_rule" in the system
@@ -165,7 +165,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a deployment gate evaluation result returns "Bad request." response
     Given operation "GetDeploymentGatesEvaluationResult" enabled
     And new "GetDeploymentGatesEvaluationResult" request
@@ -173,7 +173,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a deployment gate evaluation result returns "Deployment gate not found." response
     Given operation "GetDeploymentGatesEvaluationResult" enabled
     And new "GetDeploymentGatesEvaluationResult" request
@@ -181,7 +181,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a deployment gate evaluation result returns "OK" response
     Given operation "GetDeploymentGatesEvaluationResult" enabled
     And new "GetDeploymentGatesEvaluationResult" request
@@ -189,7 +189,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get a deployment gates evaluation result returns "Deployment gate not found." response
     Given operation "GetDeploymentGatesEvaluationResult" enabled
     And new "GetDeploymentGatesEvaluationResult" request
@@ -197,7 +197,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get a deployment gates evaluation result returns "OK" response
     Given operation "GetDeploymentGatesEvaluationResult" enabled
     And there is a valid "deployment_gate" in the system
@@ -209,21 +209,21 @@ Feature: Deployment Gates
     Then the response status is 200 OK
     And the response "data.type" is equal to "deployment_gates_evaluation_result_response"
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get all deployment gates returns "Bad request." response
     Given operation "ListDeploymentGates" enabled
     And new "ListDeploymentGates" request
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get all deployment gates returns "OK" response
     Given operation "ListDeploymentGates" enabled
     And new "ListDeploymentGates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment gate returns "Bad Request" response
     Given operation "GetDeploymentGate" enabled
     And new "GetDeploymentGate" request
@@ -231,7 +231,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get deployment gate returns "Bad request." response
     Given operation "GetDeploymentGate" enabled
     And new "GetDeploymentGate" request
@@ -239,7 +239,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment gate returns "Deployment gate not found." response
     Given operation "GetDeploymentGate" enabled
     And new "GetDeploymentGate" request
@@ -247,7 +247,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment gate returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And operation "GetDeploymentGate" enabled
@@ -256,7 +256,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment rule returns "Bad Request" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "deployment_rule" in the system
@@ -267,7 +267,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get deployment rule returns "Bad request." response
     Given operation "GetDeploymentRule" enabled
     And new "GetDeploymentRule" request
@@ -276,7 +276,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment rule returns "Deployment rule not found." response
     Given operation "GetDeploymentRule" enabled
     And new "GetDeploymentRule" request
@@ -285,7 +285,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment rule not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get deployment rule returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "deployment_rule" in the system
@@ -296,7 +296,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get rules for a deployment gate returns "Bad request." response
     Given operation "GetDeploymentGateRules" enabled
     And new "GetDeploymentGateRules" request
@@ -304,7 +304,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get rules for a deployment gate returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And operation "GetDeploymentGateRules" enabled
@@ -313,7 +313,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gate evaluation returns "Accepted" response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And new "TriggerDeploymentGatesEvaluation" request
@@ -321,7 +321,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gate evaluation returns "Bad request." response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And new "TriggerDeploymentGatesEvaluation" request
@@ -329,7 +329,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gate evaluation returns "Deployment gate not found." response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And new "TriggerDeploymentGatesEvaluation" request
@@ -337,7 +337,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gates evaluation returns "Accepted" response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And there is a valid "deployment_gate" in the system
@@ -348,7 +348,7 @@ Feature: Deployment Gates
     Then the response status is 202 Accepted
     And the response "data.type" is equal to "deployment_gates_evaluation_response"
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gates evaluation returns "Bad request." response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And new "TriggerDeploymentGatesEvaluation" request
@@ -356,7 +356,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Trigger a deployment gates evaluation returns "Deployment gate not found." response
     Given operation "TriggerDeploymentGatesEvaluation" enabled
     And new "TriggerDeploymentGatesEvaluation" request
@@ -364,7 +364,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment gate returns "Bad Request" response
     Given operation "UpdateDeploymentGate" enabled
     And new "UpdateDeploymentGate" request
@@ -373,7 +373,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update deployment gate returns "Bad request." response
     Given operation "UpdateDeploymentGate" enabled
     And new "UpdateDeploymentGate" request
@@ -382,7 +382,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment gate returns "Deployment gate not found." response
     Given operation "UpdateDeploymentGate" enabled
     And new "UpdateDeploymentGate" request
@@ -391,7 +391,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment gate not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment gate returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And operation "UpdateDeploymentGate" enabled
@@ -401,7 +401,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment rule returns "Bad Request" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "deployment_rule" in the system
@@ -413,7 +413,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update deployment rule returns "Bad request." response
     Given operation "UpdateDeploymentRule" enabled
     And new "UpdateDeploymentRule" request
@@ -423,7 +423,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 400 Bad request.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment rule returns "Deployment rule not found." response
     Given operation "UpdateDeploymentRule" enabled
     And new "UpdateDeploymentRule" request
@@ -433,7 +433,7 @@ Feature: Deployment Gates
     When the request is sent
     Then the response status is 404 Deployment rule not found.
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Update deployment rule returns "OK" response
     Given there is a valid "deployment_gate" in the system
     And there is a valid "deployment_rule" in the system
diff --git a/features/v2/domain_allowlist.feature b/features/v2/domain_allowlist.feature
index 8fe10371d5c1..8ece0669e8c1 100644
--- a/features/v2/domain_allowlist.feature
+++ b/features/v2/domain_allowlist.feature
@@ -11,7 +11,7 @@ Feature: Domain Allowlist
     And a valid "appKeyAuth" key in the system
     And an instance of "DomainAllowlist" API
 
-  @team:Datadog/team-aaa-dogmail
+  @team:ddoghq/team-aaa-dogmail
   Scenario: Get Domain Allowlist returns "OK" response
     Given new "GetDomainAllowlist" request
     When the request is sent
@@ -20,7 +20,7 @@ Feature: Domain Allowlist
     And the response "data.attributes.domains" array contains value "@static-test-domain.test"
     And the response "data.attributes.enabled" is equal to false
 
-  @team:Datadog/team-aaa-dogmail
+  @team:ddoghq/team-aaa-dogmail
   Scenario: Sets Domain Allowlist returns "OK" response
     Given new "PatchDomainAllowlist" request
     And body with value {"data": {"attributes": {"domains": ["@static-test-domain.test"], "enabled": false}, "type": "domain_allowlist"}}
diff --git a/features/v2/dora_metrics.feature b/features/v2/dora_metrics.feature
index a8249df9a715..00f801653cee 100644
--- a/features/v2/dora_metrics.feature
+++ b/features/v2/dora_metrics.feature
@@ -9,7 +9,7 @@ Feature: DORA Metrics
     Given a valid "apiKeyAuth" key in the system
     And an instance of "DORAMetrics" API
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Delete a deployment event returns "Accepted" response
     Given new "DeleteDORADeployment" request
     And a valid "appKeyAuth" key in the system
@@ -17,14 +17,14 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Delete a deployment event returns "Bad Request" response
     Given new "DeleteDORADeployment" request
     And request contains "deployment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Delete a failure event returns "Accepted" response
     Given new "DeleteDORAFailure" request
     And a valid "appKeyAuth" key in the system
@@ -32,7 +32,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Delete a failure event returns "Bad Request" response
     Given new "DeleteDORAFailure" request
     And a valid "appKeyAuth" key in the system
@@ -40,7 +40,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete an incident event returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteDORAFailure" request
@@ -48,7 +48,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete an incident event returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteDORAFailure" request
@@ -56,7 +56,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a deployment event returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "GetDORADeployment" request
@@ -64,7 +64,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a deployment event returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "GetDORADeployment" request
@@ -72,7 +72,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get a list of deployment events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORADeployments" request
@@ -80,7 +80,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of deployment events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORADeployments" request
@@ -88,7 +88,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/ci-app-backend
+  @replay-only @team:ddoghq/ci-app-backend
   Scenario: Get a list of deployment events returns deployments with date-time timestamps
     Given a valid "appKeyAuth" key in the system
     And new "ListDORADeployments" request
@@ -100,7 +100,7 @@ Feature: DORA Metrics
     And the response "data[0].attributes" has field "started_at"
     And the response "data[0].attributes" has field "finished_at"
 
-  @team:DataDog/ci-app-backend
+  @team:ddoghq/ci-app-backend
   Scenario: Get a list of failure events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORAFailures" request
@@ -108,7 +108,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of failure events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORAFailures" request
@@ -116,7 +116,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of incident events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORAFailures" request
@@ -124,7 +124,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get a list of incident events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListDORAFailures" request
@@ -132,7 +132,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get an incident event returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "GetDORAFailure" request
@@ -140,7 +140,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get an incident event returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "GetDORAFailure" request
@@ -148,7 +148,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Patch a deployment event by version returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
     And operation "PatchDORADeploymentByVersion" enabled
@@ -157,7 +157,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Patch a deployment event by version returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "PatchDORADeploymentByVersion" enabled
@@ -166,7 +166,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Patch a deployment event by version with a missing version returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "PatchDORADeploymentByVersion" enabled
@@ -175,7 +175,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Patch a deployment event returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
     And new "PatchDORADeployment" request
@@ -184,7 +184,7 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Patch a deployment event returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "PatchDORADeployment" request
@@ -193,77 +193,77 @@ Feature: DORA Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Send a deployment event returns "Bad Request" response
     Given new "CreateDORADeployment" request
     And body with value {"data": {"attributes": {}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send a deployment event returns "OK - but delayed due to incident" response
     Given new "CreateDORADeployment" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "service": "shopist", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
-  @replay-only @team:DataDog/ci-app-backend
+  @replay-only @team:ddoghq/ci-app-backend
   Scenario: Send a deployment event returns "OK" response
     Given new "CreateDORADeployment" request
     And body with value {"data": {"attributes": {"finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "service": "shopist", "started_at": 1693491974000000000, "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Send a failure event returns "Bad Request" response
     Given new "CreateDORAIncident" request
     And body with value {"data": {"attributes": {}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ci-app-backend
+  @replay-only @team:ddoghq/ci-app-backend
   Scenario: Send a failure event returns "OK" response
     Given new "CreateDORAIncident" request
     And body with value {"data": {"attributes": {"finished_at": 1707842944600000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests", "services": ["shopist"], "severity": "High", "started_at": 1707842944500000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event (legacy) returns "Bad Request" response
     Given new "CreateDORAIncident" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event (legacy) returns "OK - but delayed due to incident" response
     Given new "CreateDORAIncident" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event (legacy) returns "OK" response
     Given new "CreateDORAIncident" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event returns "Bad Request" response
     Given new "CreateDORAFailure" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event returns "OK - but delayed due to incident" response
     Given new "CreateDORAFailure" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
     When the request is sent
     Then the response status is 202 OK - but delayed due to incident
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Send an incident event returns "OK" response
     Given new "CreateDORAFailure" request
     And body with value {"data": {"attributes": {"custom_tags": ["language:java", "department:engineering"], "env": "staging", "finished_at": 1693491984000000000, "git": {"commit_sha": "66adc9350f2cc9b250b69abddab733dd55e1a588", "repository_url": "https://github.com/organization/example-repository"}, "name": "Webserver is down failing all requests.", "services": ["shopist"], "severity": "High", "started_at": 1693491974000000000, "team": "backend", "version": "v1.12.07"}}}
diff --git a/features/v2/downtimes.feature b/features/v2/downtimes.feature
index 5e6dc55f7149..3c06990c70db 100644
--- a/features/v2/downtimes.feature
+++ b/features/v2/downtimes.feature
@@ -13,14 +13,14 @@ Feature: Downtimes
     And a valid "appKeyAuth" key in the system
     And an instance of "Downtimes" API
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Cancel a downtime returns "Downtime not found" response
     Given new "CancelDowntime" request
     And request contains "downtime_id" parameter with value "00000000-0000-1234-0000-000000000000"
     When the request is sent
     Then the response status is 404 Downtime not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Cancel a downtime returns "OK" response
     Given there is a valid "downtime_v2" in the system
     And new "CancelDowntime" request
@@ -28,21 +28,21 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 204 OK
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Get a downtime returns "Bad Request" response
     Given new "GetDowntime" request
     And request contains "downtime_id" parameter with value "INVALID_UUID_LENGTH"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Get a downtime returns "Not Found" response
     Given new "GetDowntime" request
     And request contains "downtime_id" parameter with value "00000000-0000-1234-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a downtime returns "OK" response
     Given there is a valid "downtime_v2" in the system
     And new "GetDowntime" request
@@ -51,14 +51,14 @@ Feature: Downtimes
     Then the response status is 200 OK
     And the response "data.attributes.message" is equal to "test message"
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Get active downtimes for a monitor returns "Monitor Not Found error" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Monitor Not Found error
 
-  @replay-only @team:DataDog/monitor-app
+  @replay-only @team:ddoghq/monitor-app
   Scenario: Get active downtimes for a monitor returns "OK" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter with value 35534610
@@ -67,28 +67,28 @@ Feature: Downtimes
     And the response "data" has length 1
     And the response "data" has item with field "id" with value "aeefc6a8-15d8-11ee-a8ef-da7ad0900002"
 
-  @generated @skip @team:DataDog/monitor-app @with-pagination
+  @generated @skip @team:ddoghq/monitor-app @with-pagination
   Scenario: Get active downtimes for a monitor returns "OK" response with pagination
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all downtimes for a monitor returns "Monitor Not Found error" response
     Given new "ListMonitorDowntimes" request
     And request contains "monitor_id" parameter with value 0
     When the request is sent
     Then the response status is 404 Monitor Not Found error
 
-  @replay-only @team:DataDog/monitor-app
+  @replay-only @team:ddoghq/monitor-app
   Scenario: Get all downtimes returns "OK" response
     Given new "ListDowntimes" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data" has item with field "id" with value "1dcb33f8-b23a-11ed-ae77-da7ad0900002"
 
-  @replay-only @skip-validation @team:DataDog/monitor-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/monitor-app @with-pagination
   Scenario: Get all downtimes returns "OK" response with pagination
     Given new "ListDowntimes" request
     And request contains "page[limit]" parameter with value 2
@@ -96,14 +96,14 @@ Feature: Downtimes
     Then the response status is 200 OK
     And the response has 3 items
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Schedule a downtime returns "Bad Request" response
     Given new "CreateDowntime" request
     And body with value { "data": { "attributes": { "monitor_identifier": { "monitor_tags": ["cat:hat"] }, "scope": "BAD_SCOPE_MISSING_KEY_VALUE_FORMAT", "schedule": {"start": null } }, "type": "downtime" } }
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Schedule a downtime returns "OK" response
     Given new "CreateDowntime" request
     And body with value { "data": { "attributes": { "message": "dark forest", "monitor_identifier": { "monitor_tags": ["cat:hat"] }, "scope": "test:{{ unique_lower_alnum }}", "schedule": {"start": null } }, "type": "downtime" } }
@@ -111,7 +111,7 @@ Feature: Downtimes
     Then the response status is 200 OK
     And the response "data.attributes.message" is equal to "dark forest"
 
-  @skip-java @skip-python @skip-ruby @skip-rust @skip-typescript @skip-validation @team:DataDog/monitor-app
+  @skip-java @skip-python @skip-ruby @skip-rust @skip-typescript @skip-validation @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "Bad Request" response
     Given there is a valid "downtime_v2" in the system
     And new "UpdateDowntime" request
@@ -120,7 +120,7 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "Downtime not found" response
     Given new "UpdateDowntime" request
     And request contains "downtime_id" parameter with value "00000000-0000-1234-0000-000000000000"
@@ -128,7 +128,7 @@ Feature: Downtimes
     When the request is sent
     Then the response status is 404 Downtime not found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a downtime returns "OK" response
     Given there is a valid "downtime_v2" in the system
     And new "UpdateDowntime" request
diff --git a/features/v2/elastic_cloud_integration.feature b/features/v2/elastic_cloud_integration.feature
index 77003dbc4be0..bbe5a938b224 100644
--- a/features/v2/elastic_cloud_integration.feature
+++ b/features/v2/elastic_cloud_integration.feature
@@ -10,7 +10,7 @@ Feature: Elastic Cloud Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "ElasticCloudIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create an Elastic Cloud integration account returns "Bad Request" response
     Given operation "CreateElasticCloudIntegrationAccount" enabled
     And new "CreateElasticCloudIntegrationAccount" request
@@ -18,7 +18,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create an Elastic Cloud integration account returns "Created" response
     Given operation "CreateElasticCloudIntegrationAccount" enabled
     And new "CreateElasticCloudIntegrationAccount" request
@@ -26,7 +26,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create an Elastic Cloud integration account returns "Not Found" response
     Given operation "CreateElasticCloudIntegrationAccount" enabled
     And new "CreateElasticCloudIntegrationAccount" request
@@ -34,7 +34,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create an Elastic Cloud integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "CreateElasticCloudIntegrationAccount" enabled
     And new "CreateElasticCloudIntegrationAccount" request
@@ -42,7 +42,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete an Elastic Cloud integration account returns "Bad Request" response
     Given operation "DeleteElasticCloudIntegrationAccount" enabled
     And new "DeleteElasticCloudIntegrationAccount" request
@@ -50,7 +50,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete an Elastic Cloud integration account returns "Not Found" response
     Given operation "DeleteElasticCloudIntegrationAccount" enabled
     And new "DeleteElasticCloudIntegrationAccount" request
@@ -58,7 +58,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete an Elastic Cloud integration account returns "OK" response
     Given operation "DeleteElasticCloudIntegrationAccount" enabled
     And new "DeleteElasticCloudIntegrationAccount" request
@@ -66,7 +66,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get an Elastic Cloud integration account returns "Bad Request" response
     Given operation "GetElasticCloudIntegrationAccount" enabled
     And new "GetElasticCloudIntegrationAccount" request
@@ -74,7 +74,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get an Elastic Cloud integration account returns "Not Found" response
     Given operation "GetElasticCloudIntegrationAccount" enabled
     And new "GetElasticCloudIntegrationAccount" request
@@ -82,7 +82,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get an Elastic Cloud integration account returns "OK" response
     Given operation "GetElasticCloudIntegrationAccount" enabled
     And new "GetElasticCloudIntegrationAccount" request
@@ -90,28 +90,28 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Elastic Cloud integration accounts returns "Bad Request" response
     Given operation "ListElasticCloudIntegrationAccounts" enabled
     And new "ListElasticCloudIntegrationAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Elastic Cloud integration accounts returns "Not Found" response
     Given operation "ListElasticCloudIntegrationAccounts" enabled
     And new "ListElasticCloudIntegrationAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Elastic Cloud integration accounts returns "OK" response
     Given operation "ListElasticCloudIntegrationAccounts" enabled
     And new "ListElasticCloudIntegrationAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update an Elastic Cloud integration account returns "Bad Request" response
     Given operation "UpdateElasticCloudIntegrationAccount" enabled
     And new "UpdateElasticCloudIntegrationAccount" request
@@ -120,7 +120,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update an Elastic Cloud integration account returns "Not Found" response
     Given operation "UpdateElasticCloudIntegrationAccount" enabled
     And new "UpdateElasticCloudIntegrationAccount" request
@@ -129,7 +129,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update an Elastic Cloud integration account returns "OK" response
     Given operation "UpdateElasticCloudIntegrationAccount" enabled
     And new "UpdateElasticCloudIntegrationAccount" request
@@ -138,7 +138,7 @@ Feature: Elastic Cloud Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update an Elastic Cloud integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "UpdateElasticCloudIntegrationAccount" enabled
     And new "UpdateElasticCloudIntegrationAccount" request
diff --git a/features/v2/entity_integration_configs.feature b/features/v2/entity_integration_configs.feature
index 3a672f8e40c6..104361a87a50 100644
--- a/features/v2/entity_integration_configs.feature
+++ b/features/v2/entity_integration_configs.feature
@@ -10,7 +10,7 @@ Feature: Entity Integration Configs
     And a valid "appKeyAuth" key in the system
     And an instance of "EntityIntegrationConfigs" API
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update entity integration configuration returns "Bad Request" response
     Given operation "UpdateEntityIntegrationConfig" enabled
     And new "UpdateEntityIntegrationConfig" request
@@ -19,7 +19,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update entity integration configuration returns "OK" response
     Given operation "UpdateEntityIntegrationConfig" enabled
     And new "UpdateEntityIntegrationConfig" request
@@ -28,7 +28,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete an entity integration configuration returns "Bad Request" response
     Given operation "DeleteEntityIntegrationConfig" enabled
     And new "DeleteEntityIntegrationConfig" request
@@ -36,7 +36,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete an entity integration configuration returns "No Content" response
     Given operation "DeleteEntityIntegrationConfig" enabled
     And new "DeleteEntityIntegrationConfig" request
@@ -44,7 +44,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete an entity integration configuration returns "Not Found" response
     Given operation "DeleteEntityIntegrationConfig" enabled
     And new "DeleteEntityIntegrationConfig" request
@@ -52,7 +52,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get an entity integration configuration returns "Bad Request" response
     Given operation "GetEntityIntegrationConfig" enabled
     And new "GetEntityIntegrationConfig" request
@@ -60,7 +60,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get an entity integration configuration returns "Not Found" response
     Given operation "GetEntityIntegrationConfig" enabled
     And new "GetEntityIntegrationConfig" request
@@ -68,7 +68,7 @@ Feature: Entity Integration Configs
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get an entity integration configuration returns "OK" response
     Given operation "GetEntityIntegrationConfig" enabled
     And new "GetEntityIntegrationConfig" request
diff --git a/features/v2/entity_risk_scores.feature b/features/v2/entity_risk_scores.feature
index be283af2fba1..fcf8f84dbb13 100644
--- a/features/v2/entity_risk_scores.feature
+++ b/features/v2/entity_risk_scores.feature
@@ -7,7 +7,7 @@ Feature: Entity Risk Scores
     And a valid "appKeyAuth" key in the system
     And an instance of "EntityRiskScores" API
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get Entity Risk Score returns "Bad Request" response
     Given operation "GetEntityRiskScore" enabled
     And new "GetEntityRiskScore" request
@@ -15,7 +15,7 @@ Feature: Entity Risk Scores
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get Entity Risk Score returns "Not Found" response
     Given operation "GetEntityRiskScore" enabled
     And new "GetEntityRiskScore" request
@@ -23,7 +23,7 @@ Feature: Entity Risk Scores
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get Entity Risk Score returns "OK" response
     Given operation "GetEntityRiskScore" enabled
     And new "GetEntityRiskScore" request
@@ -31,14 +31,14 @@ Feature: Entity Risk Scores
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List Entity Risk Scores returns "Bad Request" response
     Given operation "ListEntityRiskScores" enabled
     And new "ListEntityRiskScores" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List Entity Risk Scores returns "OK" response
     Given operation "ListEntityRiskScores" enabled
     And new "ListEntityRiskScores" request
diff --git a/features/v2/error_tracking.feature b/features/v2/error_tracking.feature
index 253c3b24b237..1c8756fde52c 100644
--- a/features/v2/error_tracking.feature
+++ b/features/v2/error_tracking.feature
@@ -8,14 +8,14 @@ Feature: Error Tracking
     And a valid "appKeyAuth" key in the system
     And an instance of "ErrorTracking" API
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Get the details of an error tracking issue returns "Bad Request" response
     Given new "GetIssue" request
     And request contains "issue_id" parameter with value "invalid-issue-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Get the details of an error tracking issue returns "Not Found" response
     Given new "GetIssue" request
     And there is a valid "issue" in the system
@@ -23,7 +23,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Get the details of an error tracking issue returns "OK" response
     Given new "GetIssue" request
     And there is a valid "issue" in the system
@@ -32,14 +32,14 @@ Feature: Error Tracking
     Then the response status is 200 OK
     And the response "data.id" is equal to "{{ issue.id }}"
 
-  @generated @skip @team:DataDog/error-tracking
+  @generated @skip @team:ddoghq/error-tracking
   Scenario: Remove the assignee of an issue returns "Bad Request" response
     Given new "DeleteIssueAssignee" request
     And request contains "issue_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Remove the assignee of an issue returns "No Content" response
     Given new "DeleteIssueAssignee" request
     And there is a valid "issue" in the system
@@ -47,28 +47,28 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Remove the assignee of an issue returns "Not Found" response
     Given new "DeleteIssueAssignee" request
     And request contains "issue_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Search error tracking issues returns "Bad Request" response
     Given new "SearchIssues" request
     And body with value {"data": {"attributes": {"query": "service:orders-* AND @language:go", "from": 1671612804000, "to": 1671620004000, "track": "invalid-track"}, "type": "search_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Search error tracking issues returns "OK" response
     Given new "SearchIssues" request
     And body with value {"data": {"attributes": {"query": "service:orders-* AND @language:go", "from": 1671612804000, "to": 1671620004000, "track": "trace"}, "type": "search_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the assignee of an issue returns "Bad Request" response
     Given new "UpdateIssueAssignee" request
     And there is a valid "issue" in the system
@@ -77,7 +77,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the assignee of an issue returns "Not Found" response
     Given new "UpdateIssueAssignee" request
     And request contains "issue_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -85,7 +85,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the assignee of an issue returns "OK" response
     Given new "UpdateIssueAssignee" request
     And there is a valid "issue" in the system
@@ -94,7 +94,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the state of an issue returns "Bad Request" response
     Given new "UpdateIssueState" request
     And there is a valid "issue" in the system
@@ -103,7 +103,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the state of an issue returns "Not Found" response
     Given new "UpdateIssueState" request
     And request contains "issue_id" parameter with value "67d80aa3-36ff-44b9-a694-c501a7591737"
@@ -111,7 +111,7 @@ Feature: Error Tracking
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/error-tracking
+  @team:ddoghq/error-tracking
   Scenario: Update the state of an issue returns "OK" response
     Given new "UpdateIssueState" request
     And there is a valid "issue" in the system
diff --git a/features/v2/events.feature b/features/v2/events.feature
index 5beda13d5e3f..71cb204d1fb1 100644
--- a/features/v2/events.feature
+++ b/features/v2/events.feature
@@ -17,19 +17,19 @@ Feature: Events
     And a valid "appKeyAuth" key in the system
     And an instance of "Events" API
 
-  @generated @skip @team:DataDog/event-management
+  @generated @skip @team:ddoghq/event-management
   Scenario: Get a list of events returns "Bad Request" response
     Given new "ListEvents" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/event-management
+  @skip-validation @team:ddoghq/event-management
   Scenario: Get a list of events returns "OK" response
     Given new "ListEvents" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/event-management @with-pagination
+  @replay-only @skip-validation @team:ddoghq/event-management @with-pagination
   Scenario: Get a list of events returns "OK" response with pagination
     Given new "ListEvents" request
     And request contains "filter[from]" parameter with value "now-15m"
@@ -39,7 +39,7 @@ Feature: Events
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/event-management
+  @team:ddoghq/event-management
   Scenario: Get a quick list of events returns "OK" response
     Given new "ListEvents" request
     And request contains "filter[query]" parameter with value "datadog-agent"
@@ -50,35 +50,35 @@ Feature: Events
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/event-management
+  @generated @skip @team:ddoghq/event-management
   Scenario: Get an event returns "Bad Request" response
     Given new "GetEvent" request
     And request contains "event_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/event-management
+  @skip @team:ddoghq/event-management
   Scenario: Get an event returns "Not Found" response
     Given new "GetEvent" request
     And request contains "event_id" parameter with value "AAAAAAAAAAAAAAAAAAAAAAAA"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/event-management
+  @skip @team:ddoghq/event-management
   Scenario: Get an event returns "OK" response
     Given new "GetEvent" request
     And request contains "event_id" parameter with value "AZeF-nTCAABzkAgGXzYPtgAA"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/event-management
+  @team:ddoghq/event-management
   Scenario: Post an event returns "Bad request" response
     Given new "CreateEvent" request
     And body with value {"data": {"attributes": {"aggregation_key": "aggregation_key_123", "attributes": {"author": {"name": "example@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "invalid", "integration_id": "custom-events", "host": "test-host", "message": "payment_processed feature flag has been enabled", "tags": ["env:api_client_test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
     When the request is sent
     Then the response status is 400 Bad request
 
-  @skip-validation @team:DataDog/event-management
+  @skip-validation @team:ddoghq/event-management
   Scenario: Post an event returns "OK" response
     Given new "CreateEvent" request
     And body with value {"data": {"attributes": {"aggregation_key": "aggregation_key_123", "attributes": {"author": {"name": "example@datadog.com", "type": "user"}, "change_metadata": {"dd": {"team": "datadog_team", "user_email": "datadog@datadog.com", "user_id": "datadog_user_id", "user_name": "datadog_username"}, "resource_link": "datadog.com/feature/fallback_payments_test"}, "changed_resource": {"name": "fallback_payments_test", "type": "feature_flag"}, "impacted_resources": [{"name": "payments_api", "type": "service"}], "new_value": {"enabled": true, "percentage": "50%", "rule": {"datacenter": "devcycle.us1.prod"}}, "prev_value": {"enabled": true, "percentage": "10%", "rule": {"datacenter": "devcycle.us1.prod"}}}, "category": "change", "integration_id": "custom-events", "host": "test-host", "message": "payment_processed feature flag has been enabled", "tags": ["env:api_client_test"], "title": "payment_processed feature flag updated"}, "type": "event"}}
@@ -87,14 +87,14 @@ Feature: Events
     And the response "data.type" is equal to "event"
     And the response "data.attributes.attributes.evt" has field "uid"
 
-  @team:DataDog/event-management
+  @team:ddoghq/event-management
   Scenario: Search events returns "Bad Request" response
     Given new "SearchEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "service:web* AND @http.status_code:[200 TO 299]", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/event-management
+  @team:ddoghq/event-management
   Scenario: Search events returns "OK" response
     Given new "SearchEvents" request
     And body with value {"filter": {"query": "datadog-agent", "from": "2020-09-17T11:48:36+01:00", "to": "2020-09-17T12:48:36+01:00"}, "sort": "timestamp", "page": {"limit": 5}}
@@ -102,7 +102,7 @@ Feature: Events
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @replay-only @skip-validation @team:DataDog/event-management @with-pagination
+  @replay-only @skip-validation @team:ddoghq/event-management @with-pagination
   Scenario: Search events returns "OK" response with pagination
     Given new "SearchEvents" request
     And body with value {"filter": {"from": "now-15m", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"limit": 2}, "sort": "timestamp"}
diff --git a/features/v2/execution_policy.feature b/features/v2/execution_policy.feature
index 3c356ac20367..9b78c97c4047 100644
--- a/features/v2/execution_policy.feature
+++ b/features/v2/execution_policy.feature
@@ -11,7 +11,7 @@ Feature: Execution Policy
     And a valid "appKeyAuth" key in the system
     And an instance of "ExecutionPolicy" API
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Create an execution policy returns "Bad Request" response
     Given operation "CreateExecutionPolicy" enabled
     And new "CreateExecutionPolicy" request
@@ -19,7 +19,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Create an execution policy returns "Created" response
     Given operation "CreateExecutionPolicy" enabled
     And new "CreateExecutionPolicy" request
@@ -27,7 +27,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Create an execution policy with scope and targets returns "Created" response
     Given operation "CreateExecutionPolicy" enabled
     And new "CreateExecutionPolicy" request
@@ -35,7 +35,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Delete an execution policy returns "No Content" response
     Given there is a valid "execution_policy" in the system
     And operation "DeleteExecutionPolicy" enabled
@@ -44,7 +44,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Delete an execution policy returns "Not Found" response
     Given operation "DeleteExecutionPolicy" enabled
     And new "DeleteExecutionPolicy" request
@@ -52,7 +52,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Get an execution policy returns "Not Found" response
     Given operation "GetExecutionPolicy" enabled
     And new "GetExecutionPolicy" request
@@ -60,7 +60,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Get an execution policy returns "OK" response
     Given there is a valid "execution_policy" in the system
     And operation "GetExecutionPolicy" enabled
@@ -69,7 +69,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: List execution policies returns "Bad Request" response
     Given operation "ListExecutionPolicies" enabled
     And new "ListExecutionPolicies" request
@@ -77,7 +77,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: List execution policies returns "OK" response
     Given there is a valid "execution_policy" in the system
     And operation "ListExecutionPolicies" enabled
@@ -85,7 +85,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: List execution policies with query parameters returns "OK" response
     Given there is a valid "execution_policy" in the system
     And operation "ListExecutionPolicies" enabled
@@ -101,7 +101,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Update an execution policy returns "Bad Request" response
     Given there is a valid "execution_policy" in the system
     And operation "UpdateExecutionPolicy" enabled
@@ -111,7 +111,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Update an execution policy returns "Not Found" response
     Given operation "UpdateExecutionPolicy" enabled
     And new "UpdateExecutionPolicy" request
@@ -120,7 +120,7 @@ Feature: Execution Policy
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/action-platform
+  @team:ddoghq/action-platform
   Scenario: Update an execution policy returns "OK" response
     Given there is a valid "execution_policy" in the system
     And operation "UpdateExecutionPolicy" enabled
diff --git a/features/v2/experiments.feature b/features/v2/experiments.feature
index c940ea75b12c..a69a935467fd 100644
--- a/features/v2/experiments.feature
+++ b/features/v2/experiments.feature
@@ -8,28 +8,28 @@ Feature: Experiments
     And a valid "appKeyAuth" key in the system
     And an instance of "Experiments" API
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Archive exposure SQL model returns "Malformed exposure SQL model ID (not a valid UUID)." response
     Given new "ArchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed exposure SQL model ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Archive exposure SQL model returns "No exposure SQL model with this ID exists for the organization." response
     Given new "ArchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No exposure SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Archive exposure SQL model returns "The exposure SQL model was archived. Archiving an already-archived model succeeds and leaves the original archive time in place." response
     Given new "ArchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 The exposure SQL model was archived. Archiving an already-archived model succeeds and leaves the original archive time in place.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Cancel experiment returns "Malformed experiment ID, malformed request body, or a missing/blank reason." response
     Given new "CancelExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -37,7 +37,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed experiment ID, malformed request body, or a missing/blank reason.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Cancel experiment returns "No experiment with this ID exists for the organization." response
     Given new "CancelExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -45,7 +45,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Cancel experiment returns "The experiment cannot be canceled in its current state." response
     Given new "CancelExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -53,7 +53,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The experiment cannot be canceled in its current state.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Cancel experiment returns "The experiment was canceled and unlinked from its feature flag allocations." response
     Given new "CancelExperiment" request
     And there is a valid "experiment" in the system
@@ -62,7 +62,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 The experiment was canceled and unlinked from its feature flag allocations.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Conclude experiment returns "Malformed experiment ID, malformed request body, or a missing decision_variant_key." response
     Given new "ConcludeExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -70,7 +70,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed experiment ID, malformed request body, or a missing decision_variant_key.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Conclude experiment returns "No experiment with this ID exists for the organization." response
     Given new "ConcludeExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -78,7 +78,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Conclude experiment returns "The experiment is not running or ready for a decision, its linked feature flag environment requires an approval for the rollout this would perform, or that flag has a pending suggestion for its allocations." response
     Given new "ConcludeExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -86,7 +86,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The experiment is not running or ready for a decision, its linked feature flag environment requires an approval for the rollout this would perform, or that flag has a pending suggestion for its allocations.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Conclude experiment returns "The experiment was concluded and the winning variant was rolled out to its linked feature flag allocation." response
     Given new "ConcludeExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -94,7 +94,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 The experiment was concluded and the winning variant was rolled out to its linked feature flag allocation.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group from collection returns "Bad Request" response
     Given new "CreateExperimentMetricGroupFromCollection" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -102,7 +102,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group from collection returns "Conflict" response
     Given new "CreateExperimentMetricGroupFromCollection" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -110,7 +110,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create experiment metric group from collection returns "Created" response
     Given new "CreateExperimentMetricGroupFromCollection" request
     And there is a valid "experiment_metric" in the system
@@ -122,7 +122,7 @@ Feature: Experiments
     Then the response status is 201 Created
     And the response "data.attributes.metrics" has length 1
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group from collection returns "Not Found" response
     Given new "CreateExperimentMetricGroupFromCollection" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -130,7 +130,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group returns "Bad Request" response
     Given new "CreateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group returns "Conflict" response
     Given new "CreateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -146,7 +146,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create experiment metric group returns "Created" response
     Given new "CreateExperimentMetricGroup" request
     And there is a valid "experiment_metric" in the system
@@ -157,7 +157,7 @@ Feature: Experiments
     Then the response status is 201 Created
     And the response "data.attributes.metrics" has length 1
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group returns "Not Found" response
     Given new "CreateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -165,7 +165,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment metric group returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "CreateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -173,7 +173,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create experiment returns "Created" response
     Given new "CreateExperiment" request
     And body with value {"data": {"type": "experiments", "attributes": {"name": "ex-{{ unique_hash }}"}}}
@@ -181,126 +181,126 @@ Feature: Experiments
     Then the response status is 201 Created
     And the response "data.attributes.experiment_type" is equal to "STANDARD"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment returns "Invalid request body: missing required field, malformed variants or decision_metrics, or an unresolvable analysis configuration." response
     Given new "CreateExperiment" request
     And body with value {"data": {"attributes": {"assignments_end_date": "2026-08-15T00:00:00Z", "assignments_start_date": "2026-08-01T00:00:00Z", "datadog_flag_configuration": {"entry_point": null, "environment_id": "550e8400-e29b-41d4-a716-446655440005", "feature_flag_id": "550e8400-e29b-41d4-a716-446655440004", "targeting_rules": []}, "decision_metrics": [{"is_primary": true, "metric_id": "b1a2c3d4-0000-0000-0000-000000000000"}], "events_end_date": "2026-08-22T00:00:00Z", "events_start_date": "2026-08-01T00:00:00Z", "name": "Checkout button test", "structured_metadata": [{"enum_values": ["beta"], "field_key": "launch_stage"}, {"field_key": "notes", "freetext_value": "Checkout redesign"}], "subject_type_id": "c2b3d4e5-0000-0000-0000-000000000000", "traffic_exposure": {"fraction": 1, "mode": "STATIC"}, "variants": [{"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440010", "is_active": true, "is_control": true, "key": "control", "weight": 50}, {"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440011", "is_active": true, "is_control": false, "key": "treatment", "weight": 50}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 400 Invalid request body: missing required field, malformed variants or decision_metrics, or an unresolvable analysis configuration.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "CreateExperiment" request
     And body with value {"data": {"attributes": {"assignments_end_date": "2026-08-15T00:00:00Z", "assignments_start_date": "2026-08-01T00:00:00Z", "datadog_flag_configuration": {"entry_point": null, "environment_id": "550e8400-e29b-41d4-a716-446655440005", "feature_flag_id": "550e8400-e29b-41d4-a716-446655440004", "targeting_rules": []}, "decision_metrics": [{"is_primary": true, "metric_id": "b1a2c3d4-0000-0000-0000-000000000000"}], "events_end_date": "2026-08-22T00:00:00Z", "events_start_date": "2026-08-01T00:00:00Z", "name": "Checkout button test", "structured_metadata": [{"enum_values": ["beta"], "field_key": "launch_stage"}, {"field_key": "notes", "freetext_value": "Checkout redesign"}], "subject_type_id": "c2b3d4e5-0000-0000-0000-000000000000", "traffic_exposure": {"fraction": 1, "mode": "STATIC"}, "variants": [{"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440010", "is_active": true, "is_control": true, "key": "control", "weight": 50}, {"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440011", "is_active": true, "is_control": false, "key": "treatment", "weight": 50}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment returns "The requested configuration is incompatible with the experiment (code: unsupported_configuration)." response
     Given new "CreateExperiment" request
     And body with value {"data": {"attributes": {"assignments_end_date": "2026-08-15T00:00:00Z", "assignments_start_date": "2026-08-01T00:00:00Z", "datadog_flag_configuration": {"entry_point": null, "environment_id": "550e8400-e29b-41d4-a716-446655440005", "feature_flag_id": "550e8400-e29b-41d4-a716-446655440004", "targeting_rules": []}, "decision_metrics": [{"is_primary": true, "metric_id": "b1a2c3d4-0000-0000-0000-000000000000"}], "events_end_date": "2026-08-22T00:00:00Z", "events_start_date": "2026-08-01T00:00:00Z", "name": "Checkout button test", "structured_metadata": [{"enum_values": ["beta"], "field_key": "launch_stage"}, {"field_key": "notes", "freetext_value": "Checkout redesign"}], "subject_type_id": "c2b3d4e5-0000-0000-0000-000000000000", "traffic_exposure": {"fraction": 1, "mode": "STATIC"}, "variants": [{"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440010", "is_active": true, "is_control": true, "key": "control", "weight": 50}, {"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440011", "is_active": true, "is_control": false, "key": "treatment", "weight": 50}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 409 The requested configuration is incompatible with the experiment (code: unsupported_configuration).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment returns "The supplied protocol is a draft or archived protocol and cannot be applied to a new experiment." response
     Given new "CreateExperiment" request
     And body with value {"data": {"attributes": {"assignments_end_date": "2026-08-15T00:00:00Z", "assignments_start_date": "2026-08-01T00:00:00Z", "datadog_flag_configuration": {"entry_point": null, "environment_id": "550e8400-e29b-41d4-a716-446655440005", "feature_flag_id": "550e8400-e29b-41d4-a716-446655440004", "targeting_rules": []}, "decision_metrics": [{"is_primary": true, "metric_id": "b1a2c3d4-0000-0000-0000-000000000000"}], "events_end_date": "2026-08-22T00:00:00Z", "events_start_date": "2026-08-01T00:00:00Z", "name": "Checkout button test", "structured_metadata": [{"enum_values": ["beta"], "field_key": "launch_stage"}, {"field_key": "notes", "freetext_value": "Checkout redesign"}], "subject_type_id": "c2b3d4e5-0000-0000-0000-000000000000", "traffic_exposure": {"fraction": 1, "mode": "STATIC"}, "variants": [{"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440010", "is_active": true, "is_control": true, "key": "control", "weight": 50}, {"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440011", "is_active": true, "is_control": false, "key": "treatment", "weight": 50}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 422 The supplied protocol is a draft or archived protocol and cannot be applied to a new experiment.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create experiment returns "The supplied protocol_id does not identify a protocol in this organization." response
     Given new "CreateExperiment" request
     And body with value {"data": {"attributes": {"assignments_end_date": "2026-08-15T00:00:00Z", "assignments_start_date": "2026-08-01T00:00:00Z", "datadog_flag_configuration": {"entry_point": null, "environment_id": "550e8400-e29b-41d4-a716-446655440005", "feature_flag_id": "550e8400-e29b-41d4-a716-446655440004", "targeting_rules": []}, "decision_metrics": [{"is_primary": true, "metric_id": "b1a2c3d4-0000-0000-0000-000000000000"}], "events_end_date": "2026-08-22T00:00:00Z", "events_start_date": "2026-08-01T00:00:00Z", "name": "Checkout button test", "structured_metadata": [{"enum_values": ["beta"], "field_key": "launch_stage"}, {"field_key": "notes", "freetext_value": "Checkout redesign"}], "subject_type_id": "c2b3d4e5-0000-0000-0000-000000000000", "traffic_exposure": {"fraction": 1, "mode": "STATIC"}, "variants": [{"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440010", "is_active": true, "is_control": true, "key": "control", "weight": 50}, {"feature_flag_variant_id": "550e8400-e29b-41d4-a716-446655440011", "is_active": true, "is_control": false, "key": "treatment", "weight": 50}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 404 The supplied protocol_id does not identify a protocol in this organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create exposure SQL model returns "Created" response
     Given new "CreateExposureSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "experiment_column": "experiment_id", "name": "Exposure events", "properties": [{"column_name": "country", "column_type": "STRING", "description": null, "name": "country"}], "sql": "SELECT user_id, experiment_id, variant, exposed_at, country FROM analytics.exposures", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "exposed_at", "variant_column": "variant"}, "type": "exposure-sql-models"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create exposure SQL model returns "Malformed body, validation failure, or the SQL was rejected by the warehouse validator." response
     Given new "CreateExposureSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "experiment_column": "experiment_id", "name": "Exposure events", "properties": [{"column_name": "country", "column_type": "STRING", "description": null, "name": "country"}], "sql": "SELECT user_id, experiment_id, variant, exposed_at, country FROM analytics.exposures", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "exposed_at", "variant_column": "variant"}, "type": "exposure-sql-models"}}
     When the request is sent
     Then the response status is 400 Malformed body, validation failure, or the SQL was rejected by the warehouse validator.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create exposure SQL model returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "CreateExposureSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "experiment_column": "experiment_id", "name": "Exposure events", "properties": [{"column_name": "country", "column_type": "STRING", "description": null, "name": "country"}], "sql": "SELECT user_id, experiment_id, variant, exposed_at, country FROM analytics.exposures", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "exposed_at", "variant_column": "variant"}, "type": "exposure-sql-models"}}
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create exposure SQL model returns "The write collided with an existing record for the organization." response
     Given new "CreateExposureSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "experiment_column": "experiment_id", "name": "Exposure events", "properties": [{"column_name": "country", "column_type": "STRING", "description": null, "name": "country"}], "sql": "SELECT user_id, experiment_id, variant, exposed_at, country FROM analytics.exposures", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "exposed_at", "variant_column": "variant"}, "type": "exposure-sql-models"}}
     When the request is sent
     Then the response status is 409 The write collided with an existing record for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric SQL model returns "Another metric SQL model in this organization already uses one of these values." response
     Given new "CreateMetricSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "description": null, "measures": [{"column_name": "revenue", "column_type": "FLOAT", "description": null, "name": null}], "name": "Order facts", "properties": [{"column_name": "item_type", "column_type": "STRING", "description": null, "name": "item_type"}], "sql": "SELECT user_id, order_id, item_type, revenue, created_at FROM analytics.orders", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "created_at"}, "type": "metric-sql-models"}}
     When the request is sent
     Then the response status is 409 Another metric SQL model in this organization already uses one of these values.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric SQL model returns "Created" response
     Given new "CreateMetricSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "description": null, "measures": [{"column_name": "revenue", "column_type": "FLOAT", "description": null, "name": null}], "name": "Order facts", "properties": [{"column_name": "item_type", "column_type": "STRING", "description": null, "name": "item_type"}], "sql": "SELECT user_id, order_id, item_type, revenue, created_at FROM analytics.orders", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "created_at"}, "type": "metric-sql-models"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric SQL model returns "Malformed body, validation failure, the SQL was rejected by the warehouse validator, or the organization has no warehouse connection." response
     Given new "CreateMetricSQLModel" request
     And body with value {"data": {"attributes": {"date_partition_column": null, "description": null, "measures": [{"column_name": "revenue", "column_type": "FLOAT", "description": null, "name": null}], "name": "Order facts", "properties": [{"column_name": "item_type", "column_type": "STRING", "description": null, "name": "item_type"}], "sql": "SELECT user_id, order_id, item_type, revenue, created_at FROM analytics.orders", "subject_types": [{"column_name": "user_id", "subject_type_id": "550e8400-e29b-41d4-a716-446655440010"}], "timestamp_column": "created_at"}, "type": "metric-sql-models"}}
     When the request is sent
     Then the response status is 400 Malformed body, validation failure, the SQL was rejected by the warehouse validator, or the organization has no warehouse connection.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric collection returns "Bad Request" response
     Given new "CreateMetricCollection" request
     And body with value {"data": {"attributes": {"name": "Activation"}, "type": "metric-collections"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric collection returns "Conflict" response
     Given new "CreateMetricCollection" request
     And body with value {"data": {"attributes": {"name": "Activation"}, "type": "metric-collections"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create metric collection returns "Created" response
     Given new "CreateMetricCollection" request
     And body with value {"data": {"type": "metric-collections", "attributes": {"name": "ex-{{ unique_hash }}"}}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric collection returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "CreateMetricCollection" request
     And body with value {"data": {"attributes": {"name": "Activation"}, "type": "metric-collections"}}
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric returns "Another metric in this organization already uses one of these values." response
     Given new "CreateMetric" request
     And body with value {"data": {"attributes": {"data_source_type": "CUSTOMER_WAREHOUSE", "description": null, "desired_change": "METRIC_INCREASES", "format_as_percent": true, "guardrail_cutoff_threshold": null, "name": "Checkout conversion", "numerator_aggregation": {"operation": "sum", "property_filters": [[{"operation": "IS", "property_id": "550e8400-e29b-41d4-a716-446655440023", "values": ["US"]}]], "timeframe_start_value": 0, "warehouse_metric_measure": {"id": "550e8400-e29b-41d4-a716-446655440021"}}}, "type": "metrics"}}
     When the request is sent
     Then the response status is 409 Another metric in this organization already uses one of these values.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create metric returns "Created" response
     Given new "CreateMetric" request
     And body with value {"data": {"type": "metrics", "attributes": {"name": "ex-{{ unique_hash }}", "data_source_type": "DATADOG", "desired_change": "METRIC_INCREASES", "numerator_aggregation": {"operation": "sum", "datadog_metric_measure": {"name": "ex-{{ unique_hash }} view duration", "source_type": "PRODUCT_ANALYTICS", "source_subtype": "RUM_VIEWS", "column_type": "double", "column_name": "@view.time_spent"}}}}}
@@ -308,35 +308,35 @@ Feature: Experiments
     Then the response status is 201 Created
     And the response "data.attributes.metric_type" is equal to "SIMPLE"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric returns "Malformed body, validation failure, or an aggregation that does not match metric_type." response
     Given new "CreateMetric" request
     And body with value {"data": {"attributes": {"data_source_type": "CUSTOMER_WAREHOUSE", "description": null, "desired_change": "METRIC_INCREASES", "format_as_percent": true, "guardrail_cutoff_threshold": null, "name": "Checkout conversion", "numerator_aggregation": {"operation": "sum", "property_filters": [[{"operation": "IS", "property_id": "550e8400-e29b-41d4-a716-446655440023", "values": ["US"]}]], "timeframe_start_value": 0, "warehouse_metric_measure": {"id": "550e8400-e29b-41d4-a716-446655440021"}}}, "type": "metrics"}}
     When the request is sent
     Then the response status is 400 Malformed body, validation failure, or an aggregation that does not match metric_type.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create metric returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "CreateMetric" request
     And body with value {"data": {"attributes": {"data_source_type": "CUSTOMER_WAREHOUSE", "description": null, "desired_change": "METRIC_INCREASES", "format_as_percent": true, "guardrail_cutoff_threshold": null, "name": "Checkout conversion", "numerator_aggregation": {"operation": "sum", "property_filters": [[{"operation": "IS", "property_id": "550e8400-e29b-41d4-a716-446655440023", "values": ["US"]}]], "timeframe_start_value": 0, "warehouse_metric_measure": {"id": "550e8400-e29b-41d4-a716-446655440021"}}}, "type": "metrics"}}
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Create subject type returns "Created" response
     Given new "CreateSubjectType" request
     And body with value {"data": {"type": "subject-types", "attributes": {"name": "ex-{{ unique_hash }}", "product_analytics_attribute": "@account.id", "warehouse_column_names": ["account_id"]}}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Create subject type returns "Malformed body, or validation failure on name, product_analytics_attribute, or warehouse_column_names." response
     Given new "CreateSubjectType" request
     And body with value {"data": {"attributes": {"name": "User", "product_analytics_attribute": "@usr.id", "warehouse_column_names": ["user_id", "customer_id"]}, "type": "subject-types"}}
     When the request is sent
     Then the response status is 400 Malformed body, or validation failure on name, product_analytics_attribute, or warehouse_column_names.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment metric group returns "Bad Request" response
     Given new "DeleteExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -344,7 +344,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment metric group returns "Conflict" response
     Given new "DeleteExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -352,7 +352,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Delete experiment metric group returns "No Content" response
     Given new "DeleteExperimentMetricGroup" request
     And there is a valid "experiment_metric" in the system
@@ -363,7 +363,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment metric group returns "Not Found" response
     Given new "DeleteExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -371,14 +371,14 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment returns "Malformed experiment ID (not a valid UUID)." response
     Given new "DeleteExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID).
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Delete experiment returns "No Content" response
     Given new "DeleteExperiment" request
     And there is a valid "experiment" in the system
@@ -386,35 +386,35 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment returns "No experiment with this ID exists for the organization." response
     Given new "DeleteExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment returns "The experiment has a published allocation on an archived flag, must be retained for selective holdout analysis, or its linked allocations changed during authorization. Nothing was deleted." response
     Given new "DeleteExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 The experiment has a published allocation on an archived flag, must be retained for selective holdout analysis, or its linked allocations changed during authorization. Nothing was deleted.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete experiment returns "The experiment was deleted." response
     Given new "DeleteExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 The experiment was deleted.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete metric collection returns "Bad Request" response
     Given new "DeleteMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Delete metric collection returns "No Content" response
     Given new "DeleteMetricCollection" request
     And there is a valid "experiment_metric_collection" in the system
@@ -422,35 +422,35 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete metric collection returns "Not Found" response
     Given new "DeleteMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete metric returns "Malformed metric ID (not a valid UUID)." response
     Given new "DeleteMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed metric ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete metric returns "No metric with this ID exists for the organization." response
     Given new "DeleteMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No metric with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete metric returns "The metric is imported, certified, managed by metric sync, or still referenced by one or more experiments and cannot be deleted." response
     Given new "DeleteMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 The metric is imported, certified, managed by metric sync, or still referenced by one or more experiments and cannot be deleted.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Delete metric returns "The metric was deleted." response
     Given new "DeleteMetric" request
     And there is a valid "experiment_metric" in the system
@@ -458,21 +458,21 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 The metric was deleted.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete subject type returns "Either this subject type is the organization's default, or experiments, exposure SQL models, metric SQL models or protocols still reference it. When something references it, meta.blockers names them (capped per kind, with truncated set when more exist)." response
     Given new "DeleteSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Either this subject type is the organization's default, or experiments, exposure SQL models, metric SQL models or protocols still reference it. When something references it, meta.blockers names them (capped per kind, with truncated set when more exist).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete subject type returns "Malformed subject type ID (not a valid UUID)." response
     Given new "DeleteSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed subject type ID (not a valid UUID).
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Delete subject type returns "No Content" response
     Given new "DeleteSubjectType" request
     And there is a valid "experiment_subject_type" in the system
@@ -480,35 +480,35 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete subject type returns "No subject type with this ID exists for the organization." response
     Given new "DeleteSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No subject type with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Delete subject type returns "The subject type was deleted." response
     Given new "DeleteSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 The subject type was deleted.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment analysis plan returns "Malformed experiment ID." response
     Given new "GetExperimentAnalysisPlan" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment analysis plan returns "Not Found" response
     Given new "GetExperimentAnalysisPlan" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get experiment analysis plan returns "OK" response
     Given new "GetExperimentAnalysisPlan" request
     And there is a valid "experiment" in the system
@@ -518,21 +518,21 @@ Feature: Experiments
     And the response "data.id" has the same value as "experiment.data.id"
     And the response "data.type" is equal to "analysis-plans"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment diagnostics returns "Malformed experiment ID (not a valid UUID)." response
     Given new "GetExperimentDiagnostics" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment diagnostics returns "No experiment with this ID exists for the organization. Lifecycle statuses in a successful response explain whether analysis has started, is running, or completed without diagnostics." response
     Given new "GetExperimentDiagnostics" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization. Lifecycle statuses in a successful response explain whether analysis has started, is running, or completed without diagnostics.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get experiment diagnostics returns "OK" response
     Given new "GetExperimentDiagnostics" request
     And there is a valid "experiment" in the system
@@ -542,70 +542,70 @@ Feature: Experiments
     And the response "data.attributes.state" is equal to "NOT_STARTED"
     And the response "data.attributes.diagnostics" has length 0
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment protocol returns "Bad Request" response
     Given new "GetExperimentProtocol" request
     And request contains "protocol_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment protocol returns "Not Found" response
     Given new "GetExperimentProtocol" request
     And request contains "protocol_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment protocol returns "OK" response
     Given new "GetExperimentProtocol" request
     And request contains "protocol_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment results returns "Malformed experiment ID (not a valid UUID), or the experiment is not configured for analysis." response
     Given new "GetExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID), or the experiment is not configured for analysis.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment results returns "No experiment with this ID exists, or results are not available for it yet." response
     Given new "GetExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists, or results are not available for it yet.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment results returns "OK" response
     Given new "GetExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment results returns "The experiment's metrics are incompatible with analysis." response
     Given new "GetExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 The experiment's metrics are incompatible with analysis.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment returns "Malformed experiment ID (not a valid UUID)." response
     Given new "GetExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment returns "No experiment with this ID exists for the organization." response
     Given new "GetExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get experiment returns "OK" response
     Given new "GetExperiment" request
     And there is a valid "experiment" in the system
@@ -614,28 +614,28 @@ Feature: Experiments
     Then the response status is 200 OK
     And the response "data.attributes.experiment_type" is equal to "STANDARD"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment returns "The stored assignment configuration cannot be represented losslessly by this API (unsupported_configuration)." response
     Given new "GetExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 The stored assignment configuration cannot be represented losslessly by this API (unsupported_configuration).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment traffic summary returns "Malformed experiment ID (not a valid UUID), or the experiment is not configured for analysis." response
     Given new "GetExperimentTrafficSummary" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID), or the experiment is not configured for analysis.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment traffic summary returns "No experiment with this ID exists for the organization." response
     Given new "GetExperimentTrafficSummary" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get experiment traffic summary returns "OK" response
     Given new "GetExperimentTrafficSummary" request
     And there is a valid "experiment" in the system
@@ -645,70 +645,70 @@ Feature: Experiments
     And the response "data.attributes.total_subjects" is equal to 0
     And the response "data.attributes.variants" has length 0
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get experiment traffic summary returns "The experiment's metrics are incompatible with analysis." response
     Given new "GetExperimentTrafficSummary" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 The experiment's metrics are incompatible with analysis.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get exposure SQL model returns "Malformed exposure SQL model ID (not a valid UUID), or unknown include value." response
     Given new "GetExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed exposure SQL model ID (not a valid UUID), or unknown include value.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get exposure SQL model returns "No exposure SQL model with this ID exists for the organization." response
     Given new "GetExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No exposure SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get exposure SQL model returns "OK" response
     Given new "GetExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric SQL model returns "Malformed metric SQL model ID (not a valid UUID), or unknown include value." response
     Given new "GetMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed metric SQL model ID (not a valid UUID), or unknown include value.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric SQL model returns "No metric SQL model with this ID exists for the organization." response
     Given new "GetMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No metric SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric SQL model returns "OK" response
     Given new "GetMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric collection returns "Bad Request" response
     Given new "GetMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric collection returns "Not Found" response
     Given new "GetMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get metric collection returns "OK" response
     Given new "GetMetricCollection" request
     And there is a valid "experiment_metric_collection" in the system
@@ -716,21 +716,21 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric returns "Malformed metric ID (not a valid UUID)." response
     Given new "GetMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed metric ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get metric returns "No metric with this ID exists for the organization." response
     Given new "GetMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No metric with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get metric returns "OK" response
     Given new "GetMetric" request
     And there is a valid "experiment_metric" in the system
@@ -740,21 +740,21 @@ Feature: Experiments
     And the response "data.id" has the same value as "experiment_metric.data.id"
     And the response "data.attributes.metric_type" is equal to "SIMPLE"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get subject type returns "Malformed subject type ID (not a valid UUID), or an unsupported include value." response
     Given new "GetSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed subject type ID (not a valid UUID), or an unsupported include value.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Get subject type returns "No subject type with this ID exists for the organization." response
     Given new "GetSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No subject type with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Get subject type returns "OK" response
     Given new "GetSubjectType" request
     And there is a valid "experiment_subject_type" in the system
@@ -762,21 +762,21 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List experiment metric groups returns "Malformed experiment ID." response
     Given new "ListExperimentMetricGroups" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List experiment metric groups returns "No experiment with this ID exists for the organization." response
     Given new "ListExperimentMetricGroups" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List experiment metric groups returns "OK" response
     Given new "ListExperimentMetricGroups" request
     And there is a valid "experiment" in the system
@@ -785,91 +785,91 @@ Feature: Experiments
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List experiment protocols returns "Bad Request" response
     Given new "ListExperimentProtocols" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List experiment protocols returns "OK" response
     Given new "ListExperimentProtocols" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List experiments returns "Invalid query parameter: bad page[offset]/page[limit], unknown sort field, invalid status, malformed protocol_id UUID, invalid result timestamp range, or a timestamp filter that is not RFC3339." response
     Given new "ListExperiments" request
     When the request is sent
     Then the response status is 400 Invalid query parameter: bad page[offset]/page[limit], unknown sort field, invalid status, malformed protocol_id UUID, invalid result timestamp range, or a timestamp filter that is not RFC3339.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List experiments returns "OK" response
     Given new "ListExperiments" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List exposure SQL models returns "Invalid query parameter: bad page[offset]/page[limit], search longer than 1024 bytes, unknown sort field, non-boolean include_archived, or unknown include value." response
     Given new "ListExposureSQLModels" request
     When the request is sent
     Then the response status is 400 Invalid query parameter: bad page[offset]/page[limit], search longer than 1024 bytes, unknown sort field, non-boolean include_archived, or unknown include value.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List exposure SQL models returns "OK" response
     Given new "ListExposureSQLModels" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List metric SQL models returns "Invalid query parameter: bad page[offset]/page[limit], unknown sort field, or unknown include value." response
     Given new "ListMetricSQLModels" request
     When the request is sent
     Then the response status is 400 Invalid query parameter: bad page[offset]/page[limit], unknown sort field, or unknown include value.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List metric SQL models returns "OK" response
     Given new "ListMetricSQLModels" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List metric collections returns "Bad Request" response
     Given new "ListMetricCollections" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List metric collections returns "OK" response
     Given new "ListMetricCollections" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List metrics returns "Invalid query parameter: bad page[offset]/page[limit], or unknown sort field." response
     Given new "ListMetrics" request
     When the request is sent
     Then the response status is 400 Invalid query parameter: bad page[offset]/page[limit], or unknown sort field.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List metrics returns "OK" response
     Given new "ListMetrics" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: List subject types returns "Invalid query parameter: bad page[offset]/page[limit], or unknown sort field." response
     Given new "ListSubjectTypes" request
     When the request is sent
     Then the response status is 400 Invalid query parameter: bad page[offset]/page[limit], or unknown sort field.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: List subject types returns "OK" response
     Given new "ListSubjectTypes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch experiment returns "Invalid request: malformed field, a read-only attribute was sent, a referenced ID doesn't exist, an allocation change is not supported after start, or the resulting analysis configuration is invalid. May return multiple errors." response
     Given new "PatchExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -877,7 +877,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Invalid request: malformed field, a read-only attribute was sent, a referenced ID doesn't exist, an allocation change is not supported after start, or the resulting analysis configuration is invalid. May return multiple errors.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch experiment returns "No experiment with this ID exists for the organization." response
     Given new "PatchExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -885,7 +885,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Patch experiment returns "OK" response
     Given new "PatchExperiment" request
     And there is a valid "experiment" in the system
@@ -895,7 +895,7 @@ Feature: Experiments
     Then the response status is 200 OK
     And the response "data.attributes.experiment_type" is equal to "STANDARD"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch experiment returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "PatchExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -903,7 +903,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch experiment returns "The requested configuration is incompatible with the experiment, or a feature flag change requires explicit reset consent and a complete target configuration (codes: unsupported_configuration, feature_flag_change_requires_reset, or feature_flag_change_requires_complete_configuration)." response
     Given new "PatchExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -911,7 +911,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The requested configuration is incompatible with the experiment, or a feature flag change requires explicit reset consent and a complete target configuration (codes: unsupported_configuration, feature_flag_change_requires_reset, or feature_flag_change_requires_complete_configuration).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch subject type returns "Malformed subject type ID, malformed body, or no updatable field supplied." response
     Given new "PatchSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
@@ -919,7 +919,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed subject type ID, malformed body, or no updatable field supplied.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Patch subject type returns "No subject type with this ID exists for the organization." response
     Given new "PatchSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
@@ -927,7 +927,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No subject type with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Patch subject type returns "OK" response
     Given new "PatchSubjectType" request
     And there is a valid "experiment_subject_type" in the system
@@ -936,68 +936,68 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results for org returns "Accepted" response
     Given new "RefreshExperimentResultsForOrg" request
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results for org returns "The full_refresh query parameter is not a valid boolean." response
     Given new "RefreshExperimentResultsForOrg" request
     When the request is sent
     Then the response status is 400 The full_refresh query parameter is not a valid boolean.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results returns "A refresh is already queued or running for this experiment." response
     Given new "RefreshExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 A refresh is already queued or running for this experiment.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results returns "Accepted" response
     Given new "RefreshExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results returns "Malformed experiment ID (not a valid UUID), or full_refresh is not a valid boolean." response
     Given new "RefreshExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed experiment ID (not a valid UUID), or full_refresh is not a valid boolean.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Refresh experiment results returns "No experiment with this ID exists for the organization." response
     Given new "RefreshExperimentResults" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Set default subject type returns "Malformed subject type ID (not a valid UUID)." response
     Given new "SetDefaultSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed subject type ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Set default subject type returns "No subject type with this ID exists for the organization." response
     Given new "SetDefaultSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No subject type with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Set default subject type returns "The subject type is now the organization's default." response
     Given new "SetDefaultSubjectType" request
     And request contains "subject_type_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 The subject type is now the organization's default.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Start experiment returns "Malformed experiment ID, a request body carrying attributes this endpoint does not accept, or an experiment managed by a specialized workflow that cannot use this start endpoint." response
     Given new "StartExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1005,7 +1005,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed experiment ID, a request body carrying attributes this endpoint does not accept, or an experiment managed by a specialized workflow that cannot use this start endpoint.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Start experiment returns "No experiment with this ID exists for the organization." response
     Given new "StartExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1013,7 +1013,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No experiment with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Start experiment returns "The experiment cannot be started from its current state, its stored setup is incomplete (missing subject type, primary metric, variants, assignment source, or run window), its linked feature flag environment requires an approval, or that flag has a pending suggestion for a property this would change (environment status, override variant, rollout, or allocations)." response
     Given new "StartExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1021,7 +1021,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The experiment cannot be started from its current state, its stored setup is incomplete (missing subject type, primary metric, variants, assignment source, or run window), its linked feature flag environment requires an approval, or that flag has a pending suggestion for a property this would change (environment status, override variant, rollout, or allocations).
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Start experiment returns "The experiment was started." response
     Given new "StartExperiment" request
     And there is a valid "environment" in the system
@@ -1034,28 +1034,28 @@ Feature: Experiments
     When the request is sent
     Then the response status is 204 The experiment was started.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Unarchive exposure SQL model returns "Malformed exposure SQL model ID (not a valid UUID)." response
     Given new "UnarchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Malformed exposure SQL model ID (not a valid UUID).
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Unarchive exposure SQL model returns "No exposure SQL model with this ID exists for the organization." response
     Given new "UnarchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 No exposure SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Unarchive exposure SQL model returns "The exposure SQL model was unarchived. Unarchiving a model that is not archived succeeds and changes nothing." response
     Given new "UnarchiveExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 The exposure SQL model was unarchived. Unarchiving a model that is not archived succeeds and changes nothing.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment analysis plan attributes returns "Bad Request" response
     Given new "UpdateExperimentAnalysisPlanAttributes" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1063,7 +1063,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment analysis plan attributes returns "Not Found" response
     Given new "UpdateExperimentAnalysisPlanAttributes" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1071,7 +1071,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Update experiment analysis plan attributes returns "OK" response
     Given new "UpdateExperimentAnalysisPlanAttributes" request
     And there is a valid "experiment" in the system
@@ -1082,7 +1082,7 @@ Feature: Experiments
     And the response "data.id" has the same value as "experiment.data.id"
     And the response "data.attributes.confidence_level" is equal to 0.9
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment analysis plan attributes returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "UpdateExperimentAnalysisPlanAttributes" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1090,7 +1090,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment analysis plan attributes returns "The requested change conflicts with settings locked by the experiment protocol." response
     Given new "UpdateExperimentAnalysisPlanAttributes" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1098,7 +1098,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The requested change conflicts with settings locked by the experiment protocol.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment metric group returns "Bad Request" response
     Given new "UpdateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1107,7 +1107,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment metric group returns "Conflict" response
     Given new "UpdateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1116,7 +1116,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment metric group returns "Not Found" response
     Given new "UpdateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1125,7 +1125,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Update experiment metric group returns "OK" response
     Given new "UpdateExperimentMetricGroup" request
     And there is a valid "experiment_metric" in the system
@@ -1138,7 +1138,7 @@ Feature: Experiments
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "ex-{{ unique_hash }} updated"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update experiment metric group returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "UpdateExperimentMetricGroup" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1147,7 +1147,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update exposure SQL model returns "Malformed exposure SQL model ID, malformed body, validation failure, or the SQL was rejected by the warehouse validator." response
     Given new "UpdateExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
@@ -1155,7 +1155,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed exposure SQL model ID, malformed body, validation failure, or the SQL was rejected by the warehouse validator.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update exposure SQL model returns "No exposure SQL model with this ID exists for the organization." response
     Given new "UpdateExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
@@ -1163,7 +1163,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No exposure SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update exposure SQL model returns "OK" response
     Given new "UpdateExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
@@ -1171,7 +1171,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update exposure SQL model returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "UpdateExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
@@ -1179,7 +1179,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update exposure SQL model returns "The write collided with an existing record for the organization." response
     Given new "UpdateExposureSQLModel" request
     And request contains "exposure_sql_model_id" parameter from "REPLACE.ME"
@@ -1187,7 +1187,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The write collided with an existing record for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric SQL model returns "Malformed ID or body, validation failure, or the SQL was rejected by the warehouse validator." response
     Given new "UpdateMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
@@ -1195,7 +1195,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed ID or body, validation failure, or the SQL was rejected by the warehouse validator.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric SQL model returns "No metric SQL model with this ID exists for the organization." response
     Given new "UpdateMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
@@ -1203,7 +1203,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No metric SQL model with this ID exists for the organization.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric SQL model returns "OK" response
     Given new "UpdateMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
@@ -1211,7 +1211,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric SQL model returns "The model is certified or managed by metric sync, or the update would remove a measure or property still used by an active metric." response
     Given new "UpdateMetricSQLModel" request
     And request contains "metric_sql_model_id" parameter from "REPLACE.ME"
@@ -1219,7 +1219,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 The model is certified or managed by metric sync, or the update would remove a measure or property still used by an active metric.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric collection returns "Bad Request" response
     Given new "UpdateMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
@@ -1227,7 +1227,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric collection returns "Conflict" response
     Given new "UpdateMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
@@ -1235,7 +1235,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric collection returns "Not Found" response
     Given new "UpdateMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
@@ -1243,7 +1243,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Update metric collection returns "OK" response
     Given new "UpdateMetricCollection" request
     And there is a valid "experiment_metric_collection" in the system
@@ -1252,7 +1252,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric collection returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "UpdateMetricCollection" request
     And request contains "metric_collection_id" parameter from "REPLACE.ME"
@@ -1260,7 +1260,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric returns "Malformed ID or body, or validation failure." response
     Given new "UpdateMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -1268,7 +1268,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 400 Malformed ID or body, or validation failure.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric returns "No metric with this ID exists for the organization." response
     Given new "UpdateMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -1276,7 +1276,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 404 No metric with this ID exists for the organization.
 
-  @team:DataDog/experimentation
+  @team:ddoghq/experimentation
   Scenario: Update metric returns "OK" response
     Given new "UpdateMetric" request
     And there is a valid "experiment_metric" in the system
@@ -1286,7 +1286,7 @@ Feature: Experiments
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "ex-{{ unique_hash }} updated"
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric returns "Request body sent with a media type other than application/json or application/vnd.api+json." response
     Given new "UpdateMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -1294,7 +1294,7 @@ Feature: Experiments
     When the request is sent
     Then the response status is 415 Request body sent with a media type other than application/json or application/vnd.api+json.
 
-  @generated @skip @team:DataDog/experimentation
+  @generated @skip @team:ddoghq/experimentation
   Scenario: Update metric returns "The metric is imported, certified, or managed by metric sync, or another metric in this organization already uses one of these values." response
     Given new "UpdateMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
diff --git a/features/v2/fastly_integration.feature b/features/v2/fastly_integration.feature
index 61dd97599e05..e14a51e85fca 100644
--- a/features/v2/fastly_integration.feature
+++ b/features/v2/fastly_integration.feature
@@ -10,14 +10,14 @@ Feature: Fastly Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "FastlyIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Fastly account returns "Bad Request" response
     Given new "CreateFastlyAccount" request
     And body with value {"data": {"attributes": {"api_key": "ABCDEFG123", "name": "test-name", "services": [{"id": "6abc7de6893AbcDe9fghIj", "tags": ["myTag", "myTag2:myValue"]}]}, "type": "fastly-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Add Fastly account returns "CREATED" response
     Given new "CreateFastlyAccount" request
     And body with value {"data": {"attributes": {"api_key": "{{ unique_alnum }}", "name": "{{ unique }}", "services": []}, "type": "fastly-accounts"}}
@@ -27,14 +27,14 @@ Feature: Fastly Integration
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.services" has length 0
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Fastly account returns "Not Found" response
     Given new "CreateFastlyAccount" request
     And body with value {"data": {"attributes": {"api_key": "ABCDEFG123", "name": "test-name", "services": [{"id": "6abc7de6893AbcDe9fghIj", "tags": ["myTag", "myTag2:myValue"]}]}, "type": "fastly-accounts"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Fastly service returns "Bad Request" response
     Given new "CreateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -42,7 +42,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Fastly service returns "CREATED" response
     Given new "CreateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -50,7 +50,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Fastly service returns "Not Found" response
     Given new "CreateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -58,28 +58,28 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly account returns "Bad Request" response
     Given new "DeleteFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly account returns "Not Found" response
     Given new "DeleteFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly account returns "OK" response
     Given new "DeleteFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly service returns "Bad Request" response
     Given new "DeleteFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -87,7 +87,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly service returns "Not Found" response
     Given new "DeleteFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -95,7 +95,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Fastly service returns "OK" response
     Given new "DeleteFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -103,21 +103,21 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Fastly account returns "Bad Request" response
     Given new "GetFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Fastly account returns "Not Found" response
     Given new "GetFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Get Fastly account returns "OK" response
     Given there is a valid "fastly_account" in the system
     And new "GetFastlyAccount" request
@@ -128,7 +128,7 @@ Feature: Fastly Integration
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.services" has length 0
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Fastly service returns "Bad Request" response
     Given new "GetFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -136,7 +136,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Fastly service returns "Not Found" response
     Given new "GetFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -144,7 +144,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Fastly service returns "OK" response
     Given new "GetFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -152,19 +152,19 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Fastly accounts returns "Bad Request" response
     Given new "ListFastlyAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Fastly accounts returns "Not Found" response
     Given new "ListFastlyAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: List Fastly accounts returns "OK" response
     Given there is a valid "fastly_account" in the system
     And new "ListFastlyAccounts" request
@@ -172,28 +172,28 @@ Feature: Fastly Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "fastly-accounts"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Fastly services returns "Bad Request" response
     Given new "ListFastlyServices" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Fastly services returns "Not Found" response
     Given new "ListFastlyServices" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Fastly services returns "OK" response
     Given new "ListFastlyServices" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Fastly account returns "Bad Request" response
     Given new "UpdateFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -201,7 +201,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Fastly account returns "Not Found" response
     Given new "UpdateFastlyAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -209,7 +209,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Update Fastly account returns "OK" response
     Given there is a valid "fastly_account" in the system
     And new "UpdateFastlyAccount" request
@@ -220,7 +220,7 @@ Feature: Fastly Integration
     And the response "data.id" is equal to "{{fastly_account.data.id }}"
     And the response "data.attributes.name" is equal to "{{fastly_account.data.attributes.name }}"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Fastly service returns "Bad Request" response
     Given new "UpdateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -229,7 +229,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Fastly service returns "Not Found" response
     Given new "UpdateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -238,7 +238,7 @@ Feature: Fastly Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Fastly service returns "OK" response
     Given new "UpdateFastlyService" request
     And request contains "account_id" parameter from "REPLACE.ME"
diff --git a/features/v2/feature_flags.feature b/features/v2/feature_flags.feature
index 41c52e8cd02e..f2b719ea753f 100644
--- a/features/v2/feature_flags.feature
+++ b/features/v2/feature_flags.feature
@@ -7,7 +7,7 @@ Feature: Feature Flags
     And a valid "appKeyAuth" key in the system
     And an instance of "FeatureFlags" API
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Add a variant to a feature flag returns "Bad Request" response
     Given new "CreateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -15,7 +15,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Add a variant to a feature flag returns "Conflict - A variant with this key already exists on the flag." response
     Given new "CreateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -23,7 +23,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 409 Conflict - A variant with this key already exists on the flag.
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Add a variant to a feature flag returns "Created" response
     Given new "CreateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -31,7 +31,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Add a variant to a feature flag returns "Not Found" response
     Given new "CreateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -39,21 +39,21 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Archive a feature flag returns "Bad Request" response
     Given new "ArchiveFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Archive a feature flag returns "Not Found" response
     Given new "ArchiveFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Archive a feature flag returns "OK" response
     Given there is a valid "feature_flag" in the system
     And new "ArchiveFeatureFlag" request
@@ -61,21 +61,21 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Create a feature flag returns "Bad Request" response
     Given new "CreateFeatureFlag" request
     And body with value {"data": {"type": "feature-flags", "attributes": {"default_variant_key": "control", "description": "This is an example feature flag for demonstration", "json_schema": "{\"type\": \"object\", \"properties\": {\"enabled\": {\"type\": \"boolean\"}}}", "key": "example-feature-flag", "name": "Example Feature Flag", "value_type": "BOOLEAN", "variants": [{"key": "control", "name": "Control Variant", "value": "true"}]}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Create a feature flag returns "Conflict" response
     Given new "CreateFeatureFlag" request
     And body with value {"data": {"type": "feature-flags", "attributes": {"default_variant_key": "control", "description": "This is an example feature flag for demonstration", "json_schema": "{\"type\": \"object\", \"properties\": {\"enabled\": {\"type\": \"boolean\"}}}", "key": "example-feature-flag", "name": "Example Feature Flag", "value_type": "BOOLEAN", "variants": [{"key": "control", "name": "Control Variant", "value": "true"}]}}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip-validation @team:DataDog/feature-flags
+  @skip-validation @team:ddoghq/feature-flags
   Scenario: Create a feature flag returns "Created" response
     Given new "CreateFeatureFlag" request
     And body with value {"data": {"type": "feature-flags", "attributes": {"default_variant_key": "variant-{{ unique }}-1", "distribution_channel": "SERVER", "key": "test-feature-flag-{{ unique }}", "name": "Test Feature Flag {{ unique }}", "require_approval": false, "staleness_status": "PERMANENT", "tags": ["env:api-client-test"], "value_type": "BOOLEAN", "variants": [{"key": "variant-{{ unique }}-1", "name": "Variant {{ unique }} A", "value": "true"}, {"key": "variant-{{ unique }}-2", "name": "Variant {{ unique }} B", "value": "false"}]}}}
@@ -88,7 +88,7 @@ Feature: Feature Flags
     And the response "data.attributes.tags" is equal to ["env:api-client-test"]
     And the response "data.attributes.value_type" is equal to "BOOLEAN"
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Create allocation for a flag in an environment returns "Created" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -99,28 +99,28 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 201 Created
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Create an environment returns "Bad Request" response
     Given new "CreateFeatureFlagsEnvironment" request
     And body with value {"data": {"type": "environments", "attributes": {"description": "Staging environment for testing", "key": "staging", "name": "staging"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Create an environment returns "Conflict" response
     Given new "CreateFeatureFlagsEnvironment" request
     And body with value {"data": {"type": "environments", "attributes": {"description": "Staging environment for testing", "key": "staging", "name": "staging"}}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Create an environment returns "Created" response
     Given new "CreateFeatureFlagsEnvironment" request
     And body with value {"data": {"type": "environments", "attributes": {"name": "Test Environment {{ unique }}", "queries": ["test-{{ unique }}", "env-{{ unique }}"]}}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Create targeting rules for a flag env returns "Accepted - Approval required for this change" response
     Given new "CreateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -129,7 +129,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 202 Accepted - Approval required for this change
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Create targeting rules for a flag env returns "Bad Request" response
     Given new "CreateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Create targeting rules for a flag env returns "Conflict" response
     Given new "CreateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -147,7 +147,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Create targeting rules for a flag env returns "Created" response
     Given new "CreateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -156,7 +156,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Create targeting rules for a flag env returns "Not Found" response
     Given new "CreateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -165,7 +165,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Delete a variant returns "Bad Request" response
     Given new "DeleteVariantFromFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -173,7 +173,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Delete a variant returns "Conflict - A pending suggestion already exists for this property." response
     Given new "DeleteVariantFromFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -181,7 +181,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 409 Conflict - A pending suggestion already exists for this property.
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Delete a variant returns "No Content" response
     Given new "DeleteVariantFromFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -189,7 +189,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Delete a variant returns "Not Found" response
     Given new "DeleteVariantFromFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -197,7 +197,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Delete an environment returns "No Content" response
     Given there is a valid "environment" in the system
     And new "DeleteFeatureFlagsEnvironment" request
@@ -205,14 +205,14 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Delete an environment returns "Not Found" response
     Given new "DeleteFeatureFlagsEnvironment" request
     And request contains "environment_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Disable a feature flag in an environment returns "Accepted - Approval required for this change" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -222,7 +222,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 202 Accepted - Approval required for this change
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Disable a feature flag in an environment returns "Not Found" response
     Given new "DisableFeatureFlagEnvironment" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -230,7 +230,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Disable a feature flag in an environment returns "OK" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -240,7 +240,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Enable a feature flag in an environment returns "Accepted - Approval required for this change" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -250,7 +250,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 202 Accepted - Approval required for this change
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Enable a feature flag in an environment returns "Not Found" response
     Given new "EnableFeatureFlagEnvironment" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -258,7 +258,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Enable a feature flag in an environment returns "OK" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -268,14 +268,14 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Get a feature flag returns "Not Found" response
     Given new "GetFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Get a feature flag returns "OK" response
     Given there is a valid "feature_flag" in the system
     And new "GetFeatureFlag" request
@@ -286,14 +286,14 @@ Feature: Feature Flags
     And the response "data.attributes.name" has the same value as "feature_flag.data.attributes.name"
     And the response "data.attributes.value_type" has the same value as "feature_flag.data.attributes.value_type"
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Get an environment returns "Not Found" response
     Given new "GetFeatureFlagsEnvironment" request
     And request contains "environment_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Get an environment returns "OK" response
     Given there is a valid "environment" in the system
     And new "GetFeatureFlagsEnvironment" request
@@ -301,146 +301,146 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: List environments returns "OK" response
     Given new "ListFeatureFlagsEnvironments" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: List feature flags returns "OK" response
     Given new "ListFeatureFlags" request
     And request contains "limit" parameter with value 10
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Pause a progressive rollout returns "Bad Request" response
     Given new "PauseExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Pause a progressive rollout returns "Conflict" response
     Given new "PauseExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Pause a progressive rollout returns "Not Found" response
     Given new "PauseExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Pause a progressive rollout returns "OK" response
     Given new "PauseExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Resume a progressive rollout returns "Bad Request" response
     Given new "ResumeExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Resume a progressive rollout returns "Conflict" response
     Given new "ResumeExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Resume a progressive rollout returns "Not Found" response
     Given new "ResumeExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Resume a progressive rollout returns "OK" response
     Given new "ResumeExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Start a progressive rollout returns "Bad Request" response
     Given new "StartExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Start a progressive rollout returns "Conflict" response
     Given new "StartExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Start a progressive rollout returns "Not Found" response
     Given new "StartExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Start a progressive rollout returns "OK" response
     Given new "StartExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Stop a progressive rollout returns "Bad Request" response
     Given new "StopExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Stop a progressive rollout returns "Conflict" response
     Given new "StopExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Stop a progressive rollout returns "Not Found" response
     Given new "StopExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Stop a progressive rollout returns "OK" response
     Given new "StopExposureSchedule" request
     And request contains "exposure_schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Unarchive a feature flag returns "Bad Request" response
     Given new "UnarchiveFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Unarchive a feature flag returns "Not Found" response
     Given new "UnarchiveFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Unarchive a feature flag returns "OK" response
     Given there is a valid "feature_flag" in the system
     And new "UnarchiveFeatureFlag" request
@@ -448,7 +448,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Update a feature flag returns "Bad Request" response
     Given new "UpdateFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -456,7 +456,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Update a feature flag returns "Not Found" response
     Given new "UpdateFeatureFlag" request
     And request contains "feature_flag_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -464,7 +464,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Update a feature flag returns "OK" response
     Given there is a valid "feature_flag" in the system
     And new "UpdateFeatureFlag" request
@@ -475,7 +475,7 @@ Feature: Feature Flags
     And the response "data.attributes.name" is equal to "Updated Test Feature Flag {{ unique }}"
     And the response "data.attributes.description" is equal to "Updated description for the feature flag"
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update a variant returns "Bad Request" response
     Given new "UpdateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -484,7 +484,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update a variant returns "Conflict - A pending suggestion already exists for this property." response
     Given new "UpdateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -493,7 +493,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 409 Conflict - A pending suggestion already exists for this property.
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update a variant returns "Not Found" response
     Given new "UpdateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -502,7 +502,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update a variant returns "OK" response
     Given new "UpdateVariantForFeatureFlag" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -511,7 +511,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Update an environment returns "Bad Request" response
     Given new "UpdateFeatureFlagsEnvironment" request
     And request contains "environment_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -519,7 +519,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Update an environment returns "Not Found" response
     Given new "UpdateFeatureFlagsEnvironment" request
     And request contains "environment_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -527,7 +527,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/feature-flags
+  @skip @team:ddoghq/feature-flags
   Scenario: Update an environment returns "OK" response
     Given there is a valid "environment" in the system
     And new "UpdateFeatureFlagsEnvironment" request
@@ -536,7 +536,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/feature-flags
+  @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag in an environment returns "OK" response
     Given there is a valid "feature_flag" in the system
     And there is a valid "environment" in the system
@@ -547,7 +547,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag returns "Accepted - Approval required for this change" response
     Given new "UpdateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -556,7 +556,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 202 Accepted - Approval required for this change
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag returns "Bad Request" response
     Given new "UpdateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -565,7 +565,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag returns "Conflict" response
     Given new "UpdateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -574,7 +574,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag returns "Not Found" response
     Given new "UpdateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
@@ -583,7 +583,7 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/feature-flags
+  @generated @skip @team:ddoghq/feature-flags
   Scenario: Update targeting rules for a flag returns "OK" response
     Given new "UpdateAllocationsForFeatureFlagInEnvironment" request
     And request contains "feature_flag_id" parameter from "REPLACE.ME"
diff --git a/features/v2/fleet_automation.feature b/features/v2/fleet_automation.feature
index 06d0251beb98..7c73527c08fb 100644
--- a/features/v2/fleet_automation.feature
+++ b/features/v2/fleet_automation.feature
@@ -14,21 +14,21 @@ Feature: Fleet Automation
     And a valid "appKeyAuth" key in the system
     And an instance of "FleetAutomation" API
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Cancel a deployment returns "Bad Request" response
     Given new "CancelFleetDeploymentV2" request
     And request contains "deployment_id" parameter with value "not-a-valid-deployment-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Cancel a deployment returns "Not Found" response
     Given new "CancelFleetDeploymentV2" request
     And request contains "deployment_id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Cancel a deployment returns "OK" response
     Given there is a valid "deployment" in the system
     And new "CancelFleetDeploymentV2" request
@@ -36,28 +36,28 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Create a configuration deployment returns "Bad Request" response
     Given new "CreateFleetDeploymentConfigureV2" request
     And body with value {"data": {"attributes": {"filter_query": "env:prod AND service:{{ unique_lower }}"}, "type": "deployment"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Create a configuration deployment returns "CREATED" response
     Given new "CreateFleetDeploymentConfigureV2" request
     And body with value {"data": {"attributes": {"config_operations": [{"file_op": "merge-patch", "file_path": "/datadog.yaml", "patch": {"apm_config": {"enabled": true}, "log_level": "info", "logs_enabled": true}}], "filter_query": "env:prod AND service:{{ unique_lower }}"}, "type": "deployment"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Create a configuration deployment returns "OK" response
     Given new "CreateFleetDeploymentConfigureV2" request
     And body with value {"data": {"attributes": {"config_operations": [{"file_op": "merge-patch", "file_path": "/datadog.yaml", "patch": {"log_level": "info"}}], "dry_run": true, "filter_query": "env:prod AND service:{{ unique_lower }}"}, "type": "deployment"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Create a schedule returns "Bad Request" response
     Given operation "CreateFleetSchedule" enabled
     And new "CreateFleetSchedule" request
@@ -65,7 +65,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Create a schedule returns "CREATED" response
     Given operation "CreateFleetSchedule" enabled
     And new "CreateFleetSchedule" request
@@ -73,7 +73,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Delete a schedule returns "Bad Request" response
     Given operation "DeleteFleetSchedule" enabled
     And new "DeleteFleetSchedule" request
@@ -81,7 +81,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Delete a schedule returns "Not Found" response
     Given operation "DeleteFleetSchedule" enabled
     And new "DeleteFleetSchedule" request
@@ -89,7 +89,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Delete a schedule returns "Schedule successfully deleted." response
     Given operation "DeleteFleetSchedule" enabled
     And new "DeleteFleetSchedule" request
@@ -97,21 +97,21 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 204 Schedule successfully deleted.
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a deployment by ID returns "Bad Request" response
     Given new "GetFleetDeploymentV2" request
     And request contains "deployment_id" parameter with value "not-a-valid-deployment-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a deployment by ID returns "Not Found" response
     Given new "GetFleetDeploymentV2" request
     And request contains "deployment_id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a deployment by ID returns "OK" response
     Given there is a valid "deployment" in the system
     And new "GetFleetDeploymentV2" request
@@ -119,21 +119,21 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a schedule by ID returns "Bad Request" response
     Given new "GetFleetScheduleV2" request
     And request contains "id" parameter with value "not-a-valid-schedule-id"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a schedule by ID returns "Not Found" response
     Given new "GetFleetScheduleV2" request
     And request contains "id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get a schedule by ID returns "OK" response
     Given there is a valid "fleet_schedule" in the system
     And new "GetFleetScheduleV2" request
@@ -141,97 +141,97 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get detailed information about an agent returns "Bad Request" response
     Given new "GetFleetAgentDetailV2" request
     And request contains "agent_key" parameter with value "not-a-valid-agent-key"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Get detailed information about an agent returns "Not Found" response
     Given new "GetFleetAgentDetailV2" request
     And request contains "agent_key" parameter with value "00000000000000000000000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @integration-only @skip @team:DataDog/fleet-automation
+  @integration-only @skip @team:ddoghq/fleet-automation
   Scenario: Get detailed information about an agent returns "OK" response
     Given new "GetFleetAgentDetailV2" request
     And request contains "agent_key" parameter with value "a1b2c3d4e5f67890a1b2c3d4e5f67890"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all Datadog Agents returns "Bad Request" response
     Given new "ListFleetAgentsV2" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all Datadog Agents returns "OK" response
     Given new "ListFleetAgentsV2" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all deployments returns "Bad Request" response
     Given new "ListFleetDeploymentsV2" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all deployments returns "OK" response
     Given new "ListFleetDeploymentsV2" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all fleet tracers returns "Bad Request" response
     Given operation "ListFleetTracers" enabled
     And new "ListFleetTracers" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all fleet tracers returns "Not Found" response
     Given operation "ListFleetTracers" enabled
     And new "ListFleetTracers" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all fleet tracers returns "OK" response
     Given operation "ListFleetTracers" enabled
     And new "ListFleetTracers" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all schedules returns "Bad Request" response
     Given new "ListFleetSchedulesV2" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List all schedules returns "OK" response
     Given new "ListFleetSchedulesV2" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List available Datadog Agent versions returns "Not Found" response
     Given new "ListFleetAgentVersionsV2" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List available Datadog Agent versions returns "OK" response
     Given new "ListFleetAgentVersionsV2" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List tracers for a specific agent returns "Bad Request" response
     Given operation "ListFleetAgentTracers" enabled
     And new "ListFleetAgentTracers" request
@@ -239,7 +239,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List tracers for a specific agent returns "Not Found" response
     Given operation "ListFleetAgentTracers" enabled
     And new "ListFleetAgentTracers" request
@@ -247,7 +247,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: List tracers for a specific agent returns "OK" response
     Given operation "ListFleetAgentTracers" enabled
     And new "ListFleetAgentTracers" request
@@ -255,7 +255,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Trigger a schedule deployment returns "Bad Request" response
     Given operation "TriggerFleetSchedule" enabled
     And new "TriggerFleetSchedule" request
@@ -263,7 +263,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Trigger a schedule deployment returns "CREATED - Deployment successfully created and started." response
     Given operation "TriggerFleetSchedule" enabled
     And new "TriggerFleetSchedule" request
@@ -271,7 +271,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 201 CREATED - Deployment successfully created and started.
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Trigger a schedule deployment returns "Not Found" response
     Given operation "TriggerFleetSchedule" enabled
     And new "TriggerFleetSchedule" request
@@ -279,7 +279,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Update a schedule returns "Bad Request" response
     Given operation "UpdateFleetSchedule" enabled
     And new "UpdateFleetSchedule" request
@@ -288,7 +288,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Update a schedule returns "Not Found" response
     Given operation "UpdateFleetSchedule" enabled
     And new "UpdateFleetSchedule" request
@@ -297,7 +297,7 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/fleet-automation
+  @generated @skip @team:ddoghq/fleet-automation
   Scenario: Update a schedule returns "OK" response
     Given operation "UpdateFleetSchedule" enabled
     And new "UpdateFleetSchedule" request
@@ -306,21 +306,21 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Upgrade hosts returns "Bad Request" response
     Given new "CreateFleetDeploymentUpgradeV2" request
     And body with value {"data": {"attributes": {"filter_query": "env:prod AND service:{{ unique_lower }}"}, "type": "deployment"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Upgrade hosts returns "CREATED" response
     Given new "CreateFleetDeploymentUpgradeV2" request
     And body with value {"data": {"attributes": {"filter_query": "env:prod AND service:{{ unique_lower }}", "target_packages": [{"name": "datadog-agent", "version": "7.52.0"}]}, "type": "deployment"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @skip @team:DataDog/fleet-automation
+  @skip @team:ddoghq/fleet-automation
   Scenario: Upgrade hosts returns "Conflict" response
     Given there is a valid "package_deployment" in the system
     And new "CreateFleetDeploymentUpgradeV2" request
diff --git a/features/v2/forms.feature b/features/v2/forms.feature
index eb380d0f845a..b69424f7eece 100644
--- a/features/v2/forms.feature
+++ b/features/v2/forms.feature
@@ -9,7 +9,7 @@ Feature: Forms
     And a valid "appKeyAuth" key in the system
     And an instance of "Forms" API
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Clone a form returns "Bad Request" response
     Given operation "CloneForm" enabled
     And new "CloneForm" request
@@ -18,7 +18,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Clone a form returns "Not Found" response
     Given operation "CloneForm" enabled
     And new "CloneForm" request
@@ -27,7 +27,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Clone a form returns "OK" response
     Given operation "CloneForm" enabled
     And new "CloneForm" request
@@ -36,7 +36,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Create a form returns "Bad Request" response
     Given operation "CreateForm" enabled
     And new "CreateForm" request
@@ -44,7 +44,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create a form returns "OK" response
     Given operation "CreateForm" enabled
     And new "CreateForm" request
@@ -52,7 +52,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Create and publish a form returns "Bad Request" response
     Given operation "CreateAndPublishForm" enabled
     And new "CreateAndPublishForm" request
@@ -60,7 +60,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create and publish a form returns "OK" response
     Given operation "CreateAndPublishForm" enabled
     And new "CreateAndPublishForm" request
@@ -68,7 +68,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Create or update a form version returns "Bad Request" response
     Given operation "UpsertFormVersion" enabled
     And new "UpsertFormVersion" request
@@ -77,7 +77,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create or update a form version returns "Not Found" response
     Given operation "UpsertFormVersion" enabled
     And new "UpsertFormVersion" request
@@ -86,7 +86,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Create or update a form version returns "OK" response
     Given operation "UpsertFormVersion" enabled
     And there is a valid "form" in the system
@@ -96,7 +96,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Delete a form returns "Bad Request" response
     Given operation "DeleteForm" enabled
     And new "DeleteForm" request
@@ -104,7 +104,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Delete a form returns "OK" response
     Given operation "DeleteForm" enabled
     And there is a valid "form" in the system
@@ -115,7 +115,7 @@ Feature: Forms
     And the response "data.id" has the same value as "form.data.id"
     And the response "data.type" is equal to "forms"
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Get a form returns "Bad Request" response
     Given operation "GetForm" enabled
     And new "GetForm" request
@@ -123,7 +123,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get a form returns "Not Found" response
     Given operation "GetForm" enabled
     And new "GetForm" request
@@ -131,7 +131,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Get a form returns "OK" response
     Given operation "GetForm" enabled
     And there is a valid "form" in the system
@@ -143,14 +143,14 @@ Feature: Forms
     And the response "data.type" is equal to "forms"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: List forms returns "Bad Request" response
     Given operation "ListForms" enabled
     And new "ListForms" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: List forms returns "OK" response
     Given operation "ListForms" enabled
     And there is a valid "form" in the system
@@ -161,7 +161,7 @@ Feature: Forms
     And the response "data" has item with field "type" with value "forms"
     And the response "data" has item with field "attributes.name" with value "{{ unique }}"
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Publish a form version returns "Bad Request" response
     Given operation "PublishForm" enabled
     And new "PublishForm" request
@@ -170,7 +170,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Publish a form version returns "Not Found" response
     Given operation "PublishForm" enabled
     And new "PublishForm" request
@@ -179,7 +179,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Publish a form version returns "OK" response
     Given operation "PublishForm" enabled
     And there is a valid "form" in the system
@@ -189,7 +189,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Update a form returns "Bad Request" response
     Given operation "UpdateForm" enabled
     And new "UpdateForm" request
@@ -198,7 +198,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update a form returns "Not Found" response
     Given operation "UpdateForm" enabled
     And new "UpdateForm" request
@@ -207,7 +207,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Update a form returns "OK" response
     Given operation "UpdateForm" enabled
     And there is a valid "form" in the system
@@ -217,7 +217,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/app-builder-backend
+  @generated @skip @team:ddoghq/app-builder-backend
   Scenario: Upsert and publish a form version returns "Bad Request" response
     Given operation "UpsertAndPublishFormVersion" enabled
     And new "UpsertAndPublishFormVersion" request
@@ -226,7 +226,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Upsert and publish a form version returns "Not Found" response
     Given operation "UpsertAndPublishFormVersion" enabled
     And new "UpsertAndPublishFormVersion" request
@@ -235,7 +235,7 @@ Feature: Forms
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/app-builder-backend
+  @team:ddoghq/app-builder-backend
   Scenario: Upsert and publish a form version returns "OK" response
     Given operation "UpsertAndPublishFormVersion" enabled
     And there is a valid "form" in the system
diff --git a/features/v2/gcp_integration.feature b/features/v2/gcp_integration.feature
index 11a97ee5b3b6..a57193d2b937 100644
--- a/features/v2/gcp_integration.feature
+++ b/features/v2/gcp_integration.feature
@@ -10,20 +10,20 @@ Feature: GCP Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "GCPIntegration" API
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Create a Datadog GCP principal returns "Conflict" response
     Given new "MakeGCPSTSDelegate" request
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a Datadog GCP principal returns "OK" response
     Given new "MakeGCPSTSDelegate" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data.type" is equal to "gcp_sts_delegate"
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a Datadog GCP principal with empty body returns "OK" response
     Given new "MakeGCPSTSDelegate" request
     And body with value {}
@@ -31,21 +31,21 @@ Feature: GCP Integration
     Then the response status is 200 OK
     And the response "data.type" is equal to "gcp_sts_delegate"
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account returns "Bad Request" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"account_tags": [], "client_email": "datadog-service-account@test-project.iam.gserviceaccount.com", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_global_location_enabled": true, "is_org_folder_resource_collection_enabled": false, "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}], "region_filter_configs": ["nam4", "europe-north1"]}, "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account returns "Conflict" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"account_tags": [], "client_email": "datadog-service-account@test-project.iam.gserviceaccount.com", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_global_location_enabled": true, "is_org_folder_resource_collection_enabled": false, "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}], "region_filter_configs": ["nam4", "europe-north1"]}, "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -54,7 +54,7 @@ Feature: GCP Integration
     And the response "data.type" is equal to "gcp_service_account"
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with account_tags returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"account_tags": ["lorem", "ipsum"], "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -64,7 +64,7 @@ Feature: GCP Integration
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
     And the response "data.attributes.account_tags" is equal to ["lorem", "ipsum"]
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with cloud run revision filters enabled returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"cloud_run_revision_filters": ["meh:bleh"], "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -74,7 +74,7 @@ Feature: GCP Integration
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
     And the response "data.attributes.cloud_run_revision_filters" is equal to ["meh:bleh"]
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with cspm enabled returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"is_cspm_enabled": true, "resource_collection_enabled": true, "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -84,7 +84,7 @@ Feature: GCP Integration
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
     And the response "data.attributes.is_cspm_enabled" is equal to true
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with org folder resource collection enabled returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"is_org_folder_resource_collection_enabled": true, "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -94,14 +94,14 @@ Feature: GCP Integration
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
     And the response "data.attributes.is_org_folder_resource_collection_enabled" is equal to true
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with resource collection enabled disabled and cspm enabled returns "Bad Request" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"resource_collection_enabled": false, "is_cspm_enabled": true, "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with resource collection enabled returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"resource_collection_enabled": true, "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -111,7 +111,7 @@ Feature: GCP Integration
     And the response "data.attributes.client_email" is equal to "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com"
     And the response "data.attributes.resource_collection_enabled" is equal to true
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Create a new entry for your service account with security command center enabled returns "OK" response
     Given new "CreateGCPSTSAccount" request
     And body with value {"data": {"attributes": {"is_security_command_center_enabled": true, "is_resource_change_collection_enabled": true, "client_email": "Test-{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}}
@@ -122,27 +122,27 @@ Feature: GCP Integration
     And the response "data.attributes.is_security_command_center_enabled" is equal to true
     And the response "data.attributes.is_resource_change_collection_enabled" is equal to true
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Delete an STS enabled GCP Account returns "Bad Request" response
     Given new "DeleteGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Delete an STS enabled GCP Account returns "No Content" response
     Given new "DeleteGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: List all GCP STS-enabled service accounts returns "Not Found" response
     Given new "ListGCPSTSAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/gcp-integrations
+  @skip-terraform-config @team:ddoghq/gcp-integrations
   Scenario: List all GCP STS-enabled service accounts returns "OK" response
     Given there is a valid "gcp_sts_account" in the system
     And new "ListGCPSTSAccounts" request
@@ -150,14 +150,14 @@ Feature: GCP Integration
     Then the response status is 200 OK
     And the response "data" has item with field "type" with value "gcp_service_account"
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: List delegate account returns "OK" response
     Given new "GetGCPSTSDelegate" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data.type" is equal to "gcp_sts_delegate"
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "Bad Request" response
     Given new "UpdateGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -165,7 +165,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/gcp-integrations
+  @generated @skip @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "Not Found" response
     Given new "UpdateGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -173,7 +173,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "OK" response
     Given there is a valid "gcp_sts_account" in the system
     And new "UpdateGCPSTSAccount" request
@@ -182,7 +182,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "OK" response with cloud run revision filters
     Given there is a valid "gcp_sts_account" in the system
     And new "UpdateGCPSTSAccount" request
@@ -191,7 +191,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "OK" response with enable resource collection turned on
     Given there is a valid "gcp_sts_account" in the system
     And new "UpdateGCPSTSAccount" request
@@ -200,7 +200,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/gcp-integrations
+  @team:ddoghq/gcp-integrations
   Scenario: Update STS Service Account returns "OK" response with org folder resource collection enabled
     Given there is a valid "gcp_sts_account" in the system
     And new "UpdateGCPSTSAccount" request
diff --git a/features/v2/google_chat_integration.feature b/features/v2/google_chat_integration.feature
index 65c1f264a6b0..efb7fb310188 100644
--- a/features/v2/google_chat_integration.feature
+++ b/features/v2/google_chat_integration.feature
@@ -9,7 +9,7 @@ Feature: Google Chat Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "GoogleChatIntegration" API
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a target audience returns "Bad Request" response
     Given new "CreateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a target audience returns "CREATED" response
     Given new "CreateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a target audience returns "Conflict" response
     Given new "CreateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -33,7 +33,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create a target audience returns "Not Found" response
     Given new "CreateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -41,7 +41,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create organization handle returns "Bad Request" response
     Given new "CreateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -49,7 +49,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Create organization handle returns "CREATED" response
     Given new "CreateOrganizationHandle" request
     And request contains "organization_binding_id" parameter with value "e54cb570-c674-529c-769d-84b312288ed7"
@@ -58,7 +58,7 @@ Feature: Google Chat Integration
     Then the response status is 201 CREATED
     And the response "data.attributes.name" is equal to "{{unique}}"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create organization handle returns "Conflict" response
     Given new "CreateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -66,7 +66,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create organization handle returns "Not Found" response
     Given new "CreateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -74,21 +74,21 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete a Google Chat organization binding returns "Bad Request" response
     Given new "DeleteGoogleChatOrganization" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete a Google Chat organization binding returns "OK" response
     Given new "DeleteGoogleChatOrganization" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete a target audience returns "Not Found" response
     Given new "DeleteGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -96,7 +96,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete a target audience returns "OK" response
     Given new "DeleteGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -104,7 +104,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete organization handle returns "Bad Request" response
     Given new "DeleteOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -112,7 +112,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Delete organization handle returns "OK" response
     Given new "DeleteOrganizationHandle" request
     And there is a valid "organization_handle" in the system
@@ -121,35 +121,35 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete the delegated user returns "Not Found" response
     Given new "DeleteGoogleChatDelegatedUser" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete the delegated user returns "OK" response
     Given new "DeleteGoogleChatDelegatedUser" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a Google Chat organization binding returns "Not Found" response
     Given new "GetGoogleChatOrganization" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a Google Chat organization binding returns "OK" response
     Given new "GetGoogleChatOrganization" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a target audience returns "Not Found" response
     Given new "GetGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -157,7 +157,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get a target audience returns "OK" response
     Given new "GetGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -165,27 +165,27 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all Google Chat organization bindings returns "OK" response
     Given new "ListGoogleChatOrganizations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all organization handles returns "Bad Request" response
     Given new "ListOrganizationHandles" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all organization handles returns "Not Found" response
     Given new "ListOrganizationHandles" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Get all organization handles returns "OK" response
     Given new "ListOrganizationHandles" request
     And there is a valid "organization_handle" in the system
@@ -194,21 +194,21 @@ Feature: Google Chat Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "google-chat-organization-handle"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all target audiences returns "Not Found" response
     Given new "ListGoogleChatTargetAudiences" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all target audiences returns "OK" response
     Given new "ListGoogleChatTargetAudiences" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get organization handle returns "Bad Request" response
     Given new "GetOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -216,7 +216,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get organization handle returns "Not Found" response
     Given new "GetOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -224,7 +224,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Get organization handle returns "OK" response
     Given new "GetOrganizationHandle" request
     And there is a valid "organization_handle" in the system
@@ -236,7 +236,7 @@ Feature: Google Chat Integration
     And the response "data.attributes.space_display_name" has the same value as "organization_handle.data.attributes.space_display_name"
     And the response "data.attributes.space_resource_name" has the same value as "organization_handle.data.attributes.space_resource_name"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get space information by display name returns "Bad Request" response
     Given new "GetSpaceByDisplayName" request
     And request contains "domain_name" parameter from "REPLACE.ME"
@@ -244,7 +244,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get space information by display name returns "Not Found" response
     Given new "GetSpaceByDisplayName" request
     And request contains "domain_name" parameter from "REPLACE.ME"
@@ -252,7 +252,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Get space information by display name returns "OK" response
     Given new "GetSpaceByDisplayName" request
     And request contains "domain_name" parameter with value "datadog.ninja"
@@ -262,21 +262,21 @@ Feature: Google Chat Integration
     And the response "data.attributes.resource_name" is equal to "spaces/AAQA-zFIks8"
     And the response "data.attributes.organization_binding_id" is equal to "e54cb570-c674-529c-769d-84b312288ed7"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get the delegated user returns "Not Found" response
     Given new "GetGoogleChatDelegatedUser" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get the delegated user returns "OK" response
     Given new "GetGoogleChatDelegatedUser" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a target audience returns "Bad Request" response
     Given new "UpdateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -285,7 +285,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a target audience returns "Not Found" response
     Given new "UpdateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -294,7 +294,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update a target audience returns "OK" response
     Given new "UpdateGoogleChatTargetAudience" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -303,7 +303,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update organization handle returns "Bad Request" response
     Given new "UpdateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -312,7 +312,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update organization handle returns "Conflict" response
     Given new "UpdateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -321,7 +321,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update organization handle returns "Not Found" response
     Given new "UpdateOrganizationHandle" request
     And request contains "organization_binding_id" parameter from "REPLACE.ME"
@@ -330,7 +330,7 @@ Feature: Google Chat Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Update organization handle returns "OK" response
     Given new "UpdateOrganizationHandle" request
     And there is a valid "organization_handle" in the system
diff --git a/features/v2/governance_console.feature b/features/v2/governance_console.feature
index 7db27be44d82..364d7bd86f52 100644
--- a/features/v2/governance_console.feature
+++ b/features/v2/governance_console.feature
@@ -18,7 +18,7 @@ Feature: Governance Console
     And a valid "appKeyAuth" key in the system
     And an instance of "GovernanceConsole" API
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a control returns "Bad Request" response
     Given operation "GetGovernanceControl" enabled
     And new "GetGovernanceControl" request
@@ -26,7 +26,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a control returns "Not Found" response
     Given operation "GetGovernanceControl" enabled
     And new "GetGovernanceControl" request
@@ -34,7 +34,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a control returns "OK" response
     Given operation "GetGovernanceControl" enabled
     And new "GetGovernanceControl" request
@@ -42,7 +42,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a detection returns "Bad Request" response
     Given operation "GetGovernanceDetection" enabled
     And new "GetGovernanceDetection" request
@@ -50,7 +50,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a detection returns "Not Found" response
     Given operation "GetGovernanceDetection" enabled
     And new "GetGovernanceDetection" request
@@ -58,7 +58,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a detection returns "OK" response
     Given operation "GetGovernanceDetection" enabled
     And new "GetGovernanceDetection" request
@@ -66,7 +66,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get control notification settings returns "Bad Request" response
     Given operation "GetGovernanceControlNotificationSettings" enabled
     And new "GetGovernanceControlNotificationSettings" request
@@ -74,7 +74,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get control notification settings returns "OK" response
     Given operation "GetGovernanceControlNotificationSettings" enabled
     And new "GetGovernanceControlNotificationSettings" request
@@ -82,35 +82,35 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get notification settings returns "Bad Request" response
     Given operation "GetGovernanceNotificationSettings" enabled
     And new "GetGovernanceNotificationSettings" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get notification settings returns "OK" response
     Given operation "GetGovernanceNotificationSettings" enabled
     And new "GetGovernanceNotificationSettings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get the Governance Console configuration returns "Bad Request" response
     Given operation "GetGovernanceConfig" enabled
     And new "GetGovernanceConfig" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get the Governance Console configuration returns "OK" response
     Given operation "GetGovernanceConfig" enabled
     And new "GetGovernanceConfig" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List control detections returns "Bad Request" response
     Given operation "ListGovernanceControlDetections" enabled
     And new "ListGovernanceControlDetections" request
@@ -118,7 +118,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List control detections returns "OK" response
     Given operation "ListGovernanceControlDetections" enabled
     And new "ListGovernanceControlDetections" request
@@ -126,35 +126,35 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List controls returns "Bad Request" response
     Given operation "ListGovernanceControls" enabled
     And new "ListGovernanceControls" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List controls returns "OK" response
     Given operation "ListGovernanceControls" enabled
     And new "ListGovernanceControls" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List insights returns "Bad Request" response
     Given operation "ListGovernanceInsights" enabled
     And new "ListGovernanceInsights" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List insights returns "OK" response
     Given operation "ListGovernanceInsights" enabled
     And new "ListGovernanceInsights" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Mitigate detections returns "Accepted" response
     Given operation "MitigateGovernanceDetections" enabled
     And new "MitigateGovernanceDetections" request
@@ -162,7 +162,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Mitigate detections returns "Bad Request" response
     Given operation "MitigateGovernanceDetections" enabled
     And new "MitigateGovernanceDetections" request
@@ -170,7 +170,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a control returns "Bad Request" response
     Given operation "UpdateGovernanceControl" enabled
     And new "UpdateGovernanceControl" request
@@ -179,7 +179,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a control returns "Not Found" response
     Given operation "UpdateGovernanceControl" enabled
     And new "UpdateGovernanceControl" request
@@ -188,7 +188,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a control returns "OK" response
     Given operation "UpdateGovernanceControl" enabled
     And new "UpdateGovernanceControl" request
@@ -197,7 +197,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a detection returns "Bad Request" response
     Given operation "UpdateGovernanceDetection" enabled
     And new "UpdateGovernanceDetection" request
@@ -206,7 +206,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a detection returns "Not Found" response
     Given operation "UpdateGovernanceDetection" enabled
     And new "UpdateGovernanceDetection" request
@@ -215,7 +215,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a detection returns "OK" response
     Given operation "UpdateGovernanceDetection" enabled
     And new "UpdateGovernanceDetection" request
@@ -224,7 +224,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update control notification settings returns "Bad Request" response
     Given operation "UpdateGovernanceControlNotificationSettings" enabled
     And new "UpdateGovernanceControlNotificationSettings" request
@@ -233,7 +233,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update control notification settings returns "OK" response
     Given operation "UpdateGovernanceControlNotificationSettings" enabled
     And new "UpdateGovernanceControlNotificationSettings" request
@@ -242,7 +242,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update notification settings returns "Bad Request" response
     Given operation "UpdateGovernanceNotificationSettings" enabled
     And new "UpdateGovernanceNotificationSettings" request
@@ -250,7 +250,7 @@ Feature: Governance Console
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update notification settings returns "OK" response
     Given operation "UpdateGovernanceNotificationSettings" enabled
     And new "UpdateGovernanceNotificationSettings" request
diff --git a/features/v2/high_availability_multiregion.feature b/features/v2/high_availability_multiregion.feature
index cdca2ff52748..bade8cbe542c 100644
--- a/features/v2/high_availability_multiregion.feature
+++ b/features/v2/high_availability_multiregion.feature
@@ -10,7 +10,7 @@ Feature: High Availability MultiRegion
     And a valid "appKeyAuth" key in the system
     And an instance of "HighAvailabilityMultiRegion" API
 
-  @generated @skip @team:DataDog/hamr
+  @generated @skip @team:ddoghq/hamr
   Scenario: Create or update HAMR organization connection returns "Bad Request" response
     Given operation "CreateHamrOrgConnection" enabled
     And new "CreateHamrOrgConnection" request
@@ -18,7 +18,7 @@ Feature: High Availability MultiRegion
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/hamr
+  @generated @skip @team:ddoghq/hamr
   Scenario: Create or update HAMR organization connection returns "OK" response
     Given operation "CreateHamrOrgConnection" enabled
     And new "CreateHamrOrgConnection" request
@@ -26,21 +26,21 @@ Feature: High Availability MultiRegion
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/hamr
+  @generated @skip @team:ddoghq/hamr
   Scenario: Get HAMR organization connection returns "Bad Request" response
     Given operation "GetHamrOrgConnection" enabled
     And new "GetHamrOrgConnection" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/hamr
+  @generated @skip @team:ddoghq/hamr
   Scenario: Get HAMR organization connection returns "Not Found" response
     Given operation "GetHamrOrgConnection" enabled
     And new "GetHamrOrgConnection" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/hamr
+  @generated @skip @team:ddoghq/hamr
   Scenario: Get HAMR organization connection returns "OK" response
     Given operation "GetHamrOrgConnection" enabled
     And new "GetHamrOrgConnection" request
diff --git a/features/v2/identity_providers.feature b/features/v2/identity_providers.feature
index 6fcc67f91fe6..011cf01a6d47 100644
--- a/features/v2/identity_providers.feature
+++ b/features/v2/identity_providers.feature
@@ -7,41 +7,41 @@ Feature: Identity Providers
     And a valid "appKeyAuth" key in the system
     And an instance of "IdentityProviders" API
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List identity providers returns "OK" response
     Given new "ListIdentityProviders" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List users with an identity provider override returns "Bad Request" response
     Given new "ListIdentityProviderUsers" request
     And request contains "idp_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List users with an identity provider override returns "Not found" response
     Given new "ListIdentityProviderUsers" request
     And request contains "idp_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List users with an identity provider override returns "OK" response
     Given new "ListIdentityProviderUsers" request
     And request contains "idp_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login @with-pagination
+  @generated @skip @team:ddoghq/delegated-auth-login @with-pagination
   Scenario: List users with an identity provider override returns "OK" response with pagination
     Given new "ListIdentityProviderUsers" request
     And request contains "idp_id" parameter from "REPLACE.ME"
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an identity provider returns "Bad Request" response
     Given new "UpdateIdentityProvider" request
     And request contains "idp_id" parameter from "REPLACE.ME"
@@ -49,7 +49,7 @@ Feature: Identity Providers
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an identity provider returns "Not found" response
     Given new "UpdateIdentityProvider" request
     And request contains "idp_id" parameter from "REPLACE.ME"
@@ -57,7 +57,7 @@ Feature: Identity Providers
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an identity provider returns "OK" response
     Given new "UpdateIdentityProvider" request
     And request contains "idp_id" parameter from "REPLACE.ME"
diff --git a/features/v2/incidents.feature b/features/v2/incidents.feature
index 51b1cb54ce8d..95b84ab7a382 100644
--- a/features/v2/incidents.feature
+++ b/features/v2/incidents.feature
@@ -10,7 +10,7 @@ Feature: Incidents
     And a valid "appKeyAuth" key in the system
     And an instance of "Incidents" API
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Add commander to an incident returns "OK" response
     Given operation "UpdateIncident" enabled
     And there is a valid "user" in the system
@@ -21,7 +21,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Create an incident impact returns "Bad Request" response
     Given operation "CreateIncidentImpact" enabled
     And new "CreateIncidentImpact" request
@@ -30,7 +30,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Create an incident impact returns "CREATED" response
     Given there is a valid "incident" in the system
     And operation "CreateIncidentImpact" enabled
@@ -42,7 +42,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incident_impacts"
     And the response "data.relationships.incident.data.id" has the same value as "incident.data.id"
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Create an incident impact returns "Not Found" response
     Given operation "CreateIncidentImpact" enabled
     And new "CreateIncidentImpact" request
@@ -51,7 +51,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident integration metadata returns "Bad Request" response
     Given operation "CreateIncidentIntegration" enabled
     And new "CreateIncidentIntegration" request
@@ -60,7 +60,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create an incident integration metadata returns "CREATED" response
     Given operation "CreateIncidentIntegration" enabled
     And new "CreateIncidentIntegration" request
@@ -73,7 +73,7 @@ Feature: Incidents
     And the response "data.attributes.metadata.channels" has length 1
     And the response "data.attributes.metadata.channels[0].channel_name" is equal to "#new-channel"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident integration metadata returns "Not Found" response
     Given operation "CreateIncidentIntegration" enabled
     And new "CreateIncidentIntegration" request
@@ -82,7 +82,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident notification rule returns "Bad Request" response
     Given operation "CreateIncidentNotificationRule" enabled
     And new "CreateIncidentNotificationRule" request
@@ -90,7 +90,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident notification rule returns "Created" response
     Given operation "CreateIncidentNotificationRule" enabled
     And new "CreateIncidentNotificationRule" request
@@ -98,7 +98,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident notification rule returns "Not Found" response
     Given operation "CreateIncidentNotificationRule" enabled
     And new "CreateIncidentNotificationRule" request
@@ -106,7 +106,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident returns "Bad Request" response
     Given operation "CreateIncident" enabled
     And new "CreateIncident" request
@@ -114,7 +114,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create an incident returns "CREATED" response
     Given there is a valid "user" in the system
     And operation "CreateIncident" enabled
@@ -125,7 +125,7 @@ Feature: Incidents
     And the response "data.relationships.commander_user.data.id" has the same value as "user.data.id"
     And the response "data.attributes.title" has the same value as "unique"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident returns "Not Found" response
     Given operation "CreateIncident" enabled
     And new "CreateIncident" request
@@ -133,7 +133,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident todo returns "Bad Request" response
     Given operation "CreateIncidentTodo" enabled
     And new "CreateIncidentTodo" request
@@ -142,7 +142,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:Datadog/incident-app
+  @replay-only @team:ddoghq/incident-app
   Scenario: Create an incident todo returns "CREATED" response
     Given operation "CreateIncidentTodo" enabled
     And new "CreateIncidentTodo" request
@@ -153,7 +153,7 @@ Feature: Incidents
     Then the response status is 201 CREATED
     And the response "data.attributes.assignees" has length 1
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident todo returns "Not Found" response
     Given operation "CreateIncidentTodo" enabled
     And new "CreateIncidentTodo" request
@@ -162,7 +162,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident type returns "Bad Request" response
     Given operation "CreateIncidentType" enabled
     And new "CreateIncidentType" request
@@ -170,7 +170,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @skip-validation @team:Datadog/incident-app
+  @skip-terraform-config @skip-validation @team:ddoghq/incident-app
   Scenario: Create an incident type returns "CREATED" response
     Given operation "CreateIncidentType" enabled
     And new "CreateIncidentType" request
@@ -178,7 +178,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident type returns "Not Found" response
     Given operation "CreateIncidentType" enabled
     And new "CreateIncidentType" request
@@ -186,7 +186,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident user-defined field returns "Bad Request" response
     Given operation "CreateIncidentUserDefinedField" enabled
     And new "CreateIncidentUserDefinedField" request
@@ -194,7 +194,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident user-defined field returns "CREATED" response
     Given operation "CreateIncidentUserDefinedField" enabled
     And new "CreateIncidentUserDefinedField" request
@@ -202,7 +202,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident user-defined field returns "Not Found" response
     Given operation "CreateIncidentUserDefinedField" enabled
     And new "CreateIncidentUserDefinedField" request
@@ -210,7 +210,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident user-defined role returns "Bad Request" response
     Given operation "CreateIncidentUserDefinedRole" enabled
     And new "CreateIncidentUserDefinedRole" request
@@ -218,7 +218,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create an incident user-defined role returns "Created" response
     Given operation "CreateIncidentUserDefinedRole" enabled
     And new "CreateIncidentUserDefinedRole" request
@@ -226,7 +226,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create global incident handle returns "Bad Request" response
     Given operation "CreateGlobalIncidentHandle" enabled
     And new "CreateGlobalIncidentHandle" request
@@ -234,7 +234,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create global incident handle returns "Created" response
     Given operation "CreateGlobalIncidentHandle" enabled
     And new "CreateGlobalIncidentHandle" request
@@ -242,7 +242,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Create incident attachment returns "Bad Request" response
     Given operation "CreateIncidentAttachment" enabled
     And new "CreateIncidentAttachment" request
@@ -251,7 +251,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create incident attachment returns "Created" response
     Given operation "CreateIncidentAttachment" enabled
     And there is a valid "incident" in the system
@@ -263,7 +263,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incident_attachments"
     And the response "data.attributes.attachment.title" has the same value as "unique"
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create incident notification rule returns "Bad Request" response
     Given operation "CreateIncidentNotificationRule" enabled
     And new "CreateIncidentNotificationRule" request
@@ -271,7 +271,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Create incident notification rule returns "Created" response
     Given there is a valid "incident_type" in the system
     And operation "CreateIncidentNotificationRule" enabled
@@ -283,7 +283,7 @@ Feature: Incidents
     And the response "data.attributes.visibility" is equal to "organization"
     And the response "data.attributes.enabled" is equal to true
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create incident notification template returns "Bad Request" response
     Given operation "CreateIncidentNotificationTemplate" enabled
     And new "CreateIncidentNotificationTemplate" request
@@ -291,7 +291,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Create incident notification template returns "Created" response
     Given there is a valid "incident_type" in the system
     And operation "CreateIncidentNotificationTemplate" enabled
@@ -304,7 +304,7 @@ Feature: Incidents
     And the response "data.attributes.category" is equal to "alert"
     And the response "data.relationships.incident_type.data.id" has the same value as "incident_type.data.id"
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create incident notification template returns "Not Found" response
     Given operation "CreateIncidentNotificationTemplate" enabled
     And new "CreateIncidentNotificationTemplate" request
@@ -312,7 +312,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create postmortem attachment returns "Bad Request" response
     Given operation "CreateIncidentPostmortemAttachment" enabled
     And new "CreateIncidentPostmortemAttachment" request
@@ -321,7 +321,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create postmortem attachment returns "Created" response
     Given operation "CreateIncidentPostmortemAttachment" enabled
     And new "CreateIncidentPostmortemAttachment" request
@@ -330,7 +330,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create postmortem template returns "Bad Request" response
     Given operation "CreateIncidentPostmortemTemplate" enabled
     And new "CreateIncidentPostmortemTemplate" request
@@ -338,7 +338,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create postmortem template returns "Created" response
     Given operation "CreateIncidentPostmortemTemplate" enabled
     And new "CreateIncidentPostmortemTemplate" request
@@ -346,7 +346,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete a notification template returns "Bad Request" response
     Given operation "DeleteIncidentNotificationTemplate" enabled
     And new "DeleteIncidentNotificationTemplate" request
@@ -354,7 +354,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete a notification template returns "No Content" response
     Given operation "DeleteIncidentNotificationTemplate" enabled
     And new "DeleteIncidentNotificationTemplate" request
@@ -362,7 +362,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete a notification template returns "Not Found" response
     Given operation "DeleteIncidentNotificationTemplate" enabled
     And new "DeleteIncidentNotificationTemplate" request
@@ -370,7 +370,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an existing incident returns "Bad Request" response
     Given operation "DeleteIncident" enabled
     And new "DeleteIncident" request
@@ -378,7 +378,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an existing incident returns "Not Found" response
     Given operation "DeleteIncident" enabled
     And new "DeleteIncident" request
@@ -386,7 +386,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete an existing incident returns "OK" response
     Given operation "DeleteIncident" enabled
     And there is a valid "incident" in the system
@@ -395,7 +395,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 OK
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Delete an incident impact returns "No Content" response
     Given there is a valid "incident" in the system
     And the "incident" has an "incident_impact"
@@ -406,7 +406,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Delete an incident impact returns "Not Found" response
     Given operation "DeleteIncidentImpact" enabled
     And new "DeleteIncidentImpact" request
@@ -415,7 +415,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident integration metadata returns "Bad Request" response
     Given operation "DeleteIncidentIntegration" enabled
     And new "DeleteIncidentIntegration" request
@@ -424,7 +424,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident integration metadata returns "Not Found" response
     Given operation "DeleteIncidentIntegration" enabled
     And new "DeleteIncidentIntegration" request
@@ -433,7 +433,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete an incident integration metadata returns "OK" response
     Given operation "DeleteIncidentIntegration" enabled
     And new "DeleteIncidentIntegration" request
@@ -444,7 +444,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident notification rule returns "Bad Request" response
     Given operation "DeleteIncidentNotificationRule" enabled
     And new "DeleteIncidentNotificationRule" request
@@ -452,7 +452,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident notification rule returns "No Content" response
     Given operation "DeleteIncidentNotificationRule" enabled
     And new "DeleteIncidentNotificationRule" request
@@ -460,7 +460,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident notification rule returns "Not Found" response
     Given operation "DeleteIncidentNotificationRule" enabled
     And new "DeleteIncidentNotificationRule" request
@@ -468,7 +468,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident todo returns "Bad Request" response
     Given operation "DeleteIncidentTodo" enabled
     And new "DeleteIncidentTodo" request
@@ -477,7 +477,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident todo returns "Not Found" response
     Given operation "DeleteIncidentTodo" enabled
     And new "DeleteIncidentTodo" request
@@ -486,7 +486,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:Datadog/incident-app
+  @replay-only @team:ddoghq/incident-app
   Scenario: Delete an incident todo returns "OK" response
     Given operation "DeleteIncidentTodo" enabled
     And new "DeleteIncidentTodo" request
@@ -497,7 +497,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident type returns "Bad Request" response
     Given operation "DeleteIncidentType" enabled
     And new "DeleteIncidentType" request
@@ -505,7 +505,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident type returns "Not Found" response
     Given operation "DeleteIncidentType" enabled
     And new "DeleteIncidentType" request
@@ -513,7 +513,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @skip-validation @team:Datadog/incident-app
+  @skip-terraform-config @skip-validation @team:ddoghq/incident-app
   Scenario: Delete an incident type returns "OK" response
     Given operation "DeleteIncidentType" enabled
     And new "DeleteIncidentType" request
@@ -522,7 +522,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined field returns "Bad Request" response
     Given operation "DeleteIncidentUserDefinedField" enabled
     And new "DeleteIncidentUserDefinedField" request
@@ -530,7 +530,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined field returns "No Content" response
     Given operation "DeleteIncidentUserDefinedField" enabled
     And new "DeleteIncidentUserDefinedField" request
@@ -538,7 +538,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined field returns "Not Found" response
     Given operation "DeleteIncidentUserDefinedField" enabled
     And new "DeleteIncidentUserDefinedField" request
@@ -546,7 +546,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined role returns "Bad Request" response
     Given operation "DeleteIncidentUserDefinedRole" enabled
     And new "DeleteIncidentUserDefinedRole" request
@@ -554,7 +554,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined role returns "No Content" response
     Given operation "DeleteIncidentUserDefinedRole" enabled
     And new "DeleteIncidentUserDefinedRole" request
@@ -562,7 +562,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete an incident user-defined role returns "Not Found" response
     Given operation "DeleteIncidentUserDefinedRole" enabled
     And new "DeleteIncidentUserDefinedRole" request
@@ -570,21 +570,21 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete global incident handle returns "Bad Request" response
     Given operation "DeleteGlobalIncidentHandle" enabled
     And new "DeleteGlobalIncidentHandle" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete global incident handle returns "No Content" response
     Given operation "DeleteGlobalIncidentHandle" enabled
     And new "DeleteGlobalIncidentHandle" request
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Delete incident attachment returns "Bad Request" response
     Given operation "DeleteIncidentAttachment" enabled
     And new "DeleteIncidentAttachment" request
@@ -593,7 +593,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Delete incident attachment returns "No Content" response
     Given operation "DeleteIncidentAttachment" enabled
     And there is a valid "incident" in the system
@@ -604,7 +604,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete incident attachment returns "Not Found" response
     Given operation "DeleteIncidentAttachment" enabled
     And new "DeleteIncidentAttachment" request
@@ -613,7 +613,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Delete incident notification rule returns "No Content" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_rule" in the system
@@ -623,7 +623,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete incident notification rule returns "Not Found" response
     Given operation "DeleteIncidentNotificationRule" enabled
     And new "DeleteIncidentNotificationRule" request
@@ -631,7 +631,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Delete incident notification template returns "No Content" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_template" in the system
@@ -641,7 +641,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete postmortem template returns "Bad Request" response
     Given operation "DeleteIncidentPostmortemTemplate" enabled
     And new "DeleteIncidentPostmortemTemplate" request
@@ -649,7 +649,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete postmortem template returns "No Content" response
     Given operation "DeleteIncidentPostmortemTemplate" enabled
     And new "DeleteIncidentPostmortemTemplate" request
@@ -657,7 +657,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete postmortem template returns "Not Found" response
     Given operation "DeleteIncidentPostmortemTemplate" enabled
     And new "DeleteIncidentPostmortemTemplate" request
@@ -665,7 +665,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of an incident's integration metadata returns "Bad Request" response
     Given operation "ListIncidentIntegrations" enabled
     And new "ListIncidentIntegrations" request
@@ -673,7 +673,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of an incident's integration metadata returns "Not Found" response
     Given operation "ListIncidentIntegrations" enabled
     And new "ListIncidentIntegrations" request
@@ -681,7 +681,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get a list of an incident's integration metadata returns "OK" response
     Given operation "ListIncidentIntegrations" enabled
     And new "ListIncidentIntegrations" request
@@ -692,7 +692,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data[0].attributes.metadata.channels[0].channel_name" is equal to "#example-channel-name"
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of an incident's todos returns "Bad Request" response
     Given operation "ListIncidentTodos" enabled
     And new "ListIncidentTodos" request
@@ -700,7 +700,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of an incident's todos returns "Not Found" response
     Given operation "ListIncidentTodos" enabled
     And new "ListIncidentTodos" request
@@ -708,7 +708,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:Datadog/incident-app
+  @replay-only @team:ddoghq/incident-app
   Scenario: Get a list of an incident's todos returns "OK" response
     Given operation "ListIncidentTodos" enabled
     And new "ListIncidentTodos" request
@@ -721,49 +721,49 @@ Feature: Incidents
     And the response "data[0].attributes.assignees" has length 2
     And the response "data[0].attributes.content" is equal to "Follow up with customer about the impact they saw."
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incident types returns "Bad Request" response
     Given operation "ListIncidentTypes" enabled
     And new "ListIncidentTypes" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incident types returns "OK" response
     Given operation "ListIncidentTypes" enabled
     And new "ListIncidentTypes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incident user-defined fields returns "Bad Request" response
     Given operation "ListIncidentUserDefinedFields" enabled
     And new "ListIncidentUserDefinedFields" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incident user-defined fields returns "OK" response
     Given operation "ListIncidentUserDefinedFields" enabled
     And new "ListIncidentUserDefinedFields" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incidents returns "Bad Request" response
     Given operation "ListIncidents" enabled
     And new "ListIncidents" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get a list of incidents returns "Not Found" response
     Given operation "ListIncidents" enabled
     And new "ListIncidents" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get a list of incidents returns "OK" response
     Given operation "ListIncidents" enabled
     And there is a valid "incident" in the system
@@ -772,7 +772,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "incidents"
 
-  @replay-only @skip-validation @team:DataDog/incident-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/incident-app @with-pagination
   Scenario: Get a list of incidents returns "OK" response with pagination
     Given operation "ListIncidents" enabled
     And new "ListIncidents" request
@@ -781,7 +781,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident notification rule returns "Bad Request" response
     Given operation "GetIncidentNotificationRule" enabled
     And new "GetIncidentNotificationRule" request
@@ -789,7 +789,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident notification rule returns "Not Found" response
     Given operation "GetIncidentNotificationRule" enabled
     And new "GetIncidentNotificationRule" request
@@ -797,7 +797,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident notification rule returns "OK" response
     Given operation "GetIncidentNotificationRule" enabled
     And new "GetIncidentNotificationRule" request
@@ -805,7 +805,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident user-defined field returns "Not Found" response
     Given operation "GetIncidentUserDefinedField" enabled
     And new "GetIncidentUserDefinedField" request
@@ -813,7 +813,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident user-defined field returns "OK" response
     Given operation "GetIncidentUserDefinedField" enabled
     And new "GetIncidentUserDefinedField" request
@@ -821,7 +821,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident user-defined role returns "Bad Request" response
     Given operation "GetIncidentUserDefinedRole" enabled
     And new "GetIncidentUserDefinedRole" request
@@ -829,7 +829,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident user-defined role returns "Not Found" response
     Given operation "GetIncidentUserDefinedRole" enabled
     And new "GetIncidentUserDefinedRole" request
@@ -837,7 +837,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get an incident user-defined role returns "OK" response
     Given operation "GetIncidentUserDefinedRole" enabled
     And new "GetIncidentUserDefinedRole" request
@@ -845,21 +845,21 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get global incident settings returns "Bad Request" response
     Given operation "GetGlobalIncidentSettings" enabled
     And new "GetGlobalIncidentSettings" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get global incident settings returns "OK" response
     Given operation "GetGlobalIncidentSettings" enabled
     And new "GetGlobalIncidentSettings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident integration metadata details returns "Bad Request" response
     Given operation "GetIncidentIntegration" enabled
     And new "GetIncidentIntegration" request
@@ -868,7 +868,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident integration metadata details returns "Not Found" response
     Given operation "GetIncidentIntegration" enabled
     And new "GetIncidentIntegration" request
@@ -877,7 +877,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get incident integration metadata details returns "OK" response
     Given operation "GetIncidentIntegration" enabled
     And new "GetIncidentIntegration" request
@@ -888,7 +888,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get incident notification rule returns "Not Found" response
     Given operation "GetIncidentNotificationRule" enabled
     And new "GetIncidentNotificationRule" request
@@ -896,7 +896,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Get incident notification rule returns "OK" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_rule" in the system
@@ -908,7 +908,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incident_notification_rules"
     And the response "data.id" has the same value as "notification_rule.data.id"
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident notification template returns "Bad Request" response
     Given operation "GetIncidentNotificationTemplate" enabled
     And new "GetIncidentNotificationTemplate" request
@@ -916,7 +916,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident notification template returns "Not Found" response
     Given operation "GetIncidentNotificationTemplate" enabled
     And new "GetIncidentNotificationTemplate" request
@@ -924,7 +924,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Get incident notification template returns "OK" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_template" in the system
@@ -938,7 +938,7 @@ Feature: Incidents
     And the response "data" has field "attributes"
     And the response "data" has field "relationships"
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident todo details returns "Bad Request" response
     Given operation "GetIncidentTodo" enabled
     And new "GetIncidentTodo" request
@@ -947,7 +947,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident todo details returns "Not Found" response
     Given operation "GetIncidentTodo" enabled
     And new "GetIncidentTodo" request
@@ -956,7 +956,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:Datadog/incident-app
+  @replay-only @team:ddoghq/incident-app
   Scenario: Get incident todo details returns "OK" response
     Given operation "GetIncidentTodo" enabled
     And new "GetIncidentTodo" request
@@ -969,7 +969,7 @@ Feature: Incidents
     And the response "data.attributes.assignees" has length 2
     And the response "data.attributes.content" is equal to "Follow up with customer about the impact they saw."
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident type details returns "Bad Request" response
     Given operation "GetIncidentType" enabled
     And new "GetIncidentType" request
@@ -977,7 +977,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident type details returns "Not Found" response
     Given operation "GetIncidentType" enabled
     And new "GetIncidentType" request
@@ -985,7 +985,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get incident type details returns "OK" response
     Given operation "GetIncidentType" enabled
     And new "GetIncidentType" request
@@ -993,7 +993,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get postmortem template returns "Bad Request" response
     Given operation "GetIncidentPostmortemTemplate" enabled
     And new "GetIncidentPostmortemTemplate" request
@@ -1001,7 +1001,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get postmortem template returns "Not Found" response
     Given operation "GetIncidentPostmortemTemplate" enabled
     And new "GetIncidentPostmortemTemplate" request
@@ -1009,7 +1009,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get postmortem template returns "OK" response
     Given operation "GetIncidentPostmortemTemplate" enabled
     And new "GetIncidentPostmortemTemplate" request
@@ -1017,7 +1017,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get the details of an incident returns "Bad Request" response
     Given operation "GetIncident" enabled
     And new "GetIncident" request
@@ -1025,7 +1025,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get the details of an incident returns "Not Found" response
     Given operation "GetIncident" enabled
     And new "GetIncident" request
@@ -1033,7 +1033,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get the details of an incident returns "OK" response
     Given operation "GetIncident" enabled
     And there is a valid "incident" in the system
@@ -1043,7 +1043,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data.attributes.title" has the same value as "incident.data.attributes.title"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Import an incident returns "Bad Request" response
     Given operation "ImportIncident" enabled
     And new "ImportIncident" request
@@ -1051,7 +1051,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Import an incident returns "CREATED" response
     Given operation "ImportIncident" enabled
     And new "ImportIncident" request
@@ -1061,7 +1061,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incidents"
     And the response "data.attributes.title" has the same value as "unique"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Import an incident returns "Not Found" response
     Given operation "ImportIncident" enabled
     And new "ImportIncident" request
@@ -1069,21 +1069,21 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List an incident's impacts returns "Bad Request" response
     Given new "ListIncidentImpacts" request
     And request contains "incident_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List an incident's impacts returns "Not Found" response
     Given new "ListIncidentImpacts" request
     And request contains "incident_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: List an incident's impacts returns "OK" response
     Given there is a valid "incident" in the system
     And operation "ListIncidentImpacts" enabled
@@ -1092,21 +1092,21 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List global incident handles returns "Bad Request" response
     Given operation "ListGlobalIncidentHandles" enabled
     And new "ListGlobalIncidentHandles" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List global incident handles returns "OK" response
     Given operation "ListGlobalIncidentHandles" enabled
     And new "ListGlobalIncidentHandles" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: List incident attachments returns "Bad Request" response
     Given operation "ListIncidentAttachments" enabled
     And new "ListIncidentAttachments" request
@@ -1114,7 +1114,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List incident attachments returns "OK" response
     Given operation "ListIncidentAttachments" enabled
     And there is a valid "incident" in the system
@@ -1125,21 +1125,21 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident notification rules returns "Bad Request" response
     Given operation "ListIncidentNotificationRules" enabled
     And new "ListIncidentNotificationRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident notification rules returns "Not Found" response
     Given operation "ListIncidentNotificationRules" enabled
     And new "ListIncidentNotificationRules" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: List incident notification rules returns "OK" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_rule" in the system
@@ -1150,21 +1150,21 @@ Feature: Incidents
     And the response "data" has length 1
     And the response "data[0].type" is equal to "incident_notification_rules"
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident notification templates returns "Bad Request" response
     Given operation "ListIncidentNotificationTemplates" enabled
     And new "ListIncidentNotificationTemplates" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident notification templates returns "Not Found" response
     Given operation "ListIncidentNotificationTemplates" enabled
     And new "ListIncidentNotificationTemplates" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List incident notification templates returns "OK" response
     Given operation "ListIncidentNotificationTemplates" enabled
     And new "ListIncidentNotificationTemplates" request
@@ -1172,35 +1172,35 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident user-defined roles returns "Bad Request" response
     Given operation "ListIncidentUserDefinedRoles" enabled
     And new "ListIncidentUserDefinedRoles" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List incident user-defined roles returns "OK" response
     Given operation "ListIncidentUserDefinedRoles" enabled
     And new "ListIncidentUserDefinedRoles" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List postmortem templates returns "Bad Request" response
     Given operation "ListIncidentPostmortemTemplates" enabled
     And new "ListIncidentPostmortemTemplates" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List postmortem templates returns "OK" response
     Given operation "ListIncidentPostmortemTemplates" enabled
     And new "ListIncidentPostmortemTemplates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Remove commander from an incident returns "OK" response
     Given operation "UpdateIncident" enabled
     And there is a valid "incident" in the system
@@ -1211,7 +1211,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data.relationships.commander_user.data" is equal to null
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Search for incidents returns "Bad Request" response
     Given operation "SearchIncidents" enabled
     And new "SearchIncidents" request
@@ -1219,7 +1219,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Search for incidents returns "Not Found" response
     Given operation "SearchIncidents" enabled
     And new "SearchIncidents" request
@@ -1227,7 +1227,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/incident-app
+  @skip-validation @team:ddoghq/incident-app
   Scenario: Search for incidents returns "OK" response
     Given operation "SearchIncidents" enabled
     And there is a valid "incident" in the system
@@ -1238,7 +1238,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incidents_search_results"
     And the response "data.attributes.incidents[0].data.type" is equal to "incidents"
 
-  @replay-only @skip-validation @team:DataDog/incident-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/incident-app @with-pagination
   Scenario: Search for incidents returns "OK" response with pagination
     Given operation "SearchIncidents" enabled
     And new "SearchIncidents" request
@@ -1248,7 +1248,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an existing incident integration metadata returns "Bad Request" response
     Given operation "UpdateIncidentIntegration" enabled
     And new "UpdateIncidentIntegration" request
@@ -1258,7 +1258,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an existing incident integration metadata returns "Not Found" response
     Given operation "UpdateIncidentIntegration" enabled
     And new "UpdateIncidentIntegration" request
@@ -1268,7 +1268,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update an existing incident integration metadata returns "OK" response
     Given operation "UpdateIncidentIntegration" enabled
     And new "UpdateIncidentIntegration" request
@@ -1281,7 +1281,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data.attributes.metadata.channels[0].channel_name" is equal to "#updated-channel-name"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an existing incident returns "Bad Request" response
     Given operation "UpdateIncident" enabled
     And new "UpdateIncident" request
@@ -1290,7 +1290,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an existing incident returns "Not Found" response
     Given operation "UpdateIncident" enabled
     And new "UpdateIncident" request
@@ -1299,7 +1299,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update an existing incident returns "OK" response
     Given operation "UpdateIncident" enabled
     And there is a valid "incident" in the system
@@ -1310,7 +1310,7 @@ Feature: Incidents
     Then the response status is 200 OK
     And the response "data.attributes.title" is equal to "{{ incident.data.attributes.title }}-updated"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident impact returns "Bad Request" response
     Given operation "PatchIncidentImpact" enabled
     And new "PatchIncidentImpact" request
@@ -1320,7 +1320,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident impact returns "Not Found" response
     Given operation "PatchIncidentImpact" enabled
     And new "PatchIncidentImpact" request
@@ -1330,7 +1330,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident impact returns "OK" response
     Given operation "PatchIncidentImpact" enabled
     And new "PatchIncidentImpact" request
@@ -1340,7 +1340,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident notification rule returns "Bad Request" response
     Given operation "UpdateIncidentNotificationRule" enabled
     And new "UpdateIncidentNotificationRule" request
@@ -1349,7 +1349,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident notification rule returns "Not Found" response
     Given operation "UpdateIncidentNotificationRule" enabled
     And new "UpdateIncidentNotificationRule" request
@@ -1358,7 +1358,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident notification rule returns "OK" response
     Given operation "UpdateIncidentNotificationRule" enabled
     And new "UpdateIncidentNotificationRule" request
@@ -1367,7 +1367,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident todo returns "Bad Request" response
     Given operation "UpdateIncidentTodo" enabled
     And new "UpdateIncidentTodo" request
@@ -1377,7 +1377,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident todo returns "Not Found" response
     Given operation "UpdateIncidentTodo" enabled
     And new "UpdateIncidentTodo" request
@@ -1387,7 +1387,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update an incident todo returns "OK" response
     Given operation "UpdateIncidentTodo" enabled
     And new "UpdateIncidentTodo" request
@@ -1401,7 +1401,7 @@ Feature: Incidents
     And the response "data.attributes.assignees" has length 1
     And the response "data.attributes.content" is equal to "Restore lost data."
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident type returns "Bad Request" response
     Given operation "UpdateIncidentType" enabled
     And new "UpdateIncidentType" request
@@ -1410,7 +1410,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident type returns "Not Found" response
     Given operation "UpdateIncidentType" enabled
     And new "UpdateIncidentType" request
@@ -1419,7 +1419,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @skip-validation @team:Datadog/incident-app
+  @skip-terraform-config @skip-validation @team:ddoghq/incident-app
   Scenario: Update an incident type returns "OK" response
     Given operation "UpdateIncidentType" enabled
     And new "UpdateIncidentType" request
@@ -1429,7 +1429,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined field returns "Bad Request" response
     Given operation "UpdateIncidentUserDefinedField" enabled
     And new "UpdateIncidentUserDefinedField" request
@@ -1438,7 +1438,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined field returns "Not Found" response
     Given operation "UpdateIncidentUserDefinedField" enabled
     And new "UpdateIncidentUserDefinedField" request
@@ -1447,7 +1447,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined field returns "OK" response
     Given operation "UpdateIncidentUserDefinedField" enabled
     And new "UpdateIncidentUserDefinedField" request
@@ -1456,7 +1456,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined role returns "Bad Request" response
     Given operation "UpdateIncidentUserDefinedRole" enabled
     And new "UpdateIncidentUserDefinedRole" request
@@ -1465,7 +1465,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined role returns "Not Found" response
     Given operation "UpdateIncidentUserDefinedRole" enabled
     And new "UpdateIncidentUserDefinedRole" request
@@ -1474,7 +1474,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update an incident user-defined role returns "OK" response
     Given operation "UpdateIncidentUserDefinedRole" enabled
     And new "UpdateIncidentUserDefinedRole" request
@@ -1483,7 +1483,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update global incident handle returns "Bad Request" response
     Given operation "UpdateGlobalIncidentHandle" enabled
     And new "UpdateGlobalIncidentHandle" request
@@ -1491,7 +1491,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update global incident handle returns "OK" response
     Given operation "UpdateGlobalIncidentHandle" enabled
     And new "UpdateGlobalIncidentHandle" request
@@ -1499,7 +1499,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update global incident settings returns "Bad Request" response
     Given operation "UpdateGlobalIncidentSettings" enabled
     And new "UpdateGlobalIncidentSettings" request
@@ -1507,7 +1507,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update global incident settings returns "OK" response
     Given operation "UpdateGlobalIncidentSettings" enabled
     And new "UpdateGlobalIncidentSettings" request
@@ -1515,7 +1515,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/incident-app
+  @skip @team:ddoghq/incident-app
   Scenario: Update incident attachment returns "Bad Request" response
     Given operation "UpdateIncidentAttachment" enabled
     And new "UpdateIncidentAttachment" request
@@ -1525,7 +1525,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident attachment returns "Not Found" response
     Given operation "UpdateIncidentAttachment" enabled
     And new "UpdateIncidentAttachment" request
@@ -1535,7 +1535,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident attachment returns "OK" response
     Given operation "UpdateIncidentAttachment" enabled
     And there is a valid "incident" in the system
@@ -1549,7 +1549,7 @@ Feature: Incidents
     And the response "data.type" is equal to "incident_attachments"
     And the response "data.attributes.attachment.title" has the same value as "unique"
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident notification rule returns "Bad Request" response
     Given operation "UpdateIncidentNotificationRule" enabled
     And new "UpdateIncidentNotificationRule" request
@@ -1558,7 +1558,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident notification rule returns "Not Found" response
     Given operation "UpdateIncidentNotificationRule" enabled
     And new "UpdateIncidentNotificationRule" request
@@ -1567,7 +1567,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Update incident notification rule returns "OK" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_rule" in the system
@@ -1582,7 +1582,7 @@ Feature: Incidents
     And the response "data.attributes.visibility" is equal to "private"
     And the response "data.attributes.enabled" is equal to false
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident notification template returns "Bad Request" response
     Given operation "UpdateIncidentNotificationTemplate" enabled
     And new "UpdateIncidentNotificationTemplate" request
@@ -1591,7 +1591,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update incident notification template returns "Not Found" response
     Given operation "UpdateIncidentNotificationTemplate" enabled
     And new "UpdateIncidentNotificationTemplate" request
@@ -1600,7 +1600,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:Datadog/incident-app
+  @skip-terraform-config @team:ddoghq/incident-app
   Scenario: Update incident notification template returns "OK" response
     Given there is a valid "incident_type" in the system
     And there is a valid "notification_template" in the system
@@ -1615,7 +1615,7 @@ Feature: Incidents
     And the response "data.attributes.name" has the same value as "unique"
     And the response "data.attributes.category" is equal to "update"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update postmortem template returns "Bad Request" response
     Given operation "UpdateIncidentPostmortemTemplate" enabled
     And new "UpdateIncidentPostmortemTemplate" request
@@ -1624,7 +1624,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update postmortem template returns "Not Found" response
     Given operation "UpdateIncidentPostmortemTemplate" enabled
     And new "UpdateIncidentPostmortemTemplate" request
@@ -1633,7 +1633,7 @@ Feature: Incidents
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update postmortem template returns "OK" response
     Given operation "UpdateIncidentPostmortemTemplate" enabled
     And new "UpdateIncidentPostmortemTemplate" request
diff --git a/features/v2/integrations.feature b/features/v2/integrations.feature
index 20b20a472f3d..47e61eae22a5 100644
--- a/features/v2/integrations.feature
+++ b/features/v2/integrations.feature
@@ -3,7 +3,7 @@ Feature: Integrations
   The Integrations API is used to list available integrations and retrieve
   information about their installation status.
 
-  @skip-validation @team:DataDog/integrations-experience
+  @skip-validation @team:ddoghq/integrations-experience
   Scenario: List Integrations returns "Successful Response." response
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
diff --git a/features/v2/ip_allowlist.feature b/features/v2/ip_allowlist.feature
index 5faede4ef4d4..fde391e068cf 100644
--- a/features/v2/ip_allowlist.feature
+++ b/features/v2/ip_allowlist.feature
@@ -12,13 +12,13 @@ Feature: IP Allowlist
     And a valid "appKeyAuth" key in the system
     And an instance of "IPAllowlist" API
 
-  @generated @skip @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: Get IP Allowlist returns "Not Found" response
     Given new "GetIPAllowlist" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: Get IP Allowlist returns "OK" response
     Given the "ip_allowlist_nonempty_disabled" has two entries and is disabled
     And new "GetIPAllowlist" request
@@ -32,21 +32,21 @@ Feature: IP Allowlist
     And the response "data.attributes.entries[1].data.attributes.note" has the same value as "ip_allowlist_nonempty_disabled.data.attributes.entries[1].data.attributes.note"
     And the response "data.attributes.entries[1].data.type" is equal to "{{ ip_allowlist_nonempty_disabled.data.attributes.entries[1].data.type }}"
 
-  @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: Update IP Allowlist returns "Bad Request" response
     Given new "UpdateIPAllowlist" request
     And body with value {"data": {"type": "ip_allowlist", "attributes": {"enabled": true, "entries": []}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: Update IP Allowlist returns "Not Found" response
     Given new "UpdateIPAllowlist" request
     And body with value {"data": {"attributes": {"entries": [{"data": {"attributes": {}, "type": "ip_allowlist_entry"}}]}, "type": "ip_allowlist"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip-terraform-config @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @replay-only @skip-terraform-config @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: Update IP Allowlist returns "OK" response
     Given the "ip_allowlist_empty_disabled" has no entries and is disabled
     And new "UpdateIPAllowlist" request
diff --git a/features/v2/jira_integration.feature b/features/v2/jira_integration.feature
index 528a78b7b3b2..c93eacc34949 100644
--- a/features/v2/jira_integration.feature
+++ b/features/v2/jira_integration.feature
@@ -9,7 +9,7 @@ Feature: Jira Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "JiraIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create Jira issue template returns "Bad Request" response
     Given operation "CreateJiraIssueTemplate" enabled
     And new "CreateJiraIssueTemplate" request
@@ -17,7 +17,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create Jira issue template returns "Created" response
     Given operation "CreateJiraIssueTemplate" enabled
     And new "CreateJiraIssueTemplate" request
@@ -25,7 +25,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete Jira account returns "Bad Request" response
     Given operation "DeleteJiraAccount" enabled
     And new "DeleteJiraAccount" request
@@ -33,7 +33,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete Jira account returns "No Content" response
     Given operation "DeleteJiraAccount" enabled
     And new "DeleteJiraAccount" request
@@ -41,7 +41,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete Jira issue template returns "No Content" response
     Given operation "DeleteJiraIssueTemplate" enabled
     And new "DeleteJiraIssueTemplate" request
@@ -49,7 +49,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get Jira issue template returns "Bad Request" response
     Given operation "GetJiraIssueTemplate" enabled
     And new "GetJiraIssueTemplate" request
@@ -57,7 +57,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get Jira issue template returns "OK" response
     Given operation "GetJiraIssueTemplate" enabled
     And new "GetJiraIssueTemplate" request
@@ -65,28 +65,28 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List Jira accounts returns "Not Found" response
     Given operation "ListJiraAccounts" enabled
     And new "ListJiraAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List Jira accounts returns "OK" response
     Given operation "ListJiraAccounts" enabled
     And new "ListJiraAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List Jira issue templates returns "OK" response
     Given operation "ListJiraIssueTemplates" enabled
     And new "ListJiraIssueTemplates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update Jira issue template returns "Bad Request" response
     Given operation "UpdateJiraIssueTemplate" enabled
     And new "UpdateJiraIssueTemplate" request
@@ -95,7 +95,7 @@ Feature: Jira Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update Jira issue template returns "OK" response
     Given operation "UpdateJiraIssueTemplate" enabled
     And new "UpdateJiraIssueTemplate" request
diff --git a/features/v2/key_management.feature b/features/v2/key_management.feature
index 9ebc28dba7e8..5990fb5b0040 100644
--- a/features/v2/key_management.feature
+++ b/features/v2/key_management.feature
@@ -11,7 +11,7 @@ Feature: Key Management
     Given a valid "apiKeyAuth" key in the system
     And an instance of "KeyManagement" API
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create a personal access token returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "CreatePersonalAccessToken" request
@@ -19,7 +19,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Create a personal access token returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And new "CreatePersonalAccessToken" request
@@ -31,7 +31,7 @@ Feature: Key Management
     And the response "data.attributes.scopes" is equal to ["dashboards_read"]
     And the response "data.attributes" has field "key"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an API key returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateAPIKey" request
@@ -39,7 +39,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Create an API key returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateAPIKey" request
@@ -49,7 +49,7 @@ Feature: Key Management
     And the response "data.type" is equal to "api_keys"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Create an Application key with scopes for current user returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateCurrentUserApplicationKey" request
@@ -59,7 +59,7 @@ Feature: Key Management
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.scopes" is equal to ["dashboards_read", "dashboards_write", "dashboards_public_share"]
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an application key for current user returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateCurrentUserApplicationKey" request
@@ -67,7 +67,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Create an application key for current user returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateCurrentUserApplicationKey" request
@@ -77,7 +77,7 @@ Feature: Key Management
     And the response "data.type" is equal to "application_keys"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Delete an API key returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "api_key" in the system
@@ -86,7 +86,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an API key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteAPIKey" request
@@ -94,7 +94,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Delete an application key owned by current user returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -103,7 +103,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an application key owned by current user returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteCurrentUserApplicationKey" request
@@ -111,7 +111,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Delete an application key returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -120,7 +120,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Delete an application key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteApplicationKey" request
@@ -128,7 +128,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateAPIKey" request
@@ -137,7 +137,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateAPIKey" request
@@ -146,7 +146,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Edit an API key returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "api_key" in the system
@@ -159,7 +159,7 @@ Feature: Key Management
     And the response "data.id" is equal to "{{ api_key.data.id }}"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key owned by current user returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateCurrentUserApplicationKey" request
@@ -168,7 +168,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key owned by current user returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateCurrentUserApplicationKey" request
@@ -177,7 +177,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Edit an application key owned by current user returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -190,7 +190,7 @@ Feature: Key Management
     And the response "data.id" is equal to "{{ application_key.data.id }}"
     And the response "data.attributes.name" is equal to "{{ application_key.data.attributes.name }}-updated"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateApplicationKey" request
@@ -199,7 +199,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateApplicationKey" request
@@ -208,7 +208,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Edit an application key returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -221,7 +221,7 @@ Feature: Key Management
     And the response "data.id" is equal to "{{ application_key.data.id }}"
     And the response "data.attributes.name" is equal to "{{ application_key.data.attributes.name }}-updated"
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get API key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetAPIKey" request
@@ -229,7 +229,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get API key returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "api_key" in the system
@@ -241,7 +241,7 @@ Feature: Key Management
     And the response "data.id" is equal to "{{ api_key.data.id }}"
     And the response "data.attributes" has field "date_last_used"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get a personal access token returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetPersonalAccessToken" request
@@ -249,7 +249,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Get a personal access token returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "personal_access_token" in the system
@@ -260,14 +260,14 @@ Feature: Key Management
     And the response "data.type" is equal to "personal_access_tokens"
     And the response "data.id" has the same value as "personal_access_token.data.id"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all API keys returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListAPIKeys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get all API keys returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "api_key" in the system
@@ -278,35 +278,35 @@ Feature: Key Management
     And the response "data[0].type" is equal to "api_keys"
     And the response "data[0].attributes" has field "date_last_used"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all access tokens returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListPersonalAccessTokens" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all access tokens returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListPersonalAccessTokens" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all application keys owned by current user returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListCurrentUserApplicationKeys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all application keys owned by current user returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "ListCurrentUserApplicationKeys" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get all application keys owned by current user returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListCurrentUserApplicationKeys" request
@@ -315,21 +315,21 @@ Feature: Key Management
     And the response "data[0].type" is equal to "application_keys"
     And the response "data[0].attributes" has field "last_used_at"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all application keys returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListApplicationKeys" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get all application keys returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "ListApplicationKeys" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get all application keys returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -339,7 +339,7 @@ Feature: Key Management
     And the response "data[0].type" is equal to "application_keys"
     And the response "data[0].attributes" has field "last_used_at"
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Get all personal access tokens returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "personal_access_token" in the system
@@ -348,7 +348,7 @@ Feature: Key Management
     Then the response status is 200 OK
     And the response "data" has item with field "type" with value "personal_access_tokens"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get an application key returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "GetApplicationKey" request
@@ -356,7 +356,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get an application key returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetApplicationKey" request
@@ -364,7 +364,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get an application key returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -376,7 +376,7 @@ Feature: Key Management
     And the response "data.id" has the same value as "application_key.data.id"
     And the response "data.attributes" has field "last_used_at"
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get one application key owned by current user returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetCurrentUserApplicationKey" request
@@ -384,7 +384,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management
+  @team:ddoghq/credentials-management
   Scenario: Get one application key owned by current user returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "application_key" in the system
@@ -398,7 +398,7 @@ Feature: Key Management
     And the response "data.attributes" has field "scopes"
     And the response "data.attributes" has field "last_used_at"
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Revoke a personal access token returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "personal_access_token" in the system
@@ -407,7 +407,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Revoke a personal access token returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "RevokePersonalAccessToken" request
@@ -415,7 +415,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Update a personal access token returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdatePersonalAccessToken" request
@@ -424,7 +424,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Update a personal access token returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdatePersonalAccessToken" request
@@ -433,7 +433,7 @@ Feature: Key Management
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Update a personal access token returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "personal_access_token" in the system
@@ -444,14 +444,14 @@ Feature: Key Management
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "{{ unique }}-updated"
 
-  @generated @skip @team:DataDog/identity-platform
+  @generated @skip @team:ddoghq/identity-platform
   Scenario: Validate API and application keys returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ValidateAPIKey" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/identity-platform
+  @generated @skip @team:ddoghq/identity-platform
   Scenario: Validate API key returns "OK" response
     Given operation "Validate" enabled
     And new "Validate" request
diff --git a/features/v2/logs.feature b/features/v2/logs.feature
index 1e1e000e3aa3..2f2f2bdfaf38 100644
--- a/features/v2/logs.feature
+++ b/features/v2/logs.feature
@@ -8,7 +8,7 @@ Feature: Logs
     Given a valid "apiKeyAuth" key in the system
     And an instance of "Logs" API
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Aggregate compute events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateLogs" request
@@ -17,7 +17,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Aggregate compute events with group by returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateLogs" request
@@ -26,7 +26,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Aggregate events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateLogs" request
@@ -34,7 +34,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Aggregate events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateLogs" request
@@ -43,7 +43,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @replay-only @skip-validation @team:DataDog/logs-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/logs-app @with-pagination
   Scenario: Get a list of logs returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListLogsGet" request
@@ -52,7 +52,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Get a quick list of logs returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogsGet" request
@@ -65,28 +65,28 @@ Feature: Logs
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs (GET) returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogsGet" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs (GET) returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogsGet" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-app @with-pagination
+  @generated @skip @team:ddoghq/logs-app @with-pagination
   Scenario: Search logs (GET) returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListLogsGet" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs (POST) returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -94,7 +94,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-app
+  @generated @skip @team:ddoghq/logs-app
   Scenario: Search logs (POST) returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -102,7 +102,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-app @with-pagination
+  @generated @skip @team:ddoghq/logs-app @with-pagination
   Scenario: Search logs (POST) returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -110,7 +110,7 @@ Feature: Logs
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Search logs returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -119,7 +119,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @replay-only @skip-validation @team:DataDog/logs-app @with-pagination
+  @replay-only @skip-validation @team:ddoghq/logs-app @with-pagination
   Scenario: Search logs returns "OK" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListLogs" request
@@ -128,7 +128,7 @@ Feature: Logs
     Then the response status is 200 OK
     And the response has 3 items
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send deflate logs returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
@@ -136,7 +136,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 202 Response from server (always 202 empty JSON).
 
-  @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send deflate logs with explicit compression returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
@@ -145,7 +145,7 @@ Feature: Logs
     Then the response status is 202 Response from server (always 202 empty JSON).
     And the request uses "deflate" compression
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send gzip logs returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
@@ -153,7 +153,7 @@ Feature: Logs
     When the request is sent
     Then the response status is 202 Request accepted for processing (always 202 empty JSON).
 
-  @skip-terraform-config @skip-validation @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @skip-terraform-config @skip-validation @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send gzip logs with explicit compression returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
@@ -162,28 +162,28 @@ Feature: Logs
     Then the response status is 202 Request accepted for processing (always 202 empty JSON).
     And the request uses "gzip" compression
 
-  @generated @skip @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @generated @skip @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send logs returns "Bad Request" response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @generated @skip @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send logs returns "Payload Too Large" response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
     When the request is sent
     Then the response status is 413 Payload Too Large
 
-  @generated @skip @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @generated @skip @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send logs returns "Request Timeout" response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
     When the request is sent
     Then the response status is 408 Request Timeout
 
-  @team:DataDog/event-platform-intake @team:DataDog/logs-backend @team:DataDog/logs-ingestion
+  @team:ddoghq/event-platform-intake @team:ddoghq/logs-backend @team:ddoghq/logs-ingestion
   Scenario: Send logs returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitLog" request
     And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment", "status": "info"}]
diff --git a/features/v2/logs_archive_searches.feature b/features/v2/logs_archive_searches.feature
index 185e088c68dc..6f3af4d4561a 100644
--- a/features/v2/logs_archive_searches.feature
+++ b/features/v2/logs_archive_searches.feature
@@ -11,7 +11,7 @@ Feature: Logs Archive Searches
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsArchiveSearches" API
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Create an Archive Search returns "Bad Request" response
     Given operation "CreateArchiveSearch" enabled
     And new "CreateArchiveSearch" request
@@ -19,7 +19,7 @@ Feature: Logs Archive Searches
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Create an Archive Search returns "Not Found" response
     Given operation "CreateArchiveSearch" enabled
     And new "CreateArchiveSearch" request
@@ -27,7 +27,7 @@ Feature: Logs Archive Searches
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Create an Archive Search returns "OK" response
     Given operation "CreateArchiveSearch" enabled
     And new "CreateArchiveSearch" request
@@ -35,7 +35,7 @@ Feature: Logs Archive Searches
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Get an Archive Search returns "Bad Request" response
     Given operation "GetArchiveSearch" enabled
     And new "GetArchiveSearch" request
@@ -43,7 +43,7 @@ Feature: Logs Archive Searches
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Get an Archive Search returns "Not Found" response
     Given operation "GetArchiveSearch" enabled
     And new "GetArchiveSearch" request
@@ -51,7 +51,7 @@ Feature: Logs Archive Searches
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/logs-federated-search @team:DataDog/logs-routing
+  @generated @skip @team:ddoghq/logs-federated-search @team:ddoghq/logs-routing
   Scenario: Get an Archive Search returns "OK" response
     Given operation "GetArchiveSearch" enabled
     And new "GetArchiveSearch" request
diff --git a/features/v2/logs_archives.feature b/features/v2/logs_archives.feature
index 752be13634fc..5b842bdfd892 100644
--- a/features/v2/logs_archives.feature
+++ b/features/v2/logs_archives.feature
@@ -9,75 +9,75 @@ Feature: Logs Archives
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsArchives" API
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create an archive returns "Bad Request" response
     Given new "CreateLogsArchive" request
     And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "lookup_attributes": ["trace_id", "user_id"], "name": "Nginx Archive", "partitioning_attributes": ["service", "status"], "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create an archive returns "OK" response
     Given new "CreateLogsArchive" request
     And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "lookup_attributes": ["trace_id", "user_id"], "name": "Nginx Archive", "partitioning_attributes": ["service", "status"], "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete an archive returns "Bad Request" response
     Given new "DeleteLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete an archive returns "Not found" response
     Given new "DeleteLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete an archive returns "OK" response
     Given new "DeleteLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get all archives returns "OK" response
     Given new "ListLogsArchives" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get an archive returns "Bad Request" response
     Given new "GetLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get an archive returns "Not found" response
     Given new "GetLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get an archive returns "OK" response
     Given new "GetLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get archive order returns "OK" response
     Given new "GetLogsArchiveOrder" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Grant role to an archive returns "Bad Request" response
     Given new "AddReadRoleToArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -85,7 +85,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Grant role to an archive returns "Not found" response
     Given new "AddReadRoleToArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -93,7 +93,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Grant role to an archive returns "OK" response
     Given new "AddReadRoleToArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -101,28 +101,28 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: List read roles for an archive returns "Bad Request" response
     Given new "ListArchiveReadRoles" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: List read roles for an archive returns "Not found" response
     Given new "ListArchiveReadRoles" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: List read roles for an archive returns "OK" response
     Given new "ListArchiveReadRoles" request
     And request contains "archive_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Revoke role from an archive returns "Bad Request" response
     Given new "RemoveRoleFromArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -130,7 +130,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Revoke role from an archive returns "Not found" response
     Given new "RemoveRoleFromArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Revoke role from an archive returns "OK" response
     Given new "RemoveRoleFromArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -146,7 +146,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update an archive returns "Bad Request" response
     Given new "UpdateLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -154,7 +154,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update an archive returns "Not found" response
     Given new "UpdateLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -162,7 +162,7 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update an archive returns "OK" response
     Given new "UpdateLogsArchive" request
     And request contains "archive_id" parameter from "REPLACE.ME"
@@ -170,21 +170,21 @@ Feature: Logs Archives
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update archive order returns "Bad Request" response
     Given new "UpdateLogsArchiveOrder" request
     And body with value {"data": {"attributes": {"archive_ids": ["a2zcMylnM4OCHpYusxIi1g", "a2zcMylnM4OCHpYusxIi2g", "a2zcMylnM4OCHpYusxIi3g"]}, "type": "archive_order"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update archive order returns "OK" response
     Given new "UpdateLogsArchiveOrder" request
     And body with value {"data": {"attributes": {"archive_ids": ["a2zcMylnM4OCHpYusxIi1g", "a2zcMylnM4OCHpYusxIi2g", "a2zcMylnM4OCHpYusxIi3g"]}, "type": "archive_order"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update archive order returns "Unprocessable Entity" response
     Given new "UpdateLogsArchiveOrder" request
     And body with value {"data": {"attributes": {"archive_ids": ["a2zcMylnM4OCHpYusxIi1g", "a2zcMylnM4OCHpYusxIi2g", "a2zcMylnM4OCHpYusxIi3g"]}, "type": "archive_order"}}
diff --git a/features/v2/logs_custom_destinations.feature b/features/v2/logs_custom_destinations.feature
index e9aa22909977..2b5534e61175 100644
--- a/features/v2/logs_custom_destinations.feature
+++ b/features/v2/logs_custom_destinations.feature
@@ -13,7 +13,7 @@ Feature: Logs Custom Destinations
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsCustomDestinations" API
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Basic HTTP custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"auth": {"password": "datadog-custom-destination-password", "type": "basic", "username": "datadog-custom-destination-username"}, "endpoint": "https://example.com", "type": "http"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -35,7 +35,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "ALLOW_LIST"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Custom Header HTTP custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"auth": {"header_value": "my-secret", "type": "custom_header", "header_name": "MY-AUTHENTICATION-HEADER"}, "endpoint": "https://example.com", "type": "http"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -57,7 +57,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "ALLOW_LIST"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Microsoft Sentinel custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"type": "microsoft_sentinel", "tenant_id": "f3c9a8a1-4c2e-4d2e-b911-9f3c28c3c8b2", "client_id": "9a2f4d83-2b5e-429e-a35a-2b3c4182db71", "data_collection_endpoint": "https://my-dce-5kyl.eastus-1.ingest.monitor.azure.com", "data_collection_rule_id": "dcr-000a00a000a00000a000000aa000a0aa", "stream_name": "Custom-MyTable"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -80,7 +80,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "ALLOW_LIST"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Splunk custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"access_token": "my-access-token", "endpoint": "https://example.com", "type": "splunk_hec"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -101,7 +101,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "ALLOW_LIST"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Splunk custom destination with a null sourcetype returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forwarder_destination": {"access_token": "my-access-token", "endpoint": "https://example.com", "type": "splunk_hec", "sourcetype": null}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -114,7 +114,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to null
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Splunk custom destination with a sourcetype returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forwarder_destination": {"access_token": "my-access-token", "endpoint": "https://example.com", "type": "splunk_hec", "sourcetype": "my-sourcetype"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -127,7 +127,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to "my-sourcetype"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Splunk custom destination with an empty string sourcetype returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forwarder_destination": {"access_token": "my-access-token", "endpoint": "https://example.com", "type": "splunk_hec", "sourcetype": ""}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -140,7 +140,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to ""
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a Splunk custom destination without a sourcetype returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forwarder_destination": {"access_token": "my-access-token", "endpoint": "https://example.com", "type": "splunk_hec"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -153,28 +153,28 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination" does not have field "sourcetype"
 
-  @skip-java @skip-python @skip-rust @skip-typescript @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @skip-java @skip-python @skip-rust @skip-typescript @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a custom destination returns "Bad Request" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"name": "Nginx logs"}, "type": "custom_destination"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a custom destination returns "Conflict" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": true, "forward_tags": true, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"auth": {"password": "datadog-custom-destination-password", "type": "basic", "username": "datadog-custom-destination-username"}, "endpoint": "https://example.com", "type": "http"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": true, "forward_tags": true, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"auth": {"password": "datadog-custom-destination-password", "type": "basic", "username": "datadog-custom-destination-username"}, "endpoint": "https://example.com", "type": "http"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create an Elasticsearch custom destination returns "OK" response
     Given new "CreateLogsCustomDestination" request
     And body with value {"data": {"attributes": {"enabled": false, "forward_tags": false, "forward_tags_restriction_list": ["datacenter", "host"], "forward_tags_restriction_list_type": "ALLOW_LIST", "forwarder_destination": {"auth": {"username": "my-username", "password": "my-password"}, "index_name": "nginx-logs", "index_rotation": "yyyy-MM-dd", "endpoint": "https://example.com", "type": "elasticsearch"}, "name": "Nginx logs", "query": "source:nginx"}, "type": "custom_destination"}}
@@ -197,21 +197,21 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "ALLOW_LIST"
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete a custom destination returns "Bad Request" response
     Given new "DeleteLogsCustomDestination" request
     And request contains "custom_destination_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete a custom destination returns "Not Found" response
     Given new "DeleteLogsCustomDestination" request
     And request contains "custom_destination_id" parameter with value "does-not-exist"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete a custom destination returns "OK" response
     Given new "DeleteLogsCustomDestination" request
     And there is a valid "custom_destination" in the system
@@ -219,21 +219,21 @@ Feature: Logs Custom Destinations
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get a custom destination returns "Bad Request" response
     Given new "GetLogsCustomDestination" request
     And request contains "custom_destination_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get a custom destination returns "Not Found" response
     Given new "GetLogsCustomDestination" request
     And request contains "custom_destination_id" parameter with value "does-not-exist"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get a custom destination returns "OK" response
     Given new "GetLogsCustomDestination" request
     And there is a valid "custom_destination" in the system
@@ -255,7 +255,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forward_tags_restriction_list" array contains value "host"
     And the response "data.attributes.forward_tags_restriction_list_type" is equal to "{{ custom_destination.data.attributes.forward_tags_restriction_list_type }}"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get all custom destinations returns "OK" response
     Given new "ListLogsCustomDestinations" request
     And there is a valid "custom_destination" in the system
@@ -272,7 +272,7 @@ Feature: Logs Custom Destinations
     And the response "data" has item with field "attributes.forward_tags" with value false
     And the response "data" has item with field "attributes.forward_tags_restriction_list_type" with value "{{ custom_destination.data.attributes.forward_tags_restriction_list_type }}"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a Splunk custom destination with a null sourcetype returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination_splunk_with_sourcetype" in the system
@@ -287,7 +287,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to null
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a Splunk custom destination with a sourcetype returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination_splunk" in the system
@@ -302,7 +302,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to "new-sourcetype"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a Splunk custom destination's attributes preserves the absent sourcetype returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination_splunk" in the system
@@ -316,7 +316,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination.type" is equal to "splunk_hec"
     And the response "data.attributes.forwarder_destination" does not have field "sourcetype"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a Splunk custom destination's destination preserves the null sourcetype returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination_splunk_with_null_sourcetype" in the system
@@ -331,7 +331,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to null
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a Splunk custom destination's destination preserves the sourcetype returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination_splunk_with_sourcetype" in the system
@@ -346,7 +346,7 @@ Feature: Logs Custom Destinations
     And the response "data.attributes.forwarder_destination" does not have field "access_token"
     And the response "data.attributes.forwarder_destination.sourcetype" is equal to "my-sourcetype"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a custom destination returns "Bad Request" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination" in the system
@@ -355,7 +355,7 @@ Feature: Logs Custom Destinations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a custom destination returns "Conflict" response
     Given new "UpdateLogsCustomDestination" request
     And request contains "custom_destination_id" parameter from "REPLACE.ME"
@@ -363,7 +363,7 @@ Feature: Logs Custom Destinations
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a custom destination returns "Not Found" response
     Given new "UpdateLogsCustomDestination" request
     And request contains "custom_destination_id" parameter with value "id-from-non-existing-custom-destination"
@@ -371,7 +371,7 @@ Feature: Logs Custom Destinations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a custom destination returns "OK" response
     Given new "UpdateLogsCustomDestination" request
     And there is a valid "custom_destination" in the system
diff --git a/features/v2/logs_metrics.feature b/features/v2/logs_metrics.feature
index 4342f80a9cfb..ac904962bcc7 100644
--- a/features/v2/logs_metrics.feature
+++ b/features/v2/logs_metrics.feature
@@ -9,21 +9,21 @@ Feature: Logs Metrics
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsMetrics" API
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a log-based metric returns "Bad Request" response
     Given new "CreateLogsMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": true, "path": "@duration"}, "filter": {"query": "service:web* AND @http.status_code:[200 TO 299]"}, "group_by": [{"path": "@http.status_code", "tag_name": "status_code"}]}, "id": "logs.page.load.count", "type": "logs_metrics"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a log-based metric returns "Conflict" response
     Given new "CreateLogsMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": true, "path": "@duration"}, "filter": {"query": "service:web* AND @http.status_code:[200 TO 299]"}, "group_by": [{"path": "@http.status_code", "tag_name": "status_code"}]}, "id": "logs.page.load.count", "type": "logs_metrics"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Create a log-based metric returns "OK" response
     Given new "CreateLogsMetric" request
     And body with value {"data": {"id": "{{ unique_alnum }}", "type": "logs_metrics", "attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": true, "path":"@duration"}}}}
@@ -34,14 +34,14 @@ Feature: Logs Metrics
     And the response "data.attributes.compute.aggregation_type" is equal to "distribution"
     And the response "data.attributes.compute.include_percentiles" is equal to true
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete a log-based metric returns "Not Found" response
     Given new "DeleteLogsMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Delete a log-based metric returns "OK" response
     Given there is a valid "logs_metric" in the system
     And new "DeleteLogsMetric" request
@@ -49,14 +49,14 @@ Feature: Logs Metrics
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get a log-based metric returns "Not Found" response
     Given new "GetLogsMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get a log-based metric returns "OK" response
     Given there is a valid "logs_metric" in the system
     And new "GetLogsMetric" request
@@ -65,7 +65,7 @@ Feature: Logs Metrics
     Then the response status is 200 OK
     And the response "data.attributes.filter.query" has the same value as "logs_metric.data.attributes.filter.query"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Get all log-based metrics returns "OK" response
     Given there is a valid "logs_metric" in the system
     And new "ListLogsMetrics" request
@@ -73,7 +73,7 @@ Feature: Logs Metrics
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "logs_metrics"
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a log-based metric returns "Bad Request" response
     Given new "UpdateLogsMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -81,7 +81,7 @@ Feature: Logs Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @generated @skip @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a log-based metric returns "Not Found" response
     Given new "UpdateLogsMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -89,7 +89,7 @@ Feature: Logs Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a log-based metric returns "OK" response
     Given there is a valid "logs_metric" in the system
     And new "UpdateLogsMetric" request
@@ -99,7 +99,7 @@ Feature: Logs Metrics
     Then the response status is 200 OK
     And the response "data.attributes.filter.query" is equal to "{{ logs_metric.data.attributes.filter.query }}-updated"
 
-  @team:DataDog/logs-backend @team:DataDog/logs-forwarding
+  @team:ddoghq/logs-backend @team:ddoghq/logs-forwarding
   Scenario: Update a log-based metric with include_percentiles field returns "OK" response
     Given there is a valid "logs_metric_percentile" in the system
     And new "UpdateLogsMetric" request
diff --git a/features/v2/logs_restriction_queries.feature b/features/v2/logs_restriction_queries.feature
index 44d65b92fd5c..a2e47e8a168e 100644
--- a/features/v2/logs_restriction_queries.feature
+++ b/features/v2/logs_restriction_queries.feature
@@ -24,7 +24,7 @@ Feature: Logs Restriction Queries
     And a valid "appKeyAuth" key in the system
     And an instance of "LogsRestrictionQueries" API
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/logs-app
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:ddoghq/logs-app
   Scenario: Create a restriction query returns "Bad Request" response
     Given operation "CreateRestrictionQuery" enabled
     And new "CreateRestrictionQuery" request
@@ -32,7 +32,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Create a restriction query returns "OK" response
     Given operation "CreateRestrictionQuery" enabled
     And new "CreateRestrictionQuery" request
@@ -40,7 +40,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Delete a restriction query returns "Bad Request" response
     Given operation "DeleteRestrictionQuery" enabled
     And new "DeleteRestrictionQuery" request
@@ -48,7 +48,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Delete a restriction query returns "Not found" response
     Given operation "DeleteRestrictionQuery" enabled
     And new "DeleteRestrictionQuery" request
@@ -56,7 +56,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Delete a restriction query returns "OK" response
     Given operation "DeleteRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
@@ -65,7 +65,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 204 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Get a restriction query returns "Bad Request" response
     Given operation "GetRestrictionQuery" enabled
     And new "GetRestrictionQuery" request
@@ -73,7 +73,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Get a restriction query returns "Not found" response
     Given operation "GetRestrictionQuery" enabled
     And new "GetRestrictionQuery" request
@@ -81,7 +81,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Get a restriction query returns "OK" response
     Given operation "GetRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
@@ -90,7 +90,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Get all restriction queries for a given user returns "Bad Request" response
     Given operation "ListUserRestrictionQueries" enabled
     And new "ListUserRestrictionQueries" request
@@ -98,7 +98,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Get all restriction queries for a given user returns "Not found" response
     Given operation "ListUserRestrictionQueries" enabled
     And new "ListUserRestrictionQueries" request
@@ -106,7 +106,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Get all restriction queries for a given user returns "OK" response
     Given operation "ListUserRestrictionQueries" enabled
     And there is a valid "user" in the system
@@ -115,7 +115,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Get restriction query for a given role returns "Bad Request" response
     Given operation "GetRoleRestrictionQuery" enabled
     And new "GetRoleRestrictionQuery" request
@@ -123,7 +123,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Get restriction query for a given role returns "Not found" response
     Given operation "GetRoleRestrictionQuery" enabled
     And new "GetRoleRestrictionQuery" request
@@ -131,7 +131,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Get restriction query for a given role returns "OK" response
     Given operation "GetRoleRestrictionQuery" enabled
     And there is a valid "role" in the system
@@ -140,7 +140,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Grant role to a restriction query returns "Bad Request" response
     Given operation "AddRoleToRestrictionQuery" enabled
     And new "AddRoleToRestrictionQuery" request
@@ -149,7 +149,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Grant role to a restriction query returns "Not found" response
     Given operation "AddRoleToRestrictionQuery" enabled
     And new "AddRoleToRestrictionQuery" request
@@ -158,7 +158,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: Grant role to a restriction query returns "OK" response
     Given operation "AddRoleToRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
@@ -169,14 +169,14 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 204 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: List restriction queries returns "OK" response
     Given operation "ListRestrictionQueries" enabled
     And new "ListRestrictionQueries" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: List roles for a restriction query returns "Bad Request" response
     Given operation "ListRestrictionQueryRoles" enabled
     And new "ListRestrictionQueryRoles" request
@@ -184,7 +184,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/logs-app
+  @skip-terraform-config @team:ddoghq/logs-app
   Scenario: List roles for a restriction query returns "Not found" response
     Given operation "ListRestrictionQueryRoles" enabled
     And new "ListRestrictionQueryRoles" request
@@ -192,7 +192,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/logs-app
+  @team:ddoghq/logs-app
   Scenario: List roles for a restriction query returns "OK" response
     Given operation "ListRestrictionQueryRoles" enabled
     And there is a valid "restriction_query" in the system
@@ -201,7 +201,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Replace a restriction query returns "Bad Request" response
     Given operation "ReplaceRestrictionQuery" enabled
     And new "ReplaceRestrictionQuery" request
@@ -210,7 +210,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Replace a restriction query returns "Not found" response
     Given operation "ReplaceRestrictionQuery" enabled
     And new "ReplaceRestrictionQuery" request
@@ -219,7 +219,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Replace a restriction query returns "OK" response
     Given operation "ReplaceRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
@@ -229,7 +229,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @skip-terraform-config @team:DataDog/logs-app
+  @skip @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Revoke role from a restriction query returns "Bad Request" response
     Given operation "RemoveRoleFromRestrictionQuery" enabled
     And new "RemoveRoleFromRestrictionQuery" request
@@ -238,7 +238,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-terraform-config @team:DataDog/logs-app
+  @skip @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Revoke role from a restriction query returns "Not found" response
     Given operation "RemoveRoleFromRestrictionQuery" enabled
     And new "RemoveRoleFromRestrictionQuery" request
@@ -247,7 +247,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Revoke role from a restriction query returns "OK" response
     Given operation "RemoveRoleFromRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
@@ -258,7 +258,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 204 OK
 
-  @skip @skip-terraform-config @team:DataDog/logs-app
+  @skip @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Update a restriction query returns "Bad Request" response
     Given operation "UpdateRestrictionQuery" enabled
     And new "UpdateRestrictionQuery" request
@@ -267,7 +267,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-terraform-config @team:DataDog/logs-app
+  @skip @skip-terraform-config @team:ddoghq/logs-app
   Scenario: Update a restriction query returns "Not found" response
     Given operation "UpdateRestrictionQuery" enabled
     And new "UpdateRestrictionQuery" request
@@ -276,7 +276,7 @@ Feature: Logs Restriction Queries
     When the request is sent
     Then the response status is 404 Not found
 
-  @skip @team:DataDog/logs-app
+  @skip @team:ddoghq/logs-app
   Scenario: Update a restriction query returns "OK" response
     Given operation "UpdateRestrictionQuery" enabled
     And there is a valid "restriction_query" in the system
diff --git a/features/v2/metrics.feature b/features/v2/metrics.feature
index ae3d5eeb7e48..2d187a673ecc 100644
--- a/features/v2/metrics.feature
+++ b/features/v2/metrics.feature
@@ -15,7 +15,7 @@ Feature: Metrics
     Given a valid "apiKeyAuth" key in the system
     And an instance of "Metrics" API
 
-  @skip-typescript @team:DataDog/metrics-experience
+  @skip-typescript @team:ddoghq/metrics-experience
   Scenario: Configure tags for multiple metrics returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "user" in the system
@@ -24,7 +24,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Configure tags for multiple metrics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateBulkTagsMetricsConfiguration" request
@@ -32,7 +32,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Configure tags for multiple metrics returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateBulkTagsMetricsConfiguration" request
@@ -40,7 +40,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Create a tag configuration returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateTagConfiguration" 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-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Create a tag configuration returns "Conflict" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateTagConfiguration" request
@@ -58,7 +58,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 409 Conflict
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience
+  @replay-only @skip-validation @team:ddoghq/metrics-experience
   Scenario: Create a tag configuration returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And new "CreateTagConfiguration" request
@@ -68,7 +68,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule exemption returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRuleExemption" enabled
@@ -78,7 +78,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule exemption returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRuleExemption" enabled
@@ -88,7 +88,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -97,7 +97,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -106,7 +106,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule with exclude-mode tag usage fields returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -115,7 +115,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule with exclude_not_queried_window_seconds and exclude_tags_mode false returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -124,7 +124,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/metrics-experience
+  @skip @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule with exclude_not_queried_window_seconds over the maximum returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -133,7 +133,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Create a tag indexing rule with exclude_not_used_in_assets and exclude_tags_mode false returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateTagIndexingRule" enabled
@@ -142,7 +142,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete a historical metrics configuration returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteHistoricalMetricsConfiguration" enabled
@@ -151,7 +151,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete a historical metrics configuration returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteHistoricalMetricsConfiguration" enabled
@@ -160,7 +160,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience
+  @replay-only @skip-validation @team:ddoghq/metrics-experience
   Scenario: Delete a tag configuration returns "No Content" response
     Given there is a valid "metric" in the system
     And there is a valid "metric_tag_configuration" in the system
@@ -170,7 +170,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete a tag configuration returns "Not found" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteTagConfiguration" request
@@ -178,7 +178,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete a tag indexing rule exemption returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteTagIndexingRuleExemption" enabled
@@ -187,7 +187,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete a tag indexing rule exemption returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteTagIndexingRuleExemption" enabled
@@ -196,7 +196,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Delete a tag indexing rule returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteTagIndexingRule" enabled
@@ -205,7 +205,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Delete a tag indexing rule returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And operation "DeleteTagIndexingRule" enabled
@@ -215,7 +215,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete tags for multiple metrics returns "Accepted" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteBulkTagsMetricsConfiguration" request
@@ -223,7 +223,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete tags for multiple metrics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteBulkTagsMetricsConfiguration" request
@@ -231,7 +231,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Delete tags for multiple metrics returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "DeleteBulkTagsMetricsConfiguration" request
@@ -239,7 +239,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Enable historical metrics ingestion returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateHistoricalMetricsConfiguration" enabled
@@ -248,7 +248,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Enable historical metrics ingestion returns "Created" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateHistoricalMetricsConfiguration" enabled
@@ -257,7 +257,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Enable historical metrics ingestion returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateHistoricalMetricsConfiguration" enabled
@@ -266,7 +266,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Enable historical metrics ingestion returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateHistoricalMetricsConfiguration" enabled
@@ -275,7 +275,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Enable historical metrics ingestion returns "Unprocessable Entity" response
     Given a valid "appKeyAuth" key in the system
     And operation "CreateHistoricalMetricsConfiguration" enabled
@@ -284,7 +284,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a historical metrics configuration returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetHistoricalMetricsConfiguration" enabled
@@ -293,7 +293,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a historical metrics configuration returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetHistoricalMetricsConfiguration" enabled
@@ -302,7 +302,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a historical metrics configuration returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetHistoricalMetricsConfiguration" enabled
@@ -311,14 +311,14 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a list of metrics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagConfigurations" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/metrics-experience
+  @skip @team:ddoghq/metrics-experience
   Scenario: Get a list of metrics returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric_tag_configuration" in the system
@@ -326,7 +326,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 Success
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience @with-pagination
+  @replay-only @skip-validation @team:ddoghq/metrics-experience @with-pagination
   Scenario: Get a list of metrics returns "Success" response with pagination
     Given a valid "appKeyAuth" key in the system
     And new "ListTagConfigurations" request
@@ -335,7 +335,7 @@ Feature: Metrics
     Then the response status is 200 Success
     And the response has 3 items
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Get a list of metrics with a tag filter returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagConfigurations" request
@@ -344,7 +344,7 @@ Feature: Metrics
     Then the response status is 200 Success
     And the response "data" has length 0
 
-  @replay-only @team:DataDog/metrics-experience
+  @replay-only @team:ddoghq/metrics-experience
   Scenario: Get a list of metrics with configured filter returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagConfigurations" request
@@ -353,7 +353,7 @@ Feature: Metrics
     Then the response status is 200 Success
     And the response "data[0].type" is equal to "manage_tags"
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule exemption returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRuleExemption" enabled
@@ -362,7 +362,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule exemption returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRuleExemption" enabled
@@ -371,7 +371,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule exemption returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRuleExemption" enabled
@@ -380,7 +380,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRule" enabled
@@ -389,7 +389,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRule" enabled
@@ -398,7 +398,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Get a tag indexing rule returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "GetTagIndexingRule" enabled
@@ -408,7 +408,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get tag key cardinality details returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "GetMetricTagCardinalityDetails" request
@@ -416,7 +416,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get tag key cardinality details returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "GetMetricTagCardinalityDetails" request
@@ -424,7 +424,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Get tag key cardinality details returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And new "GetMetricTagCardinalityDetails" request
@@ -432,7 +432,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 Success
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List active tags and aggregations returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListActiveMetricConfigurations" request
@@ -440,7 +440,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List active tags and aggregations returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "ListActiveMetricConfigurations" request
@@ -448,7 +448,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/metrics-experience
+  @skip-validation @team:ddoghq/metrics-experience
   Scenario: List active tags and aggregations returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric_static" in the system
@@ -459,7 +459,7 @@ Feature: Metrics
     And the response "data.type" is equal to "actively_queried_configurations"
     And the response "data.id" is equal to "static_test_metric_donotdelete"
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List distinct metric volumes by metric name returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListVolumesByMetricName" request
@@ -467,7 +467,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List distinct metric volumes by metric name returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "ListVolumesByMetricName" request
@@ -475,7 +475,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/metrics-experience
+  @skip-validation @team:ddoghq/metrics-experience
   Scenario: List distinct metric volumes by metric name returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric_static" in the system
@@ -486,7 +486,7 @@ Feature: Metrics
     And the response "data.type" is equal to "metric_volumes"
     And the response "data.id" is equal to "static_test_metric_donotdelete"
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List tag configuration by name returns "No tag configuration exists for the metric" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagConfigurationByName" request
@@ -494,7 +494,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 No tag configuration exists for the metric
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience
+  @replay-only @skip-validation @team:ddoghq/metrics-experience
   Scenario: List tag configuration by name returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric" in the system
@@ -505,7 +505,7 @@ Feature: Metrics
     Then the response status is 200 Success
     And the response "data.id" has the same value as "metric_tag_configuration.data.id"
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: List tag indexing rules for a metric returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "ListTagIndexingRulesForMetric" enabled
@@ -514,7 +514,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: List tag indexing rules for a metric returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "ListTagIndexingRulesForMetric" enabled
@@ -523,7 +523,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List tag indexing rules returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "ListTagIndexingRules" enabled
@@ -531,7 +531,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: List tag indexing rules returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "ListTagIndexingRules" enabled
@@ -539,7 +539,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List tags by metric name returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagsByMetricName" request
@@ -547,7 +547,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: List tags by metric name returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And new "ListTagsByMetricName" request
@@ -555,7 +555,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience
+  @replay-only @skip-validation @team:ddoghq/metrics-experience
   Scenario: List tags by metric name returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric" in the system
@@ -566,7 +566,7 @@ Feature: Metrics
     Then the response status is 200 Success
     And the response "data.id" has the same value as "metric_tag_configuration.data.id"
 
-  @generated @skip @team:Datadog/timeseries-query
+  @generated @skip @team:ddoghq/timeseries-query
   Scenario: Query scalar data across multiple products returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -574,7 +574,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/timeseries-query
+  @generated @skip @team:ddoghq/timeseries-query
   Scenario: Query scalar data across multiple products returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -582,7 +582,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/timeseries-query
+  @generated @skip @team:ddoghq/timeseries-query
   Scenario: Query timeseries data across multiple products returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -590,7 +590,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/timeseries-query
+  @generated @skip @team:ddoghq/timeseries-query
   Scenario: Query timeseries data across multiple products returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -598,7 +598,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Related Assets to a Metric returns "API error response." response
     Given a valid "appKeyAuth" key in the system
     And new "ListMetricAssets" request
@@ -606,7 +606,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Related Assets to a Metric returns "Success" response
     Given a valid "appKeyAuth" key in the system
     And new "ListMetricAssets" request
@@ -616,7 +616,7 @@ Feature: Metrics
     And the response "data.type" is equal to "metrics"
     And the response "data.id" is equal to "system.cpu.user"
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Reorder tag indexing rules returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "ReorderTagIndexingRules" enabled
@@ -625,7 +625,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Reorder tag indexing rules returns "No Content" response
     Given a valid "appKeyAuth" key in the system
     And operation "ReorderTagIndexingRules" enabled
@@ -635,7 +635,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Reorder tag indexing rules returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "ReorderTagIndexingRules" enabled
@@ -644,7 +644,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/timeseries-query
+  @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -652,7 +652,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/timeseries-query
+  @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -662,7 +662,7 @@ Feature: Metrics
     And the response "data.type" is equal to "scalar_response"
     And the response "data.attributes.columns[0].name" is equal to "a"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with RUM data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -671,7 +671,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with apm_dependency_stats data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -680,7 +680,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with apm_metrics data source and span_kind returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -689,7 +689,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with apm_metrics data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -698,7 +698,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with apm_resource_stats data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -707,7 +707,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with audit data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -716,7 +716,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with ci_pipelines data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -725,7 +725,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with ci_tests data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -734,7 +734,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with container data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -743,7 +743,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with events data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -752,7 +752,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with logs data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -761,7 +761,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with network data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -770,7 +770,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with on_call_events data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -779,7 +779,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with process data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -788,7 +788,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with product_analytics data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -797,7 +797,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with profiles data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -806,7 +806,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with security_signals data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -815,7 +815,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with slo data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -824,7 +824,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Scalar cross product query with spans data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryScalarData" request
@@ -833,14 +833,14 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "scalar_response"
 
-  @generated @skip @team:DataDog/metrics-intake
+  @generated @skip @team:ddoghq/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:ddoghq/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"}]}]}
@@ -848,21 +848,21 @@ Feature: Metrics
     Then the response status is 202 Payload accepted
     And the response "errors" has length 0
 
-  @generated @skip @team:DataDog/metrics-intake
+  @generated @skip @team:ddoghq/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
+  @generated @skip @team:ddoghq/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
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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}]}]}
@@ -870,7 +870,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 202 Payload accepted
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Tag Configuration Cardinality Estimator returns "API error response." response
     Given a valid "appKeyAuth" key in the system
     And new "EstimateMetricsOutputSeries" request
@@ -878,7 +878,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @replay-only @team:DataDog/metrics-experience
+  @replay-only @team:ddoghq/metrics-experience
   Scenario: Tag Configuration Cardinality Estimator returns "Success" response
     Given new "EstimateMetricsOutputSeries" request
     And request contains "metric_name" parameter with value "system.cpu.idle"
@@ -887,7 +887,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 Success
 
-  @skip @team:Datadog/timeseries-query
+  @skip @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -895,7 +895,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/timeseries-query
+  @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -904,7 +904,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with RUM data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -913,7 +913,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with apm_dependency_stats data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -922,7 +922,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with apm_metrics data source and span_kind returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -931,7 +931,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with apm_metrics data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -940,7 +940,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with apm_resource_stats data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -949,7 +949,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with audit data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -958,7 +958,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with ci_pipelines data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -967,7 +967,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with ci_tests data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -976,7 +976,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with container data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -985,7 +985,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with events data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -994,7 +994,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with logs data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1003,7 +1003,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with network data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1012,7 +1012,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with on_call_events data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1021,7 +1021,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with process data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1030,7 +1030,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with product_analytics data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1039,7 +1039,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with profiles data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1048,7 +1048,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with security_signals data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1057,7 +1057,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with slo data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1066,7 +1066,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @skip-validation @team:Datadog/timeseries-query
+  @skip-validation @team:ddoghq/timeseries-query
   Scenario: Timeseries cross product query with spans data source returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryTimeseriesData" request
@@ -1075,7 +1075,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Update a tag configuration returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateTagConfiguration" request
@@ -1084,7 +1084,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-validation @team:DataDog/metrics-experience
+  @replay-only @skip-validation @team:ddoghq/metrics-experience
   Scenario: Update a tag configuration returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And there is a valid "metric" in the system
@@ -1096,7 +1096,7 @@ Feature: Metrics
     Then the response status is 200 OK
     And the response "data.attributes.tags[0]" is equal to "app"
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Update a tag configuration returns "Unprocessable Entity" response
     Given a valid "appKeyAuth" key in the system
     And new "UpdateTagConfiguration" request
@@ -1105,7 +1105,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Update a tag indexing rule returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "UpdateTagIndexingRule" enabled
@@ -1115,7 +1115,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/metrics-experience
+  @generated @skip @team:ddoghq/metrics-experience
   Scenario: Update a tag indexing rule returns "Conflict" response
     Given a valid "appKeyAuth" key in the system
     And operation "UpdateTagIndexingRule" enabled
@@ -1125,7 +1125,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Update a tag indexing rule returns "Not Found" response
     Given a valid "appKeyAuth" key in the system
     And operation "UpdateTagIndexingRule" enabled
@@ -1135,7 +1135,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Update a tag indexing rule returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "UpdateTagIndexingRule" enabled
@@ -1146,7 +1146,7 @@ Feature: Metrics
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/metrics-experience
+  @team:ddoghq/metrics-experience
   Scenario: Update a tag indexing rule with exclude-mode tag usage fields returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "UpdateTagIndexingRule" enabled
diff --git a/features/v2/microsoft_teams_integration.feature b/features/v2/microsoft_teams_integration.feature
index ddbffd962753..460fd26efacd 100644
--- a/features/v2/microsoft_teams_integration.feature
+++ b/features/v2/microsoft_teams_integration.feature
@@ -10,42 +10,42 @@ Feature: Microsoft Teams Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "MicrosoftTeamsIntegration" API
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create Workflows webhook handle returns "Bad Request" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "fake-handle-name", "url": "https://fake.url.com"}, "type": "workflows-webhook-handle"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create Workflows webhook handle returns "CREATED" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "fake-handle-name", "url": "https://fake.url.com"}, "type": "workflows-webhook-handle"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create Workflows webhook handle returns "Conflict" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "fake-handle-name", "url": "https://fake.url.com"}, "type": "workflows-webhook-handle"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create Workflows webhook handle returns "Failed Precondition" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "fake-handle-name", "url": "https://fake.url.com"}, "type": "workflows-webhook-handle"}}
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create Workflows webhook handle returns "Not Found" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "fake-handle-name", "url": "https://fake.url.com"}, "type": "workflows-webhook-handle"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @integration-only @team:DataDog/chat-integrations
+  @integration-only @team:ddoghq/chat-integrations
   Scenario: Create api handle returns "CREATED" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "19:iD_D2xy_sAa-JV851JJYwIa6mlW9F9Nxm3SLyZq68qY1@thread.tacv2", "name": "{{unique}}", "team_id": "e5f50a58-c929-4fb3-8866-e2cd836de3c2", "tenant_id": "4d3bac44-0230-4732-9e70-cc00736f0a97"}, "type": "tenant-based-handle"}}
@@ -53,42 +53,42 @@ Feature: Microsoft Teams Integration
     Then the response status is 201 CREATED
     And the response "data.attributes.name" is equal to "{{unique}}"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create tenant-based handle returns "Bad Request" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "fake-channel-id", "name": "fake-handle-name", "team_id": "00000000-0000-0000-0000-000000000000", "tenant_id": "00000000-0000-0000-0000-000000000001"}, "type": "tenant-based-handle"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create tenant-based handle returns "CREATED" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "fake-channel-id", "name": "fake-handle-name", "team_id": "00000000-0000-0000-0000-000000000000", "tenant_id": "00000000-0000-0000-0000-000000000001"}, "type": "tenant-based-handle"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create tenant-based handle returns "Conflict" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "fake-channel-id", "name": "fake-handle-name", "team_id": "00000000-0000-0000-0000-000000000000", "tenant_id": "00000000-0000-0000-0000-000000000001"}, "type": "tenant-based-handle"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create tenant-based handle returns "Failed Precondition" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "fake-channel-id", "name": "fake-handle-name", "team_id": "00000000-0000-0000-0000-000000000000", "tenant_id": "00000000-0000-0000-0000-000000000001"}, "type": "tenant-based-handle"}}
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Create tenant-based handle returns "Not Found" response
     Given new "CreateTenantBasedHandle" request
     And body with value {"data": {"attributes": {"channel_id": "fake-channel-id", "name": "fake-handle-name", "team_id": "00000000-0000-0000-0000-000000000000", "tenant_id": "00000000-0000-0000-0000-000000000001"}, "type": "tenant-based-handle"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Create workflow webhook handle returns "CREATED" response
     Given new "CreateWorkflowsWebhookHandle" request
     And body with value {"data": {"attributes": {"name": "{{unique}}", "url": "https://example.logic.azure.com/workflows/123"}, "type": "workflows-webhook-handle"}}
@@ -96,28 +96,28 @@ Feature: Microsoft Teams Integration
     Then the response status is 201 CREATED
     And the response "data.attributes.name" is equal to "{{unique}}"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete Workflows webhook handle returns "Bad Request" response
     Given new "DeleteWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete Workflows webhook handle returns "Failed Precondition" response
     Given new "DeleteWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete Workflows webhook handle returns "OK" response
     Given new "DeleteWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @integration-only @team:DataDog/chat-integrations
+  @integration-only @team:ddoghq/chat-integrations
   Scenario: Delete api handle returns "OK" response
     Given there is a valid "tenant_based_handle" in the system
     And new "DeleteTenantBasedHandle" request
@@ -125,49 +125,49 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete tenant-based handle returns "Bad Request" response
     Given new "DeleteTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete tenant-based handle returns "Failed Precondition" response
     Given new "DeleteTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete tenant-based handle returns "OK" response
     Given new "DeleteTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete user binding returns "Bad Request" response
     Given new "DeleteMSTeamsUserBinding" request
     And request contains "tenant_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete user binding returns "Failed Precondition" response
     Given new "DeleteMSTeamsUserBinding" request
     And request contains "tenant_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Delete user binding returns "No Content" response
     Given new "DeleteMSTeamsUserBinding" request
     And request contains "tenant_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Delete workflow webhook handle returns "OK" response
     Given there is a valid "workflows_webhook_handle" in the system
     And new "DeleteWorkflowsWebhookHandle" request
@@ -175,59 +175,59 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get Workflows webhook handle information returns "Bad Request" response
     Given new "GetWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get Workflows webhook handle information returns "Failed Precondition" response
     Given new "GetWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get Workflows webhook handle information returns "Not Found" response
     Given new "GetWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get Workflows webhook handle information returns "OK" response
     Given new "GetWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all Workflows webhook handles returns "Bad Request" response
     Given new "ListWorkflowsWebhookHandles" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all Workflows webhook handles returns "Failed Precondition" response
     Given new "ListWorkflowsWebhookHandles" request
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all Workflows webhook handles returns "Not Found" response
     Given new "ListWorkflowsWebhookHandles" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all Workflows webhook handles returns "OK" response
     Given new "ListWorkflowsWebhookHandles" request
     When the request is sent
     Then the response status is 200 OK
 
-  @integration-only @team:DataDog/chat-integrations
+  @integration-only @team:ddoghq/chat-integrations
   Scenario: Get all api handles returns "OK" response
     Given there is a valid "tenant_based_handle" in the system
     And new "ListTenantBasedHandles" request
@@ -235,31 +235,31 @@ Feature: Microsoft Teams Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "ms-teams-tenant-based-handle-info"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all tenant-based handles returns "Bad Request" response
     Given new "ListTenantBasedHandles" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all tenant-based handles returns "Failed Precondition" response
     Given new "ListTenantBasedHandles" request
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all tenant-based handles returns "Not Found" response
     Given new "ListTenantBasedHandles" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get all tenant-based handles returns "OK" response
     Given new "ListTenantBasedHandles" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Get all workflow webhook handles returns "OK" response
     Given there is a valid "workflows_webhook_handle" in the system
     And new "ListWorkflowsWebhookHandles" request
@@ -267,7 +267,7 @@ Feature: Microsoft Teams Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "workflows-webhook-handle"
 
-  @integration-only @team:DataDog/chat-integrations
+  @integration-only @team:ddoghq/chat-integrations
   Scenario: Get api handle information returns "OK" response
     Given there is a valid "tenant_based_handle" in the system
     And new "GetTenantBasedHandle" request
@@ -279,7 +279,7 @@ Feature: Microsoft Teams Integration
     And the response "data.attributes.team_id" has the same value as "tenant_based_handle.data.attributes.team_id"
     And the response "data.attributes.tenant_id" has the same value as "tenant_based_handle.data.attributes.tenant_id"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get channel information by name returns "Bad Request" response
     Given new "GetChannelByName" request
     And request contains "tenant_name" parameter from "REPLACE.ME"
@@ -288,7 +288,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get channel information by name returns "Not Found" response
     Given new "GetChannelByName" request
     And request contains "tenant_name" parameter from "REPLACE.ME"
@@ -297,7 +297,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get channel information by name returns "OK" response
     Given new "GetChannelByName" request
     And request contains "tenant_name" parameter from "REPLACE.ME"
@@ -306,35 +306,35 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get tenant-based handle information returns "Bad Request" response
     Given new "GetTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get tenant-based handle information returns "Failed Precondition" response
     Given new "GetTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get tenant-based handle information returns "Not Found" response
     Given new "GetTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Get tenant-based handle information returns "OK" response
     Given new "GetTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Get workflow webhook handle information returns "OK" response
     Given there is a valid "workflows_webhook_handle" in the system
     And new "GetWorkflowsWebhookHandle" request
@@ -342,7 +342,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update Workflows webhook handle returns "Bad Request" response
     Given new "UpdateWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -350,7 +350,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update Workflows webhook handle returns "Conflict" response
     Given new "UpdateWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -358,7 +358,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update Workflows webhook handle returns "Failed Precondition" response
     Given new "UpdateWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -366,7 +366,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update Workflows webhook handle returns "Not Found" response
     Given new "UpdateWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -374,7 +374,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update Workflows webhook handle returns "OK" response
     Given new "UpdateWorkflowsWebhookHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -382,7 +382,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @integration-only @team:DataDog/chat-integrations
+  @integration-only @team:ddoghq/chat-integrations
   Scenario: Update api handle returns "OK" response
     Given there is a valid "tenant_based_handle" in the system
     And new "UpdateTenantBasedHandle" request
@@ -392,7 +392,7 @@ Feature: Microsoft Teams Integration
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "{{tenant_based_handle.data.attributes.name}}--updated"
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update tenant-based handle returns "Bad Request" response
     Given new "UpdateTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -400,7 +400,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update tenant-based handle returns "Conflict" response
     Given new "UpdateTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -408,7 +408,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update tenant-based handle returns "Failed Precondition" response
     Given new "UpdateTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -416,7 +416,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 412 Failed Precondition
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update tenant-based handle returns "Not Found" response
     Given new "UpdateTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -424,7 +424,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: Update tenant-based handle returns "OK" response
     Given new "UpdateTenantBasedHandle" request
     And request contains "handle_id" parameter from "REPLACE.ME"
@@ -432,7 +432,7 @@ Feature: Microsoft Teams Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/chat-integrations
+  @team:ddoghq/chat-integrations
   Scenario: Update workflow webhook handle returns "OK" response
     Given there is a valid "workflows_webhook_handle" in the system
     And new "UpdateWorkflowsWebhookHandle" request
diff --git a/features/v2/model_lab_api.feature b/features/v2/model_lab_api.feature
index 997a9c389f63..98e3eb6d79af 100644
--- a/features/v2/model_lab_api.feature
+++ b/features/v2/model_lab_api.feature
@@ -8,7 +8,7 @@ Feature: Model Lab API
     And a valid "appKeyAuth" key in the system
     And an instance of "ModelLabAPI" API
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Delete a Model Lab run returns "Bad Request" response
     Given operation "DeleteModelLabRun" enabled
     And new "DeleteModelLabRun" request
@@ -16,7 +16,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Delete a Model Lab run returns "No Content" response
     Given operation "DeleteModelLabRun" enabled
     And new "DeleteModelLabRun" request
@@ -24,7 +24,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Delete a Model Lab run returns "Not Found" response
     Given operation "DeleteModelLabRun" enabled
     And new "DeleteModelLabRun" request
@@ -32,7 +32,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Download artifact content returns "OK" response
     Given operation "GetModelLabArtifactContent" enabled
     And new "GetModelLabArtifactContent" request
@@ -41,7 +41,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get Model Lab artifact content returns "Bad Request" response
     Given operation "GetModelLabArtifactContent" enabled
     And new "GetModelLabArtifactContent" request
@@ -50,7 +50,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get Model Lab artifact content returns "OK" response
     Given operation "GetModelLabArtifactContent" enabled
     And new "GetModelLabArtifactContent" request
@@ -59,7 +59,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a Model Lab project returns "Bad Request" response
     Given operation "GetModelLabProject" enabled
     And new "GetModelLabProject" request
@@ -67,7 +67,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Get a Model Lab project returns "Not Found" response
     Given operation "GetModelLabProject" enabled
     And new "GetModelLabProject" request
@@ -75,7 +75,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Get a Model Lab project returns "OK" response
     Given operation "GetModelLabProject" enabled
     And new "GetModelLabProject" request
@@ -83,7 +83,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Get a Model Lab run returns "Bad Request" response
     Given operation "GetModelLabRun" enabled
     And new "GetModelLabRun" request
@@ -91,7 +91,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Get a Model Lab run returns "Not Found" response
     Given operation "GetModelLabRun" enabled
     And new "GetModelLabRun" request
@@ -99,7 +99,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Get a Model Lab run returns "OK" response
     Given operation "GetModelLabRun" enabled
     And new "GetModelLabRun" request
@@ -107,7 +107,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab project artifacts returns "Bad Request" response
     Given operation "ListModelLabProjectArtifacts" enabled
     And new "ListModelLabProjectArtifacts" request
@@ -115,7 +115,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab project artifacts returns "OK" response
     Given operation "ListModelLabProjectArtifacts" enabled
     And new "ListModelLabProjectArtifacts" request
@@ -123,14 +123,14 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab project facet keys returns "OK" response
     Given operation "ListModelLabProjectFacetKeys" enabled
     And new "ListModelLabProjectFacetKeys" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab project facet values returns "Bad Request" response
     Given operation "ListModelLabProjectFacetValues" enabled
     And new "ListModelLabProjectFacetValues" request
@@ -139,7 +139,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab project facet values returns "OK" response
     Given operation "ListModelLabProjectFacetValues" enabled
     And new "ListModelLabProjectFacetValues" request
@@ -148,21 +148,21 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab projects returns "Bad Request" response
     Given operation "ListModelLabProjects" enabled
     And new "ListModelLabProjects" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab projects returns "OK" response
     Given operation "ListModelLabProjects" enabled
     And new "ListModelLabProjects" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run artifacts returns "Bad Request" response
     Given operation "ListModelLabRunArtifacts" enabled
     And new "ListModelLabRunArtifacts" request
@@ -170,7 +170,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run artifacts returns "Not Found" response
     Given operation "ListModelLabRunArtifacts" enabled
     And new "ListModelLabRunArtifacts" request
@@ -178,7 +178,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab run artifacts returns "OK" response
     Given operation "ListModelLabRunArtifacts" enabled
     And new "ListModelLabRunArtifacts" request
@@ -186,7 +186,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet keys returns "Bad Request" response
     Given operation "ListModelLabRunFacetKeys" enabled
     And new "ListModelLabRunFacetKeys" request
@@ -194,7 +194,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet keys returns "Not Found" response
     Given operation "ListModelLabRunFacetKeys" enabled
     And new "ListModelLabRunFacetKeys" request
@@ -202,7 +202,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet keys returns "OK" response
     Given operation "ListModelLabRunFacetKeys" enabled
     And new "ListModelLabRunFacetKeys" request
@@ -210,7 +210,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet values returns "Bad Request" response
     Given operation "ListModelLabRunFacetValues" enabled
     And new "ListModelLabRunFacetValues" request
@@ -220,7 +220,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet values returns "Not Found" response
     Given operation "ListModelLabRunFacetValues" enabled
     And new "ListModelLabRunFacetValues" request
@@ -230,7 +230,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab run facet values returns "OK" response
     Given operation "ListModelLabRunFacetValues" enabled
     And new "ListModelLabRunFacetValues" request
@@ -240,21 +240,21 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: List Model Lab runs returns "Bad Request" response
     Given operation "ListModelLabRuns" enabled
     And new "ListModelLabRuns" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: List Model Lab runs returns "OK" response
     Given operation "ListModelLabRuns" enabled
     And new "ListModelLabRuns" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Pin a Model Lab run returns "Bad Request" response
     Given operation "PinModelLabRun" enabled
     And new "PinModelLabRun" request
@@ -262,7 +262,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Pin a Model Lab run returns "No Content" response
     Given operation "PinModelLabRun" enabled
     And new "PinModelLabRun" request
@@ -270,7 +270,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Pin a Model Lab run returns "Not Found" response
     Given operation "PinModelLabRun" enabled
     And new "PinModelLabRun" request
@@ -278,7 +278,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Remove star from a Model Lab project returns "Bad Request" response
     Given operation "UnstarModelLabProject" enabled
     And new "UnstarModelLabProject" request
@@ -286,7 +286,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Remove star from a Model Lab project returns "No Content" response
     Given operation "UnstarModelLabProject" enabled
     And new "UnstarModelLabProject" request
@@ -294,7 +294,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Remove star from a Model Lab project returns "Not Found" response
     Given operation "UnstarModelLabProject" enabled
     And new "UnstarModelLabProject" request
@@ -302,7 +302,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Star a Model Lab project returns "Bad Request" response
     Given operation "StarModelLabProject" enabled
     And new "StarModelLabProject" request
@@ -310,7 +310,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Star a Model Lab project returns "No Content" response
     Given operation "StarModelLabProject" enabled
     And new "StarModelLabProject" request
@@ -318,7 +318,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 204 No Content
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Star a Model Lab project returns "Not Found" response
     Given operation "StarModelLabProject" enabled
     And new "StarModelLabProject" request
@@ -326,7 +326,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Unpin a Model Lab run returns "Bad Request" response
     Given operation "UnpinModelLabRun" enabled
     And new "UnpinModelLabRun" request
@@ -334,7 +334,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Unpin a Model Lab run returns "No Content" response
     Given operation "UnpinModelLabRun" enabled
     And new "UnpinModelLabRun" request
@@ -342,7 +342,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ml-observability
+  @generated @skip @team:ddoghq/ml-observability
   Scenario: Unpin a Model Lab run returns "Not Found" response
     Given operation "UnpinModelLabRun" enabled
     And new "UnpinModelLabRun" request
@@ -350,7 +350,7 @@ Feature: Model Lab API
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/ml-observability
+  @replay-only @team:ddoghq/ml-observability
   Scenario: Unstar a Model Lab project returns "No Content" response
     Given operation "UnstarModelLabProject" enabled
     And new "UnstarModelLabProject" request
diff --git a/features/v2/monitors.feature b/features/v2/monitors.feature
index 8d30dee5af0f..adda06d2e6cd 100644
--- a/features/v2/monitors.feature
+++ b/features/v2/monitors.feature
@@ -11,7 +11,7 @@ Feature: Monitors
     And a valid "appKeyAuth" key in the system
     And an instance of "Monitors" API
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a downtime duration monitor configuration policy returns "OK" response
     Given new "CreateMonitorConfigPolicy" request
     And body with value {"data": {"attributes": {"policy_type": "downtime", "policy": {"max_duration_ms": 3600000}}, "type": "monitor-config-policy"}}
@@ -21,14 +21,14 @@ Feature: Monitors
     And the response "data.attributes.policy_type" is equal to "downtime"
     And the response "data.attributes.policy.max_duration_ms" is equal to 3600000
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Create a monitor configuration policy returns "Bad Request" response
     Given new "CreateMonitorConfigPolicy" request
     And body with value {"data": {"attributes": {"policy_type": "INVALID", "policy": {"tag_key": "datacenter", "tag_key_required": true, "valid_tag_values": ["prod", "staging"]}}, "type": "monitor-config-policy"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor configuration policy returns "OK" response
     Given new "CreateMonitorConfigPolicy" request
     And body with value {"data": {"attributes": {"policy_type": "tag", "policy": {"tag_key": "{{ unique_lower_alnum }}", "tag_key_required": false, "valid_tag_values": ["prod", "staging"]}}, "type": "monitor-config-policy"}}
@@ -39,14 +39,14 @@ Feature: Monitors
     And the response "data.attributes.policy.tag_key" is equal to "{{ unique_lower_alnum }}"
     And the response "data.attributes.policy.valid_tag_values" is equal to ["prod", "staging"]
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Create a monitor notification rule returns "Bad Request" response
     Given new "CreateMonitorNotificationRule" request
     And body with value {"data": {"attributes": {"filter": {"tags": ["test:{{ unique_lower }}", "host:abc"]}, "name": "test rule", "recipients": ["@slack-test-channel", "@jira-test"]}, "type": "monitor-notification-rule"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor notification rule returns "OK" response
     Given new "CreateMonitorNotificationRule" request
     And body with value {"data": {"attributes": {"filter": {"tags": ["test:{{ unique_lower }}"]}, "name": "test rule", "recipients": ["slack-test-channel", "jira-test"]}, "type": "monitor-notification-rule"}}
@@ -54,7 +54,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "test rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor notification rule with bundle config returns "OK" response
     Given new "CreateMonitorNotificationRule" request
     And body with value {"data": {"attributes": {"filter": {"tags": ["test:{{ unique_lower }}"]}, "name": "test rule", "recipients": ["slack-test-channel"], "bundle_config": {"duration": 3600}}, "type": "monitor-notification-rule"}}
@@ -62,7 +62,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "test rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor notification rule with conditional recipients returns "OK" response
     Given new "CreateMonitorNotificationRule" request
     And body with value {"data": {"attributes": {"filter": {"tags": ["test:{{ unique_lower }}"]}, "name": "test rule", "conditional_recipients": {"conditions": [{"scope": "transition_type:is_alert", "recipients": ["slack-test-channel", "jira-test"]}]}}, "type": "monitor-notification-rule"}}
@@ -70,7 +70,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "test rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor notification rule with scope returns "OK" response
     Given new "CreateMonitorNotificationRule" request
     And body with value {"data": {"attributes": {"filter": {"scope": "test:{{ unique_lower }}"}, "name": "test rule", "recipients": ["slack-test-channel", "jira-test"]}, "type": "monitor-notification-rule"}}
@@ -78,7 +78,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "test rule"
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Create a monitor user template returns "Bad Request" response
     Given new "CreateMonitorUserTemplate" request
     And operation "CreateMonitorUserTemplate" enabled
@@ -86,7 +86,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Create a monitor user template returns "OK" response
     Given new "CreateMonitorUserTemplate" request
     And operation "CreateMonitorUserTemplate" enabled
@@ -94,21 +94,21 @@ Feature: Monitors
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor configuration policy returns "Bad Request" response
     Given new "DeleteMonitorConfigPolicy" request
     And request contains "policy_id" parameter with value "INVALID_UUID"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor configuration policy returns "Not Found" response
     Given new "DeleteMonitorConfigPolicy" request
     And request contains "policy_id" parameter with value "00000000-0000-1234-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor configuration policy returns "OK" response
     Given there is a valid "monitor_configuration_policy" in the system
     And new "DeleteMonitorConfigPolicy" request
@@ -116,14 +116,14 @@ Feature: Monitors
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor notification rule returns "Not Found" response
     Given new "DeleteMonitorNotificationRule" request
     And request contains "rule_id" parameter with value "00000000-0000-1234-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor notification rule returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "DeleteMonitorNotificationRule" request
@@ -131,7 +131,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Delete a monitor user template returns "Not Found" response
     Given new "DeleteMonitorUserTemplate" request
     And operation "DeleteMonitorUserTemplate" enabled
@@ -139,7 +139,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/monitor-app
+  @generated @skip @team:ddoghq/monitor-app
   Scenario: Delete a monitor user template returns "OK" response
     Given operation "DeleteMonitorUserTemplate" enabled
     And new "DeleteMonitorUserTemplate" request
@@ -147,7 +147,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Edit a monitor configuration policy returns "Not Found" response
     Given new "UpdateMonitorConfigPolicy" request
     And request contains "policy_id" parameter with value "00000000-0000-1234-0000-000000000000"
@@ -155,7 +155,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Edit a monitor configuration policy returns "OK" response
     Given there is a valid "monitor_configuration_policy" in the system
     And new "UpdateMonitorConfigPolicy" request
@@ -169,7 +169,7 @@ Feature: Monitors
     And the response "data.attributes.policy.tag_key" is equal to "{{ unique_lower_alnum }}"
     And the response "data.attributes.policy.valid_tag_values" is equal to ["prod", "staging"]
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Edit a monitor configuration policy returns "Unprocessable Entity" response
     Given there is a valid "monitor_configuration_policy" in the system
     And new "UpdateMonitorConfigPolicy" request
@@ -178,14 +178,14 @@ Feature: Monitors
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor configuration policy returns "Not Found" response
     Given new "GetMonitorConfigPolicy" request
     And request contains "policy_id" parameter with value "12340000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor configuration policy returns "OK" response
     Given there is a valid "monitor_configuration_policy" in the system
     And new "GetMonitorConfigPolicy" request
@@ -198,14 +198,14 @@ Feature: Monitors
     And the response "data.attributes.policy.tag_key" is equal to "{{ unique_lower_alnum }}"
     And the response "data.attributes.policy.valid_tag_values" is equal to ["prod", "staging"]
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor notification rule returns "Not Found" response
     Given new "GetMonitorNotificationRule" request
     And request contains "rule_id" parameter with value "00000000-0000-1234-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor notification rule returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "GetMonitorNotificationRule" request
@@ -214,7 +214,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "test rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor user template returns "Not Found" response
     Given new "GetMonitorUserTemplate" request
     And operation "GetMonitorUserTemplate" enabled
@@ -222,7 +222,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get a monitor user template returns "OK" response
     Given there is a valid "monitor_user_template" in the system
     And new "GetMonitorUserTemplate" request
@@ -232,7 +232,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.type" is equal to "monitor-user-template"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all monitor configuration policies returns "OK" response
     Given there is a valid "monitor_configuration_policy" in the system
     And new "ListMonitorConfigPolicies" request
@@ -244,7 +244,7 @@ Feature: Monitors
     And the response "data" has item with field "attributes.policy.tag_key" with value "{{ unique_lower_alnum }}"
     And the response "data" has item with field "attributes.policy.valid_tag_values" with value ["prod", "staging"]
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all monitor notification rules returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "GetMonitorNotificationRules" request
@@ -252,7 +252,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data" has item with field "attributes.name" with value "test rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Get all monitor user templates returns "OK" response
     Given there is a valid "monitor_user_template" in the system
     And new "ListMonitorUserTemplates" request
@@ -264,7 +264,7 @@ Feature: Monitors
     And the response "data" has item with field "attributes.description" with value "It's a threshold"
     And the response "data" has item with field "attributes.monitor_definition.message" with value "cats"
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule returns "Bad Request" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "UpdateMonitorNotificationRule" request
@@ -273,7 +273,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule returns "Not Found" response
     Given new "UpdateMonitorNotificationRule" request
     And request contains "rule_id" parameter with value "00000000-0000-1234-0000-000000000000"
@@ -281,7 +281,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "UpdateMonitorNotificationRule" request
@@ -291,7 +291,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "updated rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule with bundle config returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "UpdateMonitorNotificationRule" request
@@ -301,7 +301,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "updated rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule with conditional_recipients returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "UpdateMonitorNotificationRule" request
@@ -311,7 +311,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "updated rule"
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor notification rule with scope returns "OK" response
     Given there is a valid "monitor_notification_rule" in the system
     And new "UpdateMonitorNotificationRule" request
@@ -321,7 +321,7 @@ Feature: Monitors
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "updated rule"
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Update a monitor user template to a new version returns "Bad Request" response
     Given there is a valid "monitor_user_template" in the system
     And operation "UpdateMonitorUserTemplate" enabled
@@ -331,7 +331,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor user template to a new version returns "Not Found" response
     Given new "UpdateMonitorUserTemplate" request
     And operation "UpdateMonitorUserTemplate" enabled
@@ -340,7 +340,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Update a monitor user template to a new version returns "OK" response
     Given there is a valid "monitor_user_template" in the system
     And new "UpdateMonitorUserTemplate" request
@@ -350,7 +350,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Validate a monitor user template returns "Bad Request" response
     Given new "ValidateMonitorUserTemplate" request
     And operation "ValidateMonitorUserTemplate" enabled
@@ -358,7 +358,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate a monitor user template returns "OK" response
     Given new "ValidateMonitorUserTemplate" request
     And operation "ValidateMonitorUserTemplate" enabled
@@ -366,7 +366,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 204 OK
 
-  @skip-validation @team:DataDog/monitor-app
+  @skip-validation @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor user template returns "Bad Request" response
     Given there is a valid "monitor_user_template" in the system
     And new "ValidateExistingMonitorUserTemplate" request
@@ -376,7 +376,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor user template returns "Not Found" response
     Given new "ValidateExistingMonitorUserTemplate" request
     And operation "ValidateExistingMonitorUserTemplate" enabled
@@ -385,7 +385,7 @@ Feature: Monitors
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/monitor-app
+  @team:ddoghq/monitor-app
   Scenario: Validate an existing monitor user template returns "OK" response
     Given there is a valid "monitor_user_template" in the system
     And new "ValidateExistingMonitorUserTemplate" request
diff --git a/features/v2/network_device_monitoring.feature b/features/v2/network_device_monitoring.feature
index 165564dc39c4..03c15445839f 100644
--- a/features/v2/network_device_monitoring.feature
+++ b/features/v2/network_device_monitoring.feature
@@ -10,14 +10,14 @@ Feature: Network Device Monitoring
     And a valid "appKeyAuth" key in the system
     And an instance of "NetworkDeviceMonitoring" API
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the device details returns "Not Found" response
     Given new "GetDevice" request
     And request contains "device_id" parameter with value "unknown_device_id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the device details returns "OK" response
     Given new "GetDevice" request
     And request contains "device_id" parameter with value "default_device"
@@ -40,13 +40,13 @@ Feature: Network Device Monitoring
     And the response "data.attributes.sys_object_id" is equal to "1.3.6.1.4.1.99999"
     And the response "data.attributes.tags" is equal to ["device_ip:1.2.3.4","device_id:default_device"]
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the list of devices returns "Bad Request" response
     Given new "ListDevices" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the list of devices returns "OK" response
     Given new "ListDevices" request
     And request contains "page[size]" parameter with value 1
@@ -75,13 +75,13 @@ Feature: Network Device Monitoring
     And the response "data[0].attributes.interface_statuses.down" is equal to 13
     And the response "meta.page.total_filtered_count" is equal to 1
 
-  @generated @skip @team:DataDog/network-device-monitoring @with-pagination
+  @generated @skip @team:ddoghq/network-device-monitoring @with-pagination
   Scenario: Get the list of devices returns "OK" response with pagination
     Given new "ListDevices" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the list of interfaces of the device returns "OK" response
     Given new "GetInterfaces" request
     And request contains "device_id" parameter with value "default:1.2.3.4"
@@ -106,14 +106,14 @@ Feature: Network Device Monitoring
     And the response "data[1].attributes.index" is equal to 999
     And the response "data[1].attributes.status" is equal to "down"
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the list of tags for a device returns "Not Found" response
     Given new "ListDeviceUserTags" request
     And request contains "device_id" parameter with value "unknown_device_id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Get the list of tags for a device returns "OK" response
     Given new "ListDeviceUserTags" request
     And request contains "device_id" parameter with value "default_device"
@@ -124,14 +124,14 @@ Feature: Network Device Monitoring
     And the response "data.attributes.tags[0]" is equal to "tag:test"
     And the response "data.attributes.tags[1]" is equal to "tag:testbis"
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: List tags for an interface returns "Not Found" response
     Given new "ListInterfaceUserTags" request
     And request contains "interface_id" parameter with value "unknown_interface_id"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: List tags for an interface returns "OK" response
     Given new "ListInterfaceUserTags" request
     And request contains "interface_id" parameter with value "example:1.2.3.4:1"
@@ -142,7 +142,7 @@ Feature: Network Device Monitoring
     And the response "data.attributes.tags[0]" is equal to "tag:test"
     And the response "data.attributes.tags[1]" is equal to "tag:testbis"
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Update the tags for a device returns "Not Found" response
     Given new "UpdateDeviceUserTags" request
     And request contains "device_id" parameter with value "unknown_device_id"
@@ -150,7 +150,7 @@ Feature: Network Device Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Update the tags for a device returns "OK" response
     Given new "UpdateDeviceUserTags" request
     And request contains "device_id" parameter with value "default_device"
@@ -162,7 +162,7 @@ Feature: Network Device Monitoring
     And the response "data.attributes.tags[0]" is equal to "tag:test"
     And the response "data.attributes.tags[1]" is equal to "tag:testbis"
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Update the tags for an interface returns "Not Found" response
     Given new "UpdateInterfaceUserTags" request
     And request contains "interface_id" parameter with value "unknown_interface_id"
@@ -170,7 +170,7 @@ Feature: Network Device Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/network-device-monitoring
+  @replay-only @team:ddoghq/network-device-monitoring
   Scenario: Update the tags for an interface returns "OK" response
     Given new "UpdateInterfaceUserTags" request
     And request contains "interface_id" parameter with value "example:1.2.3.4:1"
diff --git a/features/v2/network_health_insights.feature b/features/v2/network_health_insights.feature
index c5036b6af542..0ddd8476f9c7 100644
--- a/features/v2/network_health_insights.feature
+++ b/features/v2/network_health_insights.feature
@@ -12,12 +12,12 @@ Feature: Network Health Insights
     And operation "ListNetworkHealthInsights" enabled
     And new "ListNetworkHealthInsights" request
 
-  @generated @skip @team:DataDog/cloud-network-monitoring
+  @generated @skip @team:ddoghq/cloud-network-monitoring
   Scenario: List network health insights returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-network-monitoring
+  @generated @skip @team:ddoghq/cloud-network-monitoring
   Scenario: List network health insights returns "OK" response
     When the request is sent
     Then the response status is 200 OK
diff --git a/features/v2/oauth2_client_public.feature b/features/v2/oauth2_client_public.feature
index a5c7d195efa7..d6f9d88beedf 100644
--- a/features/v2/oauth2_client_public.feature
+++ b/features/v2/oauth2_client_public.feature
@@ -8,7 +8,7 @@ Feature: OAuth2 Client Public
     And a valid "appKeyAuth" key in the system
     And an instance of "OAuth2ClientPublic" API
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete an OAuth2 client scopes restriction returns "Bad Request" response
     Given operation "DeleteScopesRestriction" enabled
     And new "DeleteScopesRestriction" request
@@ -16,7 +16,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete an OAuth2 client scopes restriction returns "No Content" response
     Given operation "DeleteScopesRestriction" enabled
     And new "DeleteScopesRestriction" request
@@ -24,7 +24,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete an OAuth2 client scopes restriction returns "Not Found" response
     Given operation "DeleteScopesRestriction" enabled
     And new "DeleteScopesRestriction" request
@@ -32,7 +32,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get an OAuth2 client scopes restriction returns "Bad Request" response
     Given operation "GetScopesRestriction" enabled
     And new "GetScopesRestriction" request
@@ -40,7 +40,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get an OAuth2 client scopes restriction returns "Not Found" response
     Given operation "GetScopesRestriction" enabled
     And new "GetScopesRestriction" request
@@ -48,7 +48,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get an OAuth2 client scopes restriction returns "OK" response
     Given operation "GetScopesRestriction" enabled
     And new "GetScopesRestriction" request
@@ -56,7 +56,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Register an OAuth2 client returns "Bad Request" response
     Given operation "RegisterOAuthClient" enabled
     And new "RegisterOAuthClient" request
@@ -64,7 +64,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Register an OAuth2 client returns "Created" response
     Given operation "RegisterOAuthClient" enabled
     And new "RegisterOAuthClient" request
@@ -72,7 +72,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Upsert an OAuth2 client scopes restriction returns "Bad Request" response
     Given operation "UpsertScopesRestriction" enabled
     And new "UpsertScopesRestriction" request
@@ -81,7 +81,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Upsert an OAuth2 client scopes restriction returns "Not Found" response
     Given operation "UpsertScopesRestriction" enabled
     And new "UpsertScopesRestriction" request
@@ -90,7 +90,7 @@ Feature: OAuth2 Client Public
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Upsert an OAuth2 client scopes restriction returns "OK" response
     Given operation "UpsertScopesRestriction" enabled
     And new "UpsertScopesRestriction" request
diff --git a/features/v2/observability_pipelines.feature b/features/v2/observability_pipelines.feature
index a25563f62ae0..261e6f4bd6e5 100644
--- a/features/v2/observability_pipelines.feature
+++ b/features/v2/observability_pipelines.feature
@@ -8,21 +8,21 @@ Feature: Observability Pipelines
     And a valid "appKeyAuth" key in the system
     And an instance of "ObservabilityPipelines" API
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Create a new pipeline returns "Bad Request" response
     Given new "CreatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "unknown-processor", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Main Observability Pipeline"}, "type": "pipelines"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/observability-pipelines
+  @generated @skip @team:ddoghq/observability-pipelines
   Scenario: Create a new pipeline returns "Conflict" response
     Given new "CreatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "pipeline_type": "logs", "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}, {"enabled": true, "field": "message", "id": "json-processor", "include": "*", "type": "parse_json"}]}], "processors": [], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Main Observability Pipeline"}, "type": "pipelines"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Create a new pipeline returns "OK" response
     Given new "CreatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Main Observability Pipeline"}, "type": "pipelines"}}
@@ -35,7 +35,7 @@ Feature: Observability Pipelines
     And the response "data.attributes.config.processor_groups" has length 1
     And the response "data.attributes.config.destinations" has length 1
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Create a pipeline with dedupe processor with cache returns "OK" response
     Given new "CreatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "dedupe-processor", "include": "service:my-service", "type": "dedupe", "fields": ["message"], "mode": "match", "cache": {"num_events": 5000}}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Dedupe Cache"}, "type": "pipelines"}}
@@ -44,7 +44,7 @@ Feature: Observability Pipelines
     And the response "data.attributes.config.processor_groups[0].processors[0].type" is equal to "dedupe"
     And the response "data.attributes.config.processor_groups[0].processors[0].cache.num_events" is equal to 5000
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Create a pipeline with dedupe processor without cache returns "OK" response
     Given new "CreatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "dedupe-processor", "include": "service:my-service", "type": "dedupe", "fields": ["message"], "mode": "match"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Dedupe No Cache"}, "type": "pipelines"}}
@@ -53,21 +53,21 @@ Feature: Observability Pipelines
     And the response "data.attributes.config.processor_groups[0].processors[0].type" is equal to "dedupe"
     And the response "data.attributes.config.processor_groups[0].processors[0].fields[0]" is equal to "message"
 
-  @generated @skip @team:DataDog/observability-pipelines
+  @generated @skip @team:ddoghq/observability-pipelines
   Scenario: Delete a pipeline returns "Conflict" response
     Given new "DeletePipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Delete a pipeline returns "Not Found" response
     Given new "DeletePipeline" request
     And request contains "pipeline_id" parameter with value "3fa85f64-5717-4562-b3fc-2c963f66afa6"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Delete a pipeline returns "OK" response
     Given there is a valid "pipeline" in the system
     And new "DeletePipeline" request
@@ -75,7 +75,7 @@ Feature: Observability Pipelines
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Get a specific pipeline returns "OK" response
     Given there is a valid "pipeline" in the system
     And new "GetPipeline" request
@@ -89,14 +89,14 @@ Feature: Observability Pipelines
     And the response "data.attributes.config.processor_groups" has length 1
     And the response "data.attributes.config.destinations" has length 1
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: List pipelines returns "Bad Request" response
     Given new "ListPipelines" request
     And request contains "page[size]" parameter with value 0
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: List pipelines returns "OK" response
     Given there is a valid "pipeline" in the system
     And new "ListPipelines" request
@@ -108,7 +108,7 @@ Feature: Observability Pipelines
     And the response "data[0].attributes.config.sources[0]" has field "id"
     And the response "data[0].attributes.config.destinations[0]" has field "id"
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Update a pipeline returns "Bad Request" response
     Given new "UpdatePipeline" request
     And there is a valid "pipeline" in the system
@@ -117,7 +117,7 @@ Feature: Observability Pipelines
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/observability-pipelines
+  @generated @skip @team:ddoghq/observability-pipelines
   Scenario: Update a pipeline returns "Conflict" response
     Given new "UpdatePipeline" request
     And request contains "pipeline_id" parameter from "REPLACE.ME"
@@ -125,7 +125,7 @@ Feature: Observability Pipelines
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Update a pipeline returns "Not Found" response
     Given new "UpdatePipeline" request
     And request contains "pipeline_id" parameter with value "3fa85f64-5717-4562-b3fc-2c963f66afa6"
@@ -133,7 +133,7 @@ Feature: Observability Pipelines
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Update a pipeline returns "OK" response
     Given there is a valid "pipeline" in the system
     And new "UpdatePipeline" request
@@ -149,7 +149,7 @@ Feature: Observability Pipelines
     And the response "data.attributes.config.destinations" has length 1
     And the response "data.attributes.config.destinations[0].id" is equal to "updated-datadog-logs-destination-id"
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate a metrics pipeline with enrichment table processor file lookup returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"pipeline_type": "metrics", "destinations": [{"id": "datadog-metrics-destination", "inputs": ["my-processor-group"], "type": "datadog_metrics"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "*", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "enrichment-table-processor", "include": "*", "type": "enrichment_table", "file": {"encoding": {"delimiter": ",", "type": "csv", "includes_headers": true}, "key": {"column": "service", "source": {"type": "tag", "name": "service"}}, "path": "/etc/enrichment/lookup.csv"}}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Metrics Pipeline with Enrichment Table File Lookup"}, "type": "pipelines"}}
@@ -157,7 +157,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate a metrics pipeline with enrichment table processor reference table returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"pipeline_type": "metrics", "destinations": [{"id": "datadog-metrics-destination", "inputs": ["my-processor-group"], "type": "datadog_metrics"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "*", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "enrichment-table-processor", "include": "*", "type": "enrichment_table", "reference_table": {"table_id": "metric-enrichment", "key": {"source": {"type": "metric_name"}}, "columns": ["environment", "team"]}}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Metrics Pipeline with Enrichment Table Reference Table"}, "type": "pipelines"}}
@@ -165,7 +165,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate a metrics pipeline with opentelemetry source returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"pipeline_type": "metrics", "destinations": [{"id": "datadog-metrics-destination", "inputs": ["my-processor-group"], "type": "datadog_metrics"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "*", "inputs": ["opentelemetry-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "env:production", "type": "filter"}]}], "sources": [{"id": "opentelemetry-source", "type": "opentelemetry"}]}, "name": "Metrics OTel Pipeline"}, "type": "pipelines"}}
@@ -173,7 +173,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline returns "Bad Request" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Main Observability Pipeline"}, "type": "pipelines"}}
@@ -184,7 +184,7 @@ Feature: Observability Pipelines
     And the response "errors[0].meta.id" is equal to "filter-processor"
     And the response "errors[0].meta.message" is equal to "Field 'include' is required"
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Main Observability Pipeline"}, "type": "pipelines"}}
@@ -192,7 +192,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with ClickHouse destination arrow_stream format returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "clickhouse-destination", "inputs": ["my-processor-group"], "type": "clickhouse", "table": "application_logs", "database": "my_database", "format": "arrow_stream", "batch_encoding": {"codec": "arrow_stream", "allow_nullable_fields": false}, "compression": "gzip", "auth": {"strategy": "basic", "username_key": "CLICKHOUSE_USERNAME", "password_key": "CLICKHOUSE_PASSWORD"}, "batch": {"max_events": 1000, "timeout_secs": 1}}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with ClickHouse Destination Arrow Stream"}, "type": "pipelines"}}
@@ -200,7 +200,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with ClickHouse destination returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "clickhouse-destination", "inputs": ["my-processor-group"], "type": "clickhouse", "table": "application_logs", "database": "my_database", "compression": "gzip", "auth": {"strategy": "basic", "username_key": "CLICKHOUSE_USERNAME", "password_key": "CLICKHOUSE_PASSWORD"}, "batch": {"max_events": 1000, "timeout_secs": 1}}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with ClickHouse Destination"}, "type": "pipelines"}}
@@ -208,7 +208,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with ClickHouse destination with all fields set returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "clickhouse-destination", "inputs": ["my-processor-group"], "type": "clickhouse", "endpoint_url_key": "CLICKHOUSE_ENDPOINT_URL", "database": "my_database", "table": "application_logs", "format": "arrow_stream", "skip_unknown_fields": true, "date_time_best_effort": true, "compression": {"algorithm": "gzip", "level": 6}, "auth": {"strategy": "basic", "username_key": "CLICKHOUSE_USERNAME", "password_key": "CLICKHOUSE_PASSWORD"}, "batch": {"max_events": 1000, "timeout_secs": 1}, "batch_encoding": {"codec": "arrow_stream", "allow_nullable_fields": true}, "tls": {"crt_file": "/path/to/cert.crt", "ca_file": "/path/to/ca.crt", "key_file": "/path/to/key.key", "key_pass_key": "TLS_KEY_PASSPHRASE"}, "buffer": {"type": "memory", "max_events": 500, "when_full": "block"}}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with ClickHouse Destination All Fields"}, "type": "pipelines"}}
@@ -216,7 +216,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with HTTP server source valid_tokens returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["http-server-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "http-server-source", "type": "http_server", "auth_strategy": "none", "decoding": "json", "valid_tokens": [{"token_key": "HTTP_SERVER_TOKEN", "enabled": true, "path_to_token": {"header": "X-Token"}, "field_to_add": {"key": "token_name", "value": "primary_token"}}, {"token_key": "HTTP_SERVER_TOKEN_BACKUP", "enabled": true, "path_to_token": "path"}]}]}, "name": "Pipeline with HTTP server valid_tokens"}, "type": "pipelines"}}
@@ -224,7 +224,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with OCSF mapper custom mapping returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "ocsf-mapper-processor", "include": "service:my-service", "mappings": [{"include": "source:custom", "mapping": {"mapping": [{"default": "", "dest": "time", "source": "timestamp"}, {"default": "", "dest": "severity", "source": "level"}, {"default": "", "dest": "device.type", "lookup": {"table": [{"contains": "Desktop", "value": "desktop"}]}, "source": "host.type"}], "metadata": {"class": "Device Inventory Info", "profiles": ["container"], "version": "1.3.0"}, "version": 1}}], "type": "ocsf_mapper"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "OCSF Custom Mapper Pipeline"}, "type": "pipelines"}}
@@ -232,14 +232,14 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with OCSF mapper invalid custom mapping returns "Bad Request" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "ocsf-mapper-processor", "include": "service:my-service", "mappings": [{"include": "source:custom", "mapping": {"mapping": [{"dest": "time", "source": "timestamp"}], "metadata": {"class": "Invalid Class", "profiles": ["container"], "version": "1.3.0"}, "version": 0}}], "type": "ocsf_mapper"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "OCSF Invalid Mapper Pipeline"}, "type": "pipelines"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with OCSF mapper keep_unmatched returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "ocsf-mapper-processor", "include": "service:my-service", "type": "ocsf_mapper", "keep_unmatched": true, "mappings": [{"include": "source:cloudtrail", "mapping": "CloudTrail Account Change"}]}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "OCSF Mapper Keep Unmatched Pipeline"}, "type": "pipelines"}}
@@ -247,7 +247,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with OCSF mapper library mapping returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "ocsf-mapper-processor", "include": "service:my-service", "type": "ocsf_mapper", "mappings": [{"include": "source:cloudtrail", "mapping": "CloudTrail Account Change"}]}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "OCSF Mapper Pipeline"}, "type": "pipelines"}}
@@ -255,7 +255,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with Splunk HEC destination endpoint_target returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "splunk-hec-destination", "inputs": ["my-processor-group"], "type": "splunk_hec", "token_key": "SPLUNK_HEC_TOKEN", "endpoint_target": "raw"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Splunk HEC endpoint_target"}, "type": "pipelines"}}
@@ -263,7 +263,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with Splunk HEC destination token_strategy returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "splunk-hec-destination", "inputs": ["my-processor-group"], "type": "splunk_hec", "token_key": "SPLUNK_HEC_TOKEN", "token_strategy": "custom"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Splunk HEC token_strategy"}, "type": "pipelines"}}
@@ -271,7 +271,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with Splunk HEC source store_hec_token returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["splunk-hec-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "splunk-hec-source", "type": "splunk_hec", "store_hec_token": true}]}, "name": "Pipeline with Splunk HEC store_hec_token"}, "type": "pipelines"}}
@@ -279,7 +279,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with Splunk HEC source valid_tokens returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["splunk-hec-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "splunk-hec-source", "type": "splunk_hec", "valid_tokens": [{"token_key": "SPLUNK_HEC_TOKEN", "enabled": true, "field_to_add": {"key": "token_name", "value": "primary_token"}}, {"token_key": "SPLUNK_HEC_TOKEN_BACKUP", "enabled": false}]}]}, "name": "Pipeline with Splunk HEC valid_tokens"}, "type": "pipelines"}}
@@ -287,7 +287,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with Splunk TCP source max_connection_duration_secs returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["splunk-tcp-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "splunk-tcp-source", "type": "splunk_tcp", "max_connection_duration_secs": 3600}]}, "name": "Pipeline with Splunk TCP max connection duration"}, "type": "pipelines"}}
@@ -295,7 +295,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with amazon S3 source compression returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["amazon-s3-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "service:my-service", "type": "filter"}]}], "sources": [{"id": "amazon-s3-source", "type": "amazon_s3", "region": "us-east-1", "compression": "gzip"}]}, "name": "Pipeline with S3 Source Compression"}, "type": "pipelines"}}
@@ -303,7 +303,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @skip @team:DataDog/observability-pipelines
+  @skip @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with cloud_prem destination buffer returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "cloud-prem-destination", "inputs": ["my-processor-group"], "type": "cloud_prem", "endpoint_url_key": "CLOUDPREM_ENDPOINT_URL", "buffer": {"type": "disk", "max_size": 1073741824, "when_full": "block"}}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with CloudPrem Buffer"}, "type": "pipelines"}}
@@ -311,7 +311,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with destination secret key returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "sumo-logic-destination", "inputs": ["my-processor-group"], "type": "sumo_logic", "endpoint_url_key": "SUMO_LOGIC_ENDPOINT_URL"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Secret Key"}, "type": "pipelines"}}
@@ -319,7 +319,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with enrichment table secret field lookup returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "enrichment-processor", "include": "*", "target": "enriched", "type": "enrichment_table", "file": {"encoding": {"delimiter": ",", "type": "csv", "includes_headers": true}, "key": [{"column": "user_id", "comparison": "equals", "field": {"secret": "LOOKUP_KEY_SECRET"}}], "path": "/etc/enrichment/lookup.csv", "schema": [{"column": "user_id", "type": "string"}]}}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Enrichment Table Secret Field Lookup"}, "type": "pipelines"}}
@@ -327,7 +327,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with parse grok processor include rules returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "parse-grok-processor", "include": "*", "type": "parse_grok", "field": "content", "rules": [{"include": "service:foo", "match_rules": [{"name": "MyParsingRule", "rule": "%{word:user}"}]}]}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Parse Grok Include Rules"}, "type": "pipelines"}}
@@ -335,7 +335,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with parse grok processor source rules returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["datadog-agent-source"], "processors": [{"enabled": true, "id": "parse-grok-processor", "include": "*", "type": "parse_grok", "rules": [{"source": "message", "match_rules": [{"name": "MyParsingRule", "rule": "%{word:user}"}]}]}]}], "sources": [{"id": "datadog-agent-source", "type": "datadog_agent"}]}, "name": "Pipeline with Parse Grok Source Rules"}, "type": "pipelines"}}
@@ -343,7 +343,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with source secret key returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["http-client-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "http-client-source", "type": "http_client", "decoding": "bytes", "scrape_interval_secs": 15, "scrape_timeout_secs": 5, "auth_strategy": "bearer", "token_key": "HTTP_CLIENT_TOKEN"}]}, "name": "Pipeline with Source Secret"}, "type": "pipelines"}}
@@ -351,7 +351,7 @@ Feature: Observability Pipelines
     Then the response status is 200 OK
     And the response "errors" has length 0
 
-  @team:DataDog/observability-pipelines
+  @team:ddoghq/observability-pipelines
   Scenario: Validate an observability pipeline with websocket source bearer auth returns "OK" response
     Given new "ValidatePipeline" request
     And body with value {"data": {"attributes": {"config": {"destinations": [{"id": "datadog-logs-destination", "inputs": ["my-processor-group"], "type": "datadog_logs"}], "processor_groups": [{"enabled": true, "id": "my-processor-group", "include": "service:my-service", "inputs": ["websocket-source"], "processors": [{"enabled": true, "id": "filter-processor", "include": "status:error", "type": "filter"}]}], "sources": [{"id": "websocket-source", "type": "websocket", "decoding": "json", "auth_strategy": "bearer", "token_key": "WS_BEARER_TOKEN", "uri_key": "WS_URI", "tls": {"mode": "enabled"}}]}, "name": "Pipeline with WebSocket Source"}, "type": "pipelines"}}
diff --git a/features/v2/oci_integration.feature b/features/v2/oci_integration.feature
index d86ac85a76ca..07a8b8a3ecaf 100644
--- a/features/v2/oci_integration.feature
+++ b/features/v2/oci_integration.feature
@@ -7,41 +7,41 @@ Feature: OCI Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "OCIIntegration" API
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: Create tenancy config returns "Created" response
     Given new "CreateTenancyConfig" request
     And body with value {"data": {"attributes": {"auth_credentials": {"fingerprint": "", "private_key": "----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCdvSMmlfLyeD4M\nQsA3WlrWBqKdWa5eVV3/uODyqT3wWMEMIJHcG3/quNs8nh9xrK1/JkQT2qoKEHqR\nC5k59jN6Vp8em8ARJthMgam9K37ELt+IQ/G8ySTSuqZG8T4cHp/cs3fAclNqttOl\nYnGr4RbVAgMBAAECggEAGZNLGbyCUbIRTW6Kh4d8ZVC+eZtJMqGmGJ3KfVaW8Pjn\nQGWfSuJCEe2o2Y8G3phlidFauICnZ44enXA17Rhi+I/whnr7FIyQk2bR7rv+1Uhc\nmOJygWX5eFFMsledgVAdIAl9Luk2nykx7Un3g6rtbl/Vs+5k4m7ITLFMpCHzsJLU\nnm8kBzDOqY2JUkMd08nL88KL6QywWtal05UESzQpNFXd0e5kxYfexeMCsLsWP0mc\nquMLRbn7NuBjCbe9VU2kmIvcfDDaWjurT7d5m1OXx1cc8p6P4PFZTVyCjdhiWOr3\nLQXZ4/vdZNR3zgEHypRoM6D9Yq99LWUOUEMrdiSLQQKBgQDQkh7C1OtAXnpy7F6R\nW+/I3zBHici2p7A57UT7VECQ1IVGg37/uus83DkuOtdZ33JmHLAVrwLFJvUlbyjx\nl6dc/1ms40L5HFdLgaVtd4k0rSPFeOSDr6evz0lX4yBuzlP0fEh+o3XHW7mwe2G+\nrWCULF/Uqza66fjbCSKMNgLIXQKBgQDBm9nZg/s4S0THWCFNWcB1tXBG0p/sH5eY\nPC1H/VmTEINIixStrS4ufczf31X8rcoSjSbO7+vZDTTATdk7OLn1I2uGFVYl8M59\n86BYT2Hi7cwp7YVzOc/cJigVeBAqSRW/iYYyWBEUTiW1gbkV0sRWwhPp67m+c0sP\nXpY/iEZA2QKBgB1w8tynt4l/jKNaUEMOijt9ndALWATIiOy0XG9pxi9rgGCiwTOS\nDBCsOXoYHjv2eayGUijNaoOv6xzcoxfvQ1WySdNIxTRq1ru20kYwgHKqGgmO9hrM\nmcwMY5r/WZ2qjFlPjeAqbL62aPDLidGjoaVo2iIoBPK/gjxQ/5f0MS4N/YQ0zWoYBueSQ0DGs\n-----END PRIVATE KEY-----"}, "config_version": null, "cost_collection_enabled": true, "dd_compartment_id": "ocid.compartment.test", "dd_stack_id": "ocid.stack.test", "home_region": "us-ashburn-1", "logs_config": {"compartment_tag_filters": ["datadog:true", "env:prod"], "enabled": true, "enabled_services": ["service_1", "service_2"]}, "metrics_config": {"compartment_tag_filters": ["datadog:true", "env:prod"], "enabled": true, "excluded_services": ["service_1", "service_2"]}, "regions_config": {"available": ["us-ashburn-1", "us-phoenix-1"], "disabled": ["us-phoenix-1"], "enabled": ["us-ashburn-1"]}, "resource_collection_enabled": true, "user_ocid": "ocid.user.test"}, "id": "ocid.tenancy.test", "type": "oci_tenancy"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: Delete tenancy config returns "No Content" response
     Given new "DeleteTenancyConfig" request
     And request contains "tenancy_ocid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: Get tenancy config returns "OK" response
     Given new "GetTenancyConfig" request
     And request contains "tenancy_ocid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: Get tenancy configs returns "OK" response
     Given new "GetTenancyConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: List tenancy products returns "OK" response
     Given new "ListTenancyProducts" request
     And request contains "productKeys" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/emerging-cloud-integrations
+  @generated @skip @team:ddoghq/emerging-cloud-integrations
   Scenario: Update tenancy config returns "OK" response
     Given new "UpdateTenancyConfig" request
     And request contains "tenancy_ocid" parameter from "REPLACE.ME"
diff --git a/features/v2/okta_integration.feature b/features/v2/okta_integration.feature
index b61b09bb5f3e..2090009ba343 100644
--- a/features/v2/okta_integration.feature
+++ b/features/v2/okta_integration.feature
@@ -9,63 +9,63 @@ Feature: Okta Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "OktaIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Okta account returns "Bad Request" response
     Given new "CreateOktaAccount" request
     And body with value {"data": {"attributes": {"auth_method": "oauth", "domain": "https://example.okta.com/", "name": "Okta-Prod"}, "id": "f749daaf-682e-4208-a38d-c9b43162c609", "type": "okta-accounts"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Add Okta account returns "Not Found" response
     Given new "CreateOktaAccount" request
     And body with value {"data": {"attributes": {"auth_method": "oauth", "domain": "https://example.okta.com/", "name": "Okta-Prod"}, "id": "f749daaf-682e-4208-a38d-c9b43162c609", "type": "okta-accounts"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Add Okta account returns "OK" response
     Given new "CreateOktaAccount" request
     And body with value {"data": {"attributes": {"auth_method": "oauth", "domain": "https://example.okta.com/", "name": "{{ unique_lower_alnum }}", "client_id": "client_id", "client_secret":"client_secret"},"id": "f749daaf-682e-4208-a38d-c9b43162c609", "type": "okta-accounts"}}
     When the request is sent
     Then the response status is 201 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Okta account returns "Bad Request" response
     Given new "DeleteOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Okta account returns "Not Found" response
     Given new "DeleteOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete Okta account returns "OK" response
     Given new "DeleteOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Okta account returns "Bad Request" response
     Given new "GetOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get Okta account returns "Not Found" response
     Given new "GetOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Get Okta account returns "OK" response
     Given there is a valid "okta_account" in the system
     And new "GetOktaAccount" request
@@ -74,26 +74,26 @@ Feature: Okta Integration
     Then the response status is 200 OK
     And the response "data.type" is equal to "okta-accounts"
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Okta accounts returns "Bad Request" response
     Given new "ListOktaAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Okta accounts returns "Not Found" response
     Given new "ListOktaAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: List Okta accounts returns "OK" response
     Given there is a valid "okta_account" in the system
     And new "ListOktaAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Okta account returns "Bad Request" response
     Given new "UpdateOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -101,7 +101,7 @@ Feature: Okta Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update Okta account returns "Not Found" response
     Given new "UpdateOktaAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -109,7 +109,7 @@ Feature: Okta Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/saas-integrations
+  @team:ddoghq/saas-integrations
   Scenario: Update Okta account returns "OK" response
     Given there is a valid "okta_account" in the system
     And new "UpdateOktaAccount" request
diff --git a/features/v2/on-call.feature b/features/v2/on-call.feature
index 71984f71c55c..682e7e891985 100644
--- a/features/v2/on-call.feature
+++ b/features/v2/on-call.feature
@@ -9,14 +9,14 @@ Feature: On-Call
     And a valid "appKeyAuth" key in the system
     And an instance of "On-Call" API
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create On-Call escalation policy returns "Bad Request" response
     Given new "CreateOnCallEscalationPolicy" request
     And body with value {"data": {"attributes": {"name": "Escalation Policy 1", "resolve_page_on_policy_end": true, "retries": 2, "steps": [{"assignment": "default", "escalate_after_seconds": 3600, "targets": [{"id": "00000000-aba1-0000-0000-000000000000", "type": "users"}, {"config": {"schedule": {"position": "previous"}}, "id": "00000000-aba2-0000-0000-000000000000", "type": "schedules"}, {"id": "00000000-aba3-0000-0000-000000000000", "type": "teams"}]}, {"assignment": "round-robin", "escalate_after_seconds": 3600, "targets": [{"id": "00000000-aba1-0000-0000-000000000000", "type": "users"}, {"id": "00000000-abb1-0000-0000-000000000000", "type": "users"}]}]}, "relationships": {"teams": {"data": [{"id": "00000000-da3a-0000-0000-000000000000", "type": "teams"}]}}, "type": "policies"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Create On-Call escalation policy returns "Created" response
     Given new "CreateOnCallEscalationPolicy" request
     And there is a valid "user" in the system
@@ -27,14 +27,14 @@ Feature: On-Call
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create On-Call schedule returns "Bad Request" response
     Given new "CreateOnCallSchedule" request
     And body with value {"data": {"attributes": {"layers": [{"effective_date": "2025-02-03T05:00:00Z", "end_date": "2025-12-31T00:00:00Z", "interval": {"days": 1}, "members": [{"user": {"id": "00000000-aba1-0000-0000-000000000000"}}], "name": "Layer 1", "restrictions": [{"end_day": "friday", "end_time": "17:00:00", "start_day": "monday", "start_time": "09:00:00"}], "rotation_start": "2025-02-01T00:00:00Z"}], "name": "On-Call Schedule", "time_zone": "America/New_York"}, "relationships": {"teams": {"data": [{"id": "00000000-da3a-0000-0000-000000000000", "type": "teams"}]}}, "type": "schedules"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Create On-Call schedule returns "Created" response
     Given new "CreateOnCallSchedule" request
     And there is a valid "user" in the system
@@ -43,7 +43,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create an On-Call notification channel for a user returns "Bad Request" response
     Given new "CreateUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -51,7 +51,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Create an On-Call notification channel for a user returns "Created" response
     Given new "CreateUserNotificationChannel" request
     And there is a valid "user" in the system
@@ -62,7 +62,7 @@ Feature: On-Call
     And the response "data.attributes.config.type" is equal to "email"
     And the response "data.attributes.config.address" is equal to "foo@bar.com"
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create an On-Call notification channel for a user returns "Not Found" response
     Given new "CreateUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -70,7 +70,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create an On-Call notification rule for a user returns "Bad Request" response
     Given new "CreateUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -78,7 +78,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Create an On-Call notification rule for a user returns "Created" response
     Given new "CreateUserNotificationRule" request
     And there is a valid "user" in the system
@@ -88,7 +88,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create an On-Call notification rule for a user returns "Not Found" response
     Given new "CreateUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -96,7 +96,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Delete On-Call escalation policy returns "No Content" response
     Given new "DeleteOnCallEscalationPolicy" request
     And there is a valid "user" in the system
@@ -107,14 +107,14 @@ Feature: On-Call
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete On-Call escalation policy returns "Not Found" response
     Given new "DeleteOnCallEscalationPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Delete On-Call schedule returns "No Content" response
     Given new "DeleteOnCallSchedule" request
     And there is a valid "user" in the system
@@ -123,14 +123,14 @@ Feature: On-Call
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete On-Call schedule returns "Not Found" response
     Given new "DeleteOnCallSchedule" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete an On-Call notification channel for a user returns "Bad Request" response
     Given new "DeleteUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Delete an On-Call notification channel for a user returns "No Content" response
     Given new "DeleteUserNotificationChannel" request
     And there is a valid "user" in the system
@@ -148,7 +148,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete an On-Call notification channel for a user returns "Not Found" response
     Given new "DeleteUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -156,7 +156,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete an On-Call notification rule for a user returns "Bad Request" response
     Given new "DeleteUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -164,7 +164,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Delete an On-Call notification rule for a user returns "No Content" response
     Given new "DeleteUserNotificationRule" request
     And there is a valid "user" in the system
@@ -175,7 +175,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Delete an On-Call notification rule for a user returns "Not Found" response
     Given new "DeleteUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -183,21 +183,21 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get On-Call escalation policy returns "Bad Request" response
     Given new "GetOnCallEscalationPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get On-Call escalation policy returns "Not Found" response
     Given new "GetOnCallEscalationPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Get On-Call escalation policy returns "OK" response
     Given new "GetOnCallEscalationPolicy" request
     And there is a valid "user" in the system
@@ -209,14 +209,14 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get On-Call schedule returns "Not Found" response
     Given new "GetOnCallSchedule" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Get On-Call schedule returns "OK" response
     Given new "GetOnCallSchedule" request
     And there is a valid "user" in the system
@@ -225,14 +225,14 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get On-Call team routing rules returns "OK" response
     Given new "GetOnCallTeamRoutingRules" request
     And request contains "team_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get an On-Call notification channel for a user returns "Bad Request" response
     Given new "GetUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -240,7 +240,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get an On-Call notification channel for a user returns "Not Found" response
     Given new "GetUserNotificationChannel" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -248,7 +248,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Get an On-Call notification channel for a user returns "OK" response
     Given new "GetUserNotificationChannel" request
     And there is a valid "user" in the system
@@ -260,7 +260,7 @@ Feature: On-Call
     And the response "data.attributes.config.type" is equal to "email"
     And the response "data.attributes.config.address" is equal to "{{ user.data.attributes.email }}"
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get an On-Call notification rule for a user returns "Bad Request" response
     Given new "GetUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -268,7 +268,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get an On-Call notification rule for a user returns "Not Found" response
     Given new "GetUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -276,7 +276,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Get an On-Call notification rule for a user returns "OK" response
     Given new "GetUserNotificationRule" request
     And there is a valid "user" in the system
@@ -290,21 +290,21 @@ Feature: On-Call
     And the response "data.attributes.category" is equal to "high_urgency"
     And the response "included" has length 1
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get on-call responders for a schedule returns "Bad Request" response
     Given new "GetScheduleOnCallResponders" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get on-call responders for a schedule returns "Not Found" response
     Given new "GetScheduleOnCallResponders" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Get on-call responders for a schedule returns "OK" response
     Given new "GetScheduleOnCallResponders" request
     And there is a valid "user" in the system
@@ -313,21 +313,21 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get scheduled on-call user returns "Bad Request" response
     Given new "GetScheduleOnCallUser" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get scheduled on-call user returns "Not Found" response
     Given new "GetScheduleOnCallUser" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Get scheduled on-call user returns "OK" response
     Given new "GetScheduleOnCallUser" request
     And there is a valid "user" in the system
@@ -336,21 +336,21 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get team on-call users returns "Bad Request" response
     Given new "GetTeamOnCallUsers" request
     And request contains "team_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Get team on-call users returns "Not Found" response
     Given new "GetTeamOnCallUsers" request
     And request contains "team_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Get team on-call users returns "OK" response
     Given new "GetTeamOnCallUsers" request
     And there is a valid "user" in the system
@@ -363,21 +363,21 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: List On-Call notification channels for a user returns "Bad Request" response
     Given new "ListUserNotificationChannels" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: List On-Call notification channels for a user returns "Not Found" response
     Given new "ListUserNotificationChannels" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: List On-Call notification channels for a user returns "OK" response
     Given new "ListUserNotificationChannels" request
     And there is a valid "user" in the system
@@ -389,21 +389,21 @@ Feature: On-Call
     And the response "data[0].attributes.config.type" is equal to "email"
     And the response "data[0].attributes.config.address" is equal to "{{ user.data.attributes.email }}"
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: List On-Call notification rules for a user returns "Bad Request" response
     Given new "ListUserNotificationRules" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: List On-Call notification rules for a user returns "Not Found" response
     Given new "ListUserNotificationRules" request
     And request contains "user_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: List On-Call notification rules for a user returns "OK" response
     Given new "ListUserNotificationRules" request
     And there is a valid "user" in the system
@@ -416,25 +416,25 @@ Feature: On-Call
     And the response "data" has length 1
     And the response "included" has length 1
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: List On-Call schedules returns "Bad Request" response
     Given new "ListOnCallSchedules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: List On-Call schedules returns "OK" response
     Given new "ListOnCallSchedules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call @with-pagination
+  @generated @skip @team:ddoghq/on-call @with-pagination
   Scenario: List On-Call schedules returns "OK" response with pagination
     Given new "ListOnCallSchedules" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @skip-python @team:DataDog/on-call
+  @skip-python @team:ddoghq/on-call
   Scenario: Set On-Call team routing rules returns "OK" response
     Given new "SetOnCallTeamRoutingRules" request
     And there is a valid "user" in the system
@@ -447,7 +447,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update On-Call escalation policy returns "Bad Request" response
     Given new "UpdateOnCallEscalationPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -455,7 +455,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update On-Call escalation policy returns "Not Found" response
     Given new "UpdateOnCallEscalationPolicy" request
     And request contains "policy_id" parameter from "REPLACE.ME"
@@ -463,7 +463,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Update On-Call escalation policy returns "OK" response
     Given new "UpdateOnCallEscalationPolicy" request
     And there is a valid "user" in the system
@@ -475,7 +475,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update On-Call schedule returns "Bad Request" response
     Given new "UpdateOnCallSchedule" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
@@ -483,7 +483,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update On-Call schedule returns "Not Found" response
     Given new "UpdateOnCallSchedule" request
     And request contains "schedule_id" parameter from "REPLACE.ME"
@@ -491,7 +491,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/on-call
+  @team:ddoghq/on-call
   Scenario: Update On-Call schedule returns "OK" response
     Given new "UpdateOnCallSchedule" request
     And there is a valid "user" in the system
@@ -502,7 +502,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update an On-Call notification rule for a user returns "Bad Request" response
     Given new "UpdateUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -511,7 +511,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Update an On-Call notification rule for a user returns "Not Found" response
     Given new "UpdateUserNotificationRule" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -520,7 +520,7 @@ Feature: On-Call
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/on-call
+  @replay-only @team:ddoghq/on-call
   Scenario: Update an On-Call notification rule for a user returns "OK" response
     Given new "UpdateUserNotificationRule" request
     And there is a valid "user" in the system
diff --git a/features/v2/on-call_paging.feature b/features/v2/on-call_paging.feature
index dc03eb9174ac..fc26fabd4c12 100644
--- a/features/v2/on-call_paging.feature
+++ b/features/v2/on-call_paging.feature
@@ -9,28 +9,28 @@ Feature: On-Call Paging
     And a valid "appKeyAuth" key in the system
     And an instance of "On-CallPaging" API
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Acknowledge On-Call Page returns "Accepted." response
     Given new "AcknowledgeOnCallPage" request
     And request contains "page_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 202 Accepted.
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Create On-Call Page returns "OK." response
     Given new "CreateOnCallPage" request
     And body with value {"data": {"attributes": {"description": "Page details.", "tags": ["service:test"], "target": {"identifier": "my-team", "type": "team_handle"}, "title": "Page title", "urgency": "low"}, "type": "pages"}}
     When the request is sent
     Then the response status is 200 OK.
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Escalate On-Call Page returns "Accepted." response
     Given new "EscalateOnCallPage" request
     And request contains "page_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 202 Accepted.
 
-  @generated @skip @team:DataDog/on-call
+  @generated @skip @team:ddoghq/on-call
   Scenario: Resolve On-Call Page returns "Accepted." response
     Given new "ResolveOnCallPage" request
     And request contains "page_id" parameter from "REPLACE.ME"
diff --git a/features/v2/opsgenie_integration.feature b/features/v2/opsgenie_integration.feature
index 453d4a302775..73231b3f5584 100644
--- a/features/v2/opsgenie_integration.feature
+++ b/features/v2/opsgenie_integration.feature
@@ -9,28 +9,28 @@ Feature: Opsgenie Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "OpsgenieIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a new Opsgenie account returns "Bad Request" response
     Given new "CreateOpsgenieAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000", "region": "us"}, "type": "opsgenie-account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a new Opsgenie account returns "CREATED" response
     Given new "CreateOpsgenieAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000", "region": "us"}, "type": "opsgenie-account"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @skip @team:Datadog/collaboration-integrations
+  @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a new service object returns "Bad Request" response
     Given new "CreateOpsgenieService" request
     And body with value {"data": {"attributes": {"name": "fake-opsgenie-service-name", "opsgenie_api_key": "00000000-0000-0000-0000-000000000000", "region": "us"}, "type": "opsgenie-service"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:Datadog/collaboration-integrations
+  @team:ddoghq/collaboration-integrations
   Scenario: Create a new service object returns "CREATED" response
     Given new "CreateOpsgenieService" request
     And body with value {"data": {"attributes": {"name": "{{unique}}", "opsgenie_api_key": "00000000-0000-0000-0000-000000000000", "region": "us"}, "type": "opsgenie-service" }}
@@ -39,28 +39,28 @@ Feature: Opsgenie Integration
     And the response "data.attributes.name" is equal to "{{unique}}"
     And the response "data.attributes.region" is equal to "us"
 
-  @skip @team:Datadog/collaboration-integrations
+  @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a new service object returns "Conflict" response
     Given new "CreateOpsgenieService" request
     And body with value {"data": {"attributes": {"name": "fake-opsgenie-service-name", "opsgenie_api_key": "00000000-0000-0000-0000-000000000000", "region": "us"}, "type": "opsgenie-service"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a single service object returns "Bad Request" response
     Given new "DeleteOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a single service object returns "Not Found" response
     Given new "DeleteOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/collaboration-integrations
+  @team:ddoghq/collaboration-integrations
   Scenario: Delete a single service object returns "OK" response
     Given there is a valid "opsgenie_service" in the system
     And new "DeleteOpsgenieService" request
@@ -68,49 +68,49 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete an Opsgenie account returns "Bad Request" response
     Given new "DeleteOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete an Opsgenie account returns "Not Found" response
     Given new "DeleteOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete an Opsgenie account returns "OK" response
     Given new "DeleteOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a single service object returns "Bad Request" response
     Given new "GetOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a single service object returns "Conflict" response
     Given new "GetOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get a single service object returns "Not Found" response
     Given new "GetOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/collaboration-integrations
+  @team:ddoghq/collaboration-integrations
   Scenario: Get a single service object returns "OK" response
     Given there is a valid "opsgenie_service" in the system
     And new "GetOpsgenieService" request
@@ -120,13 +120,13 @@ Feature: Opsgenie Integration
     And the response "data.attributes.name" has the same value as "opsgenie_service.data.attributes.name"
     And the response "data.attributes.region" is equal to "us"
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all Opsgenie accounts returns "OK" response
     Given new "ListOpsgenieAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:Datadog/collaboration-integrations
+  @team:ddoghq/collaboration-integrations
   Scenario: Get all service objects returns "OK" response
     Given there is a valid "opsgenie_service" in the system
     And new "ListOpsgenieServices" request
@@ -134,7 +134,7 @@ Feature: Opsgenie Integration
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "opsgenie-service"
 
-  @skip @team:Datadog/collaboration-integrations
+  @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a single service object returns "Bad Request" response
     Given new "UpdateOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
@@ -142,7 +142,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:Datadog/collaboration-integrations
+  @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a single service object returns "Conflict" response
     Given new "UpdateOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
@@ -150,7 +150,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip @team:Datadog/collaboration-integrations
+  @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a single service object returns "Not Found" response
     Given new "UpdateOpsgenieService" request
     And request contains "integration_service_id" parameter from "REPLACE.ME"
@@ -158,7 +158,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:Datadog/collaboration-integrations
+  @team:ddoghq/collaboration-integrations
   Scenario: Update a single service object returns "OK" response
     Given there is a valid "opsgenie_service" in the system
     And new "UpdateOpsgenieService" request
@@ -169,7 +169,7 @@ Feature: Opsgenie Integration
     And the response "data.attributes.name" is equal to "{{ opsgenie_service.data.attributes.name }}--updated"
     And the response "data.attributes.region" is equal to "eu"
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an Opsgenie account returns "Bad Request" response
     Given new "UpdateOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -177,7 +177,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an Opsgenie account returns "Not Found" response
     Given new "UpdateOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -185,7 +185,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an Opsgenie account returns "OK" response
     Given new "UpdateOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
@@ -193,7 +193,7 @@ Feature: Opsgenie Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an Opsgenie account returns "The server cannot process the request because it contains invalid data." response
     Given new "UpdateOpsgenieAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
diff --git a/features/v2/org_authorized_clients.feature b/features/v2/org_authorized_clients.feature
index a196173a2906..70021f7b039d 100644
--- a/features/v2/org_authorized_clients.feature
+++ b/features/v2/org_authorized_clients.feature
@@ -7,7 +7,7 @@ Feature: Org Authorized Clients
     And a valid "appKeyAuth" key in the system
     And an instance of "OrgAuthorizedClients" API
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user authorization for a client returns "No Content" response
     Given new "DeleteOrgAuthorizedClientUserAuthorization" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -15,7 +15,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user authorization for a client returns "Not Found" response
     Given new "DeleteOrgAuthorizedClientUserAuthorization" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -23,7 +23,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user's authorizations for a client returns "No Content" response
     Given new "DeleteOrgAuthorizedClientAllUserAuthorizations" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -31,7 +31,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user's authorizations for a client returns "Not Found" response
     Given new "DeleteOrgAuthorizedClientAllUserAuthorizations" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -39,68 +39,68 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete an org authorized client returns "No Content" response
     Given new "DeleteOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete an org authorized client returns "Not Found" response
     Given new "DeleteOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get an org authorized client returns "Not Found" response
     Given new "GetOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get an org authorized client returns "OK" response
     Given new "GetOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List org authorized clients returns "OK" response
     Given new "ListOrgAuthorizedClients" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login @with-pagination
+  @generated @skip @team:ddoghq/delegated-auth-login @with-pagination
   Scenario: List org authorized clients returns "OK" response with pagination
     Given new "ListOrgAuthorizedClients" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List user authorizations for a client returns "Not Found" response
     Given new "ListOrgAuthorizedClientUserAuthorizations" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List user authorizations for a client returns "OK" response
     Given new "ListOrgAuthorizedClientUserAuthorizations" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login @with-pagination
+  @generated @skip @team:ddoghq/delegated-auth-login @with-pagination
   Scenario: List user authorizations for a client returns "OK" response with pagination
     Given new "ListOrgAuthorizedClientUserAuthorizations" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an org authorized client returns "Bad Request" response
     Given new "UpdateOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -108,7 +108,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an org authorized client returns "Not Found" response
     Given new "UpdateOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -116,7 +116,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an org authorized client returns "OK" response
     Given new "UpdateOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
@@ -124,7 +124,7 @@ Feature: Org Authorized Clients
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update an org authorized client returns "Unprocessable Entity" response
     Given new "UpdateOrgAuthorizedClient" request
     And request contains "org_authorized_client_id" parameter from "REPLACE.ME"
diff --git a/features/v2/org_connections.feature b/features/v2/org_connections.feature
index 254b4050b21e..f84c5ec04d14 100644
--- a/features/v2/org_connections.feature
+++ b/features/v2/org_connections.feature
@@ -10,14 +10,14 @@ Feature: Org Connections
     And a valid "appKeyAuth" key in the system
     And an instance of "OrgConnections" API
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/access-enforcement
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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
 
-  @skip-terraform-config @team:DataDog/access-enforcement
+  @skip-terraform-config @team:ddoghq/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/features/v2/org_groups.feature b/features/v2/org_groups.feature
index eda51294b66d..493875e38beb 100644
--- a/features/v2/org_groups.feature
+++ b/features/v2/org_groups.feature
@@ -8,7 +8,7 @@ Feature: Org Groups
     And a valid "appKeyAuth" key in the system
     And an instance of "OrgGroups" API
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Bulk update org group memberships returns "Bad Request" response
     Given operation "BulkUpdateOrgGroupMemberships" enabled
     And new "BulkUpdateOrgGroupMemberships" request
@@ -16,7 +16,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Bulk update org group memberships returns "Not Found" response
     Given operation "BulkUpdateOrgGroupMemberships" enabled
     And new "BulkUpdateOrgGroupMemberships" request
@@ -24,7 +24,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Bulk update org group memberships returns "OK" response
     Given operation "BulkUpdateOrgGroupMemberships" enabled
     And new "BulkUpdateOrgGroupMemberships" request
@@ -32,7 +32,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy override returns "Bad Request" response
     Given operation "CreateOrgGroupPolicyOverride" enabled
     And new "CreateOrgGroupPolicyOverride" request
@@ -40,7 +40,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy override returns "Conflict" response
     Given operation "CreateOrgGroupPolicyOverride" enabled
     And new "CreateOrgGroupPolicyOverride" request
@@ -48,7 +48,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy override returns "Created" response
     Given operation "CreateOrgGroupPolicyOverride" enabled
     And new "CreateOrgGroupPolicyOverride" request
@@ -56,7 +56,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy returns "Bad Request" response
     Given operation "CreateOrgGroupPolicy" enabled
     And new "CreateOrgGroupPolicy" request
@@ -64,7 +64,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy returns "Conflict" response
     Given operation "CreateOrgGroupPolicy" enabled
     And new "CreateOrgGroupPolicy" request
@@ -72,7 +72,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group policy returns "Created" response
     Given operation "CreateOrgGroupPolicy" enabled
     And new "CreateOrgGroupPolicy" request
@@ -80,7 +80,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group returns "Bad Request" response
     Given operation "CreateOrgGroup" enabled
     And new "CreateOrgGroup" request
@@ -88,7 +88,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group returns "Conflict" response
     Given operation "CreateOrgGroup" enabled
     And new "CreateOrgGroup" request
@@ -96,7 +96,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Create an org group returns "Created" response
     Given operation "CreateOrgGroup" enabled
     And new "CreateOrgGroup" request
@@ -104,7 +104,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy override returns "Bad Request" response
     Given operation "DeleteOrgGroupPolicyOverride" enabled
     And new "DeleteOrgGroupPolicyOverride" request
@@ -112,7 +112,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy override returns "No Content" response
     Given operation "DeleteOrgGroupPolicyOverride" enabled
     And new "DeleteOrgGroupPolicyOverride" request
@@ -120,7 +120,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy override returns "Not Found" response
     Given operation "DeleteOrgGroupPolicyOverride" enabled
     And new "DeleteOrgGroupPolicyOverride" request
@@ -128,7 +128,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy returns "Bad Request" response
     Given operation "DeleteOrgGroupPolicy" enabled
     And new "DeleteOrgGroupPolicy" request
@@ -136,7 +136,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy returns "No Content" response
     Given operation "DeleteOrgGroupPolicy" enabled
     And new "DeleteOrgGroupPolicy" request
@@ -144,7 +144,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group policy returns "Not Found" response
     Given operation "DeleteOrgGroupPolicy" enabled
     And new "DeleteOrgGroupPolicy" request
@@ -152,7 +152,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group returns "Bad Request" response
     Given operation "DeleteOrgGroup" enabled
     And new "DeleteOrgGroup" request
@@ -160,7 +160,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group returns "No Content" response
     Given operation "DeleteOrgGroup" enabled
     And new "DeleteOrgGroup" request
@@ -168,7 +168,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete an org group returns "Not Found" response
     Given operation "DeleteOrgGroup" enabled
     And new "DeleteOrgGroup" request
@@ -176,7 +176,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group membership returns "Bad Request" response
     Given operation "GetOrgGroupMembership" enabled
     And new "GetOrgGroupMembership" request
@@ -184,7 +184,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group membership returns "Not Found" response
     Given operation "GetOrgGroupMembership" enabled
     And new "GetOrgGroupMembership" request
@@ -192,7 +192,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group membership returns "OK" response
     Given operation "GetOrgGroupMembership" enabled
     And new "GetOrgGroupMembership" request
@@ -200,7 +200,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy override returns "Bad Request" response
     Given operation "GetOrgGroupPolicyOverride" enabled
     And new "GetOrgGroupPolicyOverride" request
@@ -208,7 +208,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy override returns "Not Found" response
     Given operation "GetOrgGroupPolicyOverride" enabled
     And new "GetOrgGroupPolicyOverride" request
@@ -216,7 +216,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy override returns "OK" response
     Given operation "GetOrgGroupPolicyOverride" enabled
     And new "GetOrgGroupPolicyOverride" request
@@ -224,7 +224,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy returns "Bad Request" response
     Given operation "GetOrgGroupPolicy" enabled
     And new "GetOrgGroupPolicy" request
@@ -232,7 +232,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy returns "Not Found" response
     Given operation "GetOrgGroupPolicy" enabled
     And new "GetOrgGroupPolicy" request
@@ -240,7 +240,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group policy returns "OK" response
     Given operation "GetOrgGroupPolicy" enabled
     And new "GetOrgGroupPolicy" request
@@ -248,7 +248,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group returns "Bad Request" response
     Given operation "GetOrgGroup" enabled
     And new "GetOrgGroup" request
@@ -256,7 +256,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group returns "Not Found" response
     Given operation "GetOrgGroup" enabled
     And new "GetOrgGroup" request
@@ -264,7 +264,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get an org group returns "OK" response
     Given operation "GetOrgGroup" enabled
     And new "GetOrgGroup" request
@@ -272,21 +272,21 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group memberships returns "Bad Request" response
     Given operation "ListOrgGroupMemberships" enabled
     And new "ListOrgGroupMemberships" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group memberships returns "OK" response
     Given operation "ListOrgGroupMemberships" enabled
     And new "ListOrgGroupMemberships" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policies returns "Bad Request" response
     Given operation "ListOrgGroupPolicies" enabled
     And new "ListOrgGroupPolicies" request
@@ -294,7 +294,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policies returns "OK" response
     Given operation "ListOrgGroupPolicies" enabled
     And new "ListOrgGroupPolicies" request
@@ -302,14 +302,14 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policy configs returns "OK" response
     Given operation "ListOrgGroupPolicyConfigs" enabled
     And new "ListOrgGroupPolicyConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policy overrides returns "Bad Request" response
     Given operation "ListOrgGroupPolicyOverrides" enabled
     And new "ListOrgGroupPolicyOverrides" request
@@ -317,7 +317,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policy overrides returns "OK" response
     Given operation "ListOrgGroupPolicyOverrides" enabled
     And new "ListOrgGroupPolicyOverrides" request
@@ -325,7 +325,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policy suggestions returns "Bad Request" response
     Given operation "ListOrgGroupPolicySuggestions" enabled
     And new "ListOrgGroupPolicySuggestions" request
@@ -333,7 +333,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org group policy suggestions returns "OK" response
     Given operation "ListOrgGroupPolicySuggestions" enabled
     And new "ListOrgGroupPolicySuggestions" request
@@ -341,21 +341,21 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org groups returns "Bad Request" response
     Given operation "ListOrgGroups" enabled
     And new "ListOrgGroups" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: List org groups returns "OK" response
     Given operation "ListOrgGroups" enabled
     And new "ListOrgGroups" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group membership returns "Bad Request" response
     Given operation "UpdateOrgGroupMembership" enabled
     And new "UpdateOrgGroupMembership" request
@@ -364,7 +364,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group membership returns "Not Found" response
     Given operation "UpdateOrgGroupMembership" enabled
     And new "UpdateOrgGroupMembership" request
@@ -373,7 +373,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group membership returns "OK" response
     Given operation "UpdateOrgGroupMembership" enabled
     And new "UpdateOrgGroupMembership" request
@@ -382,7 +382,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy override returns "Bad Request" response
     Given operation "UpdateOrgGroupPolicyOverride" enabled
     And new "UpdateOrgGroupPolicyOverride" request
@@ -391,7 +391,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy override returns "Not Found" response
     Given operation "UpdateOrgGroupPolicyOverride" enabled
     And new "UpdateOrgGroupPolicyOverride" request
@@ -400,7 +400,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy override returns "OK" response
     Given operation "UpdateOrgGroupPolicyOverride" enabled
     And new "UpdateOrgGroupPolicyOverride" request
@@ -409,7 +409,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy returns "Bad Request" response
     Given operation "UpdateOrgGroupPolicy" enabled
     And new "UpdateOrgGroupPolicy" request
@@ -418,7 +418,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy returns "Not Found" response
     Given operation "UpdateOrgGroupPolicy" enabled
     And new "UpdateOrgGroupPolicy" request
@@ -427,7 +427,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group policy returns "OK" response
     Given operation "UpdateOrgGroupPolicy" enabled
     And new "UpdateOrgGroupPolicy" request
@@ -436,7 +436,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group returns "Bad Request" response
     Given operation "UpdateOrgGroup" enabled
     And new "UpdateOrgGroup" request
@@ -445,7 +445,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group returns "Not Found" response
     Given operation "UpdateOrgGroup" enabled
     And new "UpdateOrgGroup" request
@@ -454,7 +454,7 @@ Feature: Org Groups
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update an org group returns "OK" response
     Given operation "UpdateOrgGroup" enabled
     And new "UpdateOrgGroup" request
diff --git a/features/v2/organizations.feature b/features/v2/organizations.feature
index a8ed63ab7e61..fd4a3a74f013 100644
--- a/features/v2/organizations.feature
+++ b/features/v2/organizations.feature
@@ -8,87 +8,87 @@ Feature: Organizations
     And a valid "appKeyAuth" key in the system
     And an instance of "Organizations" API
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get a SAML configuration returns "Not Found" response
     Given new "GetSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get a SAML configuration returns "OK" response
     Given new "GetSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/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/org-management
+  @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/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
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List SAML configurations returns "OK" response
     Given new "ListSAMLConfigurations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List global orgs returns "Bad Request" response
     Given new "ListGlobalOrgs" 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/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List global orgs returns "OK" response
     Given new "ListGlobalOrgs" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login @with-pagination
+  @generated @skip @team:ddoghq/delegated-auth-login @with-pagination
   Scenario: List global orgs returns "OK" response with pagination
     Given new "ListGlobalOrgs" request
     And request contains "user_handle" parameter from "REPLACE.ME"
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update a SAML configuration returns "Bad Request" response
     Given new "UpdateSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
@@ -96,7 +96,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update a SAML configuration returns "Not Found" response
     Given new "UpdateSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
@@ -104,7 +104,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update a SAML configuration returns "OK" response
     Given new "UpdateSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
@@ -112,7 +112,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update a SAML configuration returns "Unprocessable Entity" response
     Given new "UpdateSAMLConfiguration" request
     And request contains "saml_config_uuid" parameter from "REPLACE.ME"
@@ -120,7 +120,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/org-management
+  @team:ddoghq/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"
@@ -128,7 +128,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/org-management
+  @team:ddoghq/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"
@@ -136,7 +136,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/org-management
+  @team:ddoghq/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"
@@ -144,7 +144,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update organization SAML preferences returns "Bad Request" response
     Given operation "UpdateOrgSamlConfigurations" enabled
     And new "UpdateOrgSamlConfigurations" request
@@ -152,7 +152,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update organization SAML preferences returns "No Content" response
     Given operation "UpdateOrgSamlConfigurations" enabled
     And new "UpdateOrgSamlConfigurations" request
@@ -160,7 +160,7 @@ Feature: Organizations
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update organization SAML preferences returns "Not Found" response
     Given operation "UpdateOrgSamlConfigurations" enabled
     And new "UpdateOrgSamlConfigurations" request
@@ -168,34 +168,34 @@ Feature: Organizations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update the maximum session duration returns "Bad Request" response
     Given new "UpdateLoginOrgConfigsMaxSessionDuration" request
     And body with value {"data": {"attributes": {"max_session_duration": 604800}, "type": "max_session_duration"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Update the maximum session duration returns "No Content" response
     Given new "UpdateLoginOrgConfigsMaxSessionDuration" request
     And body with value {"data": {"attributes": {"max_session_duration": 604800}, "type": "max_session_duration"}}
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/delegated-auth-login
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-terraform-config @skip-typescript @skip-validation @team:ddoghq/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/delegated-auth-login
+  @generated @skip @team:ddoghq/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/delegated-auth-login
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/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/features/v2/powerpack.feature b/features/v2/powerpack.feature
index 31daf5b5f8cb..1c802204b551 100644
--- a/features/v2/powerpack.feature
+++ b/features/v2/powerpack.feature
@@ -13,14 +13,14 @@ Feature: Powerpack
     And a valid "appKeyAuth" key in the system
     And an instance of "Powerpack" API
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new powerpack returns "Bad Request" response
     Given new "CreatePowerpack" request
     And body with value {"data": {"attributes": {"description": "Powerpack for ABC", "group_widget": {"definition": {"type": "group1", "layout_type": "ordered", "widgets": []}}, "name": "Sample Powerpack", "tags": ["tag:foo1"], "template_variables": [{"defaults": ["*"], "name": "test"}]}, "type": "powerpack"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Create a new powerpack returns "OK" response
     Given new "CreatePowerpack" request
     And body from file "powerpack_payload.json"
@@ -41,7 +41,7 @@ Feature: Powerpack
     And the response "data.attributes.group_widget.definition.title" is equal to "Sample Powerpack"
     And the response "data.attributes.group_widget.definition.widgets[0].definition.type" is equal to "note"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete a powerpack returns "OK" response
     Given there is a valid "powerpack" in the system
     And new "DeletePowerpack" request
@@ -49,14 +49,14 @@ Feature: Powerpack
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Delete a powerpack returns "Powerpack Not Found" response
     Given new "DeletePowerpack" request
     And request contains "powerpack_id" parameter with value "made-up-id"
     When the request is sent
     Then the response status is 404 Powerpack Not Found
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get a Powerpack returns "OK" response
     Given there is a valid "powerpack" in the system
     And new "GetPowerpack" request
@@ -80,14 +80,14 @@ Feature: Powerpack
     And the response "data.attributes.group_widget.definition.widgets[0].definition.type" is equal to "note"
     And the response "data.attributes.group_widget.definition.widgets[0].definition.content" is equal to "test"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get a Powerpack returns "Powerpack Not Found." response
     Given new "GetPowerpack" request
     And request contains "powerpack_id" parameter with value "made-up-id"
     When the request is sent
     Then the response status is 404 Powerpack Not Found.
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Get all powerpacks returns "OK" response
     Given there is a valid "powerpack" in the system
     And new "ListPowerpacks" request
@@ -111,7 +111,7 @@ Feature: Powerpack
     And the response "data" has item with field "attributes.group_widget.definition.widgets[0].definition.type" with value "note"
     And the response "data" has item with field "attributes.group_widget.definition.widgets[0].definition.content" with value "test"
 
-  @replay-only @skip-validation @team:DataDog/dashboards-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/dashboards-backend @with-pagination
   Scenario: Get all powerpacks returns "OK" response with pagination
     Given new "ListPowerpacks" request
     And request contains "page[limit]" parameter with value 2
@@ -119,7 +119,7 @@ Feature: Powerpack
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a powerpack returns "Bad Request" response
     Given there is a valid "powerpack" in the system
     And new "UpdatePowerpack" request
@@ -128,7 +128,7 @@ Feature: Powerpack
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a powerpack returns "OK" response
     Given there is a valid "powerpack" in the system
     And new "UpdatePowerpack" request
@@ -153,7 +153,7 @@ Feature: Powerpack
     And the response "data.attributes.group_widget.definition.widgets[0].definition.type" is equal to "note"
     And the response "data.attributes.group_widget.definition.widgets[0].definition.content" is equal to "test"
 
-  @team:DataDog/dashboards-backend
+  @team:ddoghq/dashboards-backend
   Scenario: Update a powerpack returns "Powerpack Not Found" response
     Given new "UpdatePowerpack" request
     And request contains "powerpack_id" parameter with value "made-up-id"
diff --git a/features/v2/processes.feature b/features/v2/processes.feature
index 7399829f2b46..22c49dc757b8 100644
--- a/features/v2/processes.feature
+++ b/features/v2/processes.feature
@@ -11,12 +11,12 @@ Feature: Processes
     And an instance of "Processes" API
     And new "ListProcesses" request
 
-  @generated @skip @team:DataDog/container-experiences
+  @generated @skip @team:ddoghq/container-experiences
   Scenario: Get all processes returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/container-experiences
+  @team:ddoghq/container-experiences
   Scenario: Get all processes returns "OK" response
     Given request contains "search" parameter with value "process-agent"
     And request contains "tags" parameter with value "testing:true"
@@ -24,7 +24,7 @@ Feature: Processes
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/container-experiences @with-pagination
+  @replay-only @skip-validation @team:ddoghq/container-experiences @with-pagination
   Scenario: Get all processes returns "OK" response with pagination
     Given request contains "page[limit]" parameter with value 2
     When the request with pagination is sent
diff --git a/features/v2/product_analytics.feature b/features/v2/product_analytics.feature
index d3bc8bfe9426..1af45e54a76d 100644
--- a/features/v2/product_analytics.feature
+++ b/features/v2/product_analytics.feature
@@ -14,7 +14,7 @@ Feature: Product Analytics
     Given a valid "apiKeyAuth" key in the system
     And an instance of "ProductAnalytics" API
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute a Sankey diagram returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsSankey" enabled
@@ -23,7 +23,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute a Sankey diagram returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsSankey" enabled
@@ -32,7 +32,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute a retention grid returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionGrid" enabled
@@ -41,7 +41,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute a retention grid returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionGrid" enabled
@@ -50,7 +50,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey funnel analysis returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyFunnel" enabled
@@ -59,7 +59,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey funnel analysis returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyFunnel" enabled
@@ -68,7 +68,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey scalar analytics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyScalar" enabled
@@ -77,7 +77,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey scalar analytics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyScalar" enabled
@@ -86,7 +86,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey timeseries analytics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyTimeseries" enabled
@@ -95,7 +95,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute journey timeseries analytics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyTimeseries" enabled
@@ -104,7 +104,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute retention scalar values returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionScalar" enabled
@@ -113,7 +113,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute retention scalar values returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionScalar" enabled
@@ -122,7 +122,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute retention timeseries returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionTimeseries" enabled
@@ -131,7 +131,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute retention timeseries returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionTimeseries" enabled
@@ -140,7 +140,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute scalar analytics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryProductAnalyticsScalar" request
@@ -148,7 +148,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute scalar analytics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryProductAnalyticsScalar" request
@@ -156,7 +156,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute timeseries analytics returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryProductAnalyticsTimeseries" request
@@ -164,7 +164,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Compute timeseries analytics returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "QueryProductAnalyticsTimeseries" request
@@ -172,7 +172,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List analytics events returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsList" enabled
@@ -181,7 +181,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List analytics events returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsList" enabled
@@ -190,7 +190,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List journey entities returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyList" enabled
@@ -199,7 +199,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List journey entities returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsJourneyList" enabled
@@ -208,7 +208,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List the entities behind a retention cell returns "Bad Request" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionList" enabled
@@ -217,7 +217,7 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: List the entities behind a retention cell returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And operation "QueryProductAnalyticsRetentionList" enabled
@@ -226,28 +226,28 @@ Feature: Product Analytics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Send server-side events returns "Bad Request" response
     Given new "SubmitProductAnalyticsEvent" request
     And body with value {"account": {"id": "account-67890"}, "application": {"id": "123abcde-123a-123b-1234-123456789abc"}, "event": {"name": "payment.processed"}, "session": {"id": "session-abcdef"}, "type": "server", "usr": {"id": "user-12345"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Send server-side events returns "Payload Too Large" response
     Given new "SubmitProductAnalyticsEvent" request
     And body with value {"account": {"id": "account-67890"}, "application": {"id": "123abcde-123a-123b-1234-123456789abc"}, "event": {"name": "payment.processed"}, "session": {"id": "session-abcdef"}, "type": "server", "usr": {"id": "user-12345"}}
     When the request is sent
     Then the response status is 413 Payload Too Large
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Send server-side events returns "Request Timeout" response
     Given new "SubmitProductAnalyticsEvent" request
     And body with value {"account": {"id": "account-67890"}, "application": {"id": "123abcde-123a-123b-1234-123456789abc"}, "event": {"name": "payment.processed"}, "session": {"id": "session-abcdef"}, "type": "server", "usr": {"id": "user-12345"}}
     When the request is sent
     Then the response status is 408 Request Timeout
 
-  @generated @skip @team:DataDog/product-analytics-platform
+  @generated @skip @team:ddoghq/product-analytics-platform
   Scenario: Send server-side events returns "Request accepted for processing (always 202 empty JSON)." response
     Given new "SubmitProductAnalyticsEvent" request
     And body with value {"account": {"id": "account-67890"}, "application": {"id": "123abcde-123a-123b-1234-123456789abc"}, "event": {"name": "payment.processed"}, "session": {"id": "session-abcdef"}, "type": "server", "usr": {"id": "user-12345"}}
diff --git a/features/v2/product_catalog.feature b/features/v2/product_catalog.feature
index 49b85083244c..6d656d02a13a 100644
--- a/features/v2/product_catalog.feature
+++ b/features/v2/product_catalog.feature
@@ -11,19 +11,19 @@ Feature: Product Catalog
     And operation "ListProductCatalogSKUs" enabled
     And new "ListProductCatalogSKUs" request
 
-  @generated @skip @team:DataDog/red-zone-product-catalog
+  @generated @skip @team:ddoghq/red-zone-product-catalog
   Scenario: List SKUs returns "Bad Request - version is missing or invalid, or as_of_date is malformed or in the future" response
     Given request contains "version" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request - version is missing or invalid, or as_of_date is malformed or in the future
 
-  @generated @skip @team:DataDog/red-zone-product-catalog
+  @generated @skip @team:ddoghq/red-zone-product-catalog
   Scenario: List SKUs returns "Not Found - the requested catalog version is not supported" response
     Given request contains "version" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found - the requested catalog version is not supported
 
-  @generated @skip @team:DataDog/red-zone-product-catalog
+  @generated @skip @team:ddoghq/red-zone-product-catalog
   Scenario: List SKUs returns "OK" response
     Given request contains "version" parameter from "REPLACE.ME"
     When the request is sent
diff --git a/features/v2/reference_tables.feature b/features/v2/reference_tables.feature
index 7e0b96307051..1cf30f4078b5 100644
--- a/features/v2/reference_tables.feature
+++ b/features/v2/reference_tables.feature
@@ -7,49 +7,49 @@ Feature: Reference Tables
     And a valid "appKeyAuth" key in the system
     And an instance of "ReferenceTables" API
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Batch rows query returns "Bad Request" response
     Given new "BatchRowsQuery" request
     And body with value {"data": {"attributes": {"row_ids": ["row_id_1", "row_id_2"], "table_id": "00000000-0000-0000-0000-000000000000"}, "type": "reference-tables-batch-rows-query"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Batch rows query returns "Not Found" response
     Given new "BatchRowsQuery" request
     And body with value {"data": {"attributes": {"row_ids": ["row_id_1", "row_id_2"], "table_id": "00000000-0000-0000-0000-000000000000"}, "type": "reference-tables-batch-rows-query"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Batch rows query returns "Successfully retrieved rows. Some or all requested rows were found. Response includes found rows in the included section." response
     Given new "BatchRowsQuery" request
     And body with value {"data": {"attributes": {"row_ids": ["row_id_1", "row_id_2"], "table_id": "00000000-0000-0000-0000-000000000000"}, "type": "reference-tables-batch-rows-query"}}
     When the request is sent
     Then the response status is 200 Successfully retrieved rows. Some or all requested rows were found. Response includes found rows in the included section.
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Create reference table returns "Bad Request" response
     Given new "CreateReferenceTable" request
     And body with value {"data": {"attributes": {"file_metadata": {"access_details": {"aws_detail": {"aws_account_id": "123456789000", "aws_bucket_name": "example-data-bucket", "file_path": "reference-tables/users.csv"}, "azure_detail": {"azure_client_id": "aaaaaaaa-1111-2222-3333-bbbbbbbbbbbb", "azure_container_name": "reference-data", "azure_storage_account_name": "examplestorageaccount", "azure_tenant_id": "cccccccc-4444-5555-6666-dddddddddddd", "file_path": "tables/users.csv"}, "gcp_detail": {"file_path": "data/reference_tables/users.csv", "gcp_bucket_name": "example-data-bucket", "gcp_project_id": "example-gcp-project-12345", "gcp_service_account_email": "example-service@example-gcp-project-12345.iam.gserviceaccount.com"}}, "sync_enabled": false}, "schema": {"fields": [{"name": "field_1", "type": "STRING"}], "primary_keys": ["field_1"]}, "source": "LOCAL_FILE", "table_name": "table_1", "tags": ["tag_1", "tag_2"]}, "type": "reference_table"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Create reference table returns "Created" response
     Given new "CreateReferenceTable" request
     And body with value {"data": {"attributes": {"file_metadata": {"access_details": {"aws_detail": {"aws_account_id": "123456789000", "aws_bucket_name": "example-data-bucket", "file_path": "reference-tables/users.csv"}, "azure_detail": {"azure_client_id": "aaaaaaaa-1111-2222-3333-bbbbbbbbbbbb", "azure_container_name": "reference-data", "azure_storage_account_name": "examplestorageaccount", "azure_tenant_id": "cccccccc-4444-5555-6666-dddddddddddd", "file_path": "tables/users.csv"}, "gcp_detail": {"file_path": "data/reference_tables/users.csv", "gcp_bucket_name": "example-data-bucket", "gcp_project_id": "example-gcp-project-12345", "gcp_service_account_email": "example-service@example-gcp-project-12345.iam.gserviceaccount.com"}}, "sync_enabled": false}, "schema": {"fields": [{"name": "field_1", "type": "STRING"}], "primary_keys": ["field_1"]}, "source": "LOCAL_FILE", "table_name": "table_1", "tags": ["tag_1", "tag_2"]}, "type": "reference_table"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Create reference table upload returns "Bad Request" response
     Given new "CreateReferenceTableUpload" request
     And body with value {"data": {"attributes": {"headers": ["product_id", "product_name", "price"], "part_count": 3, "part_size": 10000000, "table_name": "my_products_table"}, "type": "upload"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/redapl-experiences
+  @skip @team:ddoghq/redapl-experiences
   Scenario: Create reference table upload returns "Created" response
     Given new "CreateReferenceTableUpload" request
     And body with value {"data": {"attributes": {"headers": ["id", "name", "value"], "table_name": "test_upload_table_{{ unique }}", "part_count": 1, "part_size": 1024}, "type": "upload"}}
@@ -58,7 +58,7 @@ Feature: Reference Tables
     And the response "data.type" is equal to "upload"
     And the response "data.attributes.table_name" is equal to "test_upload_table_{{ unique }}"
 
-  @skip @team:DataDog/redapl-experiences
+  @skip @team:ddoghq/redapl-experiences
   Scenario: Create reference table with upload returns "Created" response
     Given new "CreateReferenceTable" request
     And body with value {"data": {"attributes": {"description": "Test reference table created via BDD test {{ unique }}", "source": "LOCAL_FILE", "file_metadata": {"upload_id": "test-upload-id-{{ unique }}"}, "schema": {"fields": [{"name": "id", "type": "STRING"}, {"name": "name", "type": "STRING"}, {"name": "value", "type": "INT32"}], "primary_keys": ["id"]}, "table_name": "test_reference_table_{{ unique }}", "tags": ["test_tag"]}, "type": "reference_table"}}
@@ -67,14 +67,14 @@ Feature: Reference Tables
     And the response "data.type" is equal to "reference_table"
     And the response "data.attributes.table_name" is equal to "test_reference_table_{{ unique }}"
 
-  @team:DataDog/redapl-experiences
+  @team:ddoghq/redapl-experiences
   Scenario: Create reference table without upload or access details returns "Bad Request" response
     Given new "CreateReferenceTable" request
     And body with value {"data": {"attributes": {"description": "Test reference table without upload or access details", "source": "LOCAL_FILE", "schema": {"fields": [{"name": "id", "type": "STRING"}], "primary_keys": ["id"]}, "table_name": "test_invalid_table_{{ unique }}", "tags": ["test_tag"]}, "type": "reference_table"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete rows returns "Bad Request" response
     Given new "DeleteRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -82,7 +82,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete rows returns "Conflict" response
     Given new "DeleteRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -90,7 +90,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete rows returns "Not Found" response
     Given new "DeleteRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -98,7 +98,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete rows returns "Precondition Failed" response
     Given new "DeleteRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -106,7 +106,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 412 Precondition Failed
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete rows returns "Rows deleted successfully" response
     Given new "DeleteRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -114,21 +114,21 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 200 Rows deleted successfully
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete table returns "Not Found" response
     Given new "DeleteTable" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Delete table returns "OK" response
     Given new "DeleteTable" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Get rows by id returns "Not Found" response
     Given new "GetRowsByID" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -136,7 +136,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Get rows by id returns "Some or all requested rows were found." response
     Given new "GetRowsByID" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -144,63 +144,63 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 200 Some or all requested rows were found.
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Get table returns "Not Found" response
     Given new "GetTable" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Get table returns "OK" response
     Given new "GetTable" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/redapl-experiences
+  @team:ddoghq/redapl-experiences
   Scenario: List reference table rows returns "Bad Request" response for invalid limit
     Given new "ListReferenceTableRows" request
     And request contains "id" parameter with value "not-a-valid-uuid"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/redapl-experiences
+  @team:ddoghq/redapl-experiences
   Scenario: List reference table rows returns "Not Found" response
     Given new "ListReferenceTableRows" request
     And request contains "id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: List rows returns "Bad Request" response
     Given new "ListReferenceTableRows" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: List rows returns "Not Found" response
     Given new "ListReferenceTableRows" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: List rows returns "OK" response
     Given new "ListReferenceTableRows" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/redapl-experiences
+  @skip @team:ddoghq/redapl-experiences
   Scenario: List tables returns "OK" response
     Given new "ListTables" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Update reference table returns "Bad Request" response
     Given new "UpdateReferenceTable" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -208,7 +208,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Update reference table returns "OK" response
     Given new "UpdateReferenceTable" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -216,7 +216,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Upsert rows returns "Bad Request" response
     Given new "UpsertRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -224,7 +224,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Upsert rows returns "Conflict" response
     Given new "UpsertRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -232,7 +232,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Upsert rows returns "Not Found" response
     Given new "UpsertRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -240,7 +240,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Upsert rows returns "Precondition Failed" response
     Given new "UpsertRows" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -248,7 +248,7 @@ Feature: Reference Tables
     When the request is sent
     Then the response status is 412 Precondition Failed
 
-  @generated @skip @team:DataDog/redapl-experiences
+  @generated @skip @team:ddoghq/redapl-experiences
   Scenario: Upsert rows returns "Rows created or updated successfully" response
     Given new "UpsertRows" request
     And request contains "id" parameter from "REPLACE.ME"
diff --git a/features/v2/report_schedules.feature b/features/v2/report_schedules.feature
index 040454887108..553432bbcf87 100644
--- a/features/v2/report_schedules.feature
+++ b/features/v2/report_schedules.feature
@@ -9,7 +9,7 @@ Feature: Report Schedules
     And a valid "appKeyAuth" key in the system
     And an instance of "ReportSchedules" API
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a report schedule returns "Bad Request" response
     Given operation "CreateReportSchedule" enabled
     And new "CreateReportSchedule" request
@@ -17,7 +17,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a report schedule returns "CREATED" response
     Given operation "CreateReportSchedule" enabled
     And new "CreateReportSchedule" request
@@ -25,7 +25,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a report schedule returns "Not Found" response
     Given operation "CreateReportSchedule" enabled
     And new "CreateReportSchedule" request
@@ -33,49 +33,49 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a report schedule returns "Bad Request" response
     Given new "DeleteReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a report schedule returns "Not Found" response
     Given new "DeleteReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a report schedule returns "OK" response
     Given new "DeleteReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a report schedule returns "Bad Request" response
     Given new "GetReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a report schedule returns "Not Found" response
     Given new "GetReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a report schedule returns "OK" response
     Given new "GetReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get report schedules for a resource returns "Bad Request" response
     Given new "GetReportSchedulesForResource" request
     And request contains "resource_type" parameter from "REPLACE.ME"
@@ -83,7 +83,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get report schedules for a resource returns "Not Found" response
     Given new "GetReportSchedulesForResource" request
     And request contains "resource_type" parameter from "REPLACE.ME"
@@ -91,7 +91,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get report schedules for a resource returns "OK" response
     Given new "GetReportSchedulesForResource" request
     And request contains "resource_type" parameter from "REPLACE.ME"
@@ -99,74 +99,74 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List dataset report schedules returns "Bad Request" response
     Given new "ListDatasetReportSchedules" request
     And request contains "dataset_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List dataset report schedules returns "Not Found" response
     Given new "ListDatasetReportSchedules" request
     And request contains "dataset_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List dataset report schedules returns "OK" response
     Given new "ListDatasetReportSchedules" request
     And request contains "dataset_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List report schedules returns "Bad Request" response
     Given new "ListReportSchedules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List report schedules returns "Not Found" response
     Given new "ListReportSchedules" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: List report schedules returns "OK" response
     Given new "ListReportSchedules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Print a report returns "Bad Request" response
     Given new "PrintReport" request
     And body with value {"data": {"attributes": {"from_ts": 1780318800000, "resource_id": "abc-def-ghi", "resource_type": "dashboard", "template_variables": [{"name": "env", "values": ["prod"]}], "timeframe": "1w", "timezone": "America/New_York", "to_ts": 1780923600000}, "type": "report"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Print a report returns "Not Found" response
     Given new "PrintReport" request
     And body with value {"data": {"attributes": {"from_ts": 1780318800000, "resource_id": "abc-def-ghi", "resource_type": "dashboard", "template_variables": [{"name": "env", "values": ["prod"]}], "timeframe": "1w", "timezone": "America/New_York", "to_ts": 1780923600000}, "type": "report"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Print a report returns "OK" response
     Given new "PrintReport" request
     And body with value {"data": {"attributes": {"from_ts": 1780318800000, "resource_id": "abc-def-ghi", "resource_type": "dashboard", "template_variables": [{"name": "env", "values": ["prod"]}], "timeframe": "1w", "timezone": "America/New_York", "to_ts": 1780923600000}, "type": "report"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Print a report returns "Unprocessable Entity" response
     Given new "PrintReport" request
     And body with value {"data": {"attributes": {"from_ts": 1780318800000, "resource_id": "abc-def-ghi", "resource_type": "dashboard", "template_variables": [{"name": "env", "values": ["prod"]}], "timeframe": "1w", "timezone": "America/New_York", "to_ts": 1780923600000}, "type": "report"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Toggle a report schedule returns "Bad Request" response
     Given new "ToggleReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
@@ -174,7 +174,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Toggle a report schedule returns "Not Found" response
     Given new "ToggleReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
@@ -182,7 +182,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Toggle a report schedule returns "OK" response
     Given new "ToggleReportSchedule" request
     And request contains "schedule_uuid" parameter from "REPLACE.ME"
@@ -190,7 +190,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a report schedule returns "Bad Request" response
     Given operation "PatchReportSchedule" enabled
     And new "PatchReportSchedule" request
@@ -199,7 +199,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a report schedule returns "Not Found" response
     Given operation "PatchReportSchedule" enabled
     And new "PatchReportSchedule" request
@@ -208,7 +208,7 @@ Feature: Report Schedules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a report schedule returns "OK" response
     Given operation "PatchReportSchedule" enabled
     And new "PatchReportSchedule" request
diff --git a/features/v2/reporting_and_sharing.feature b/features/v2/reporting_and_sharing.feature
index 7859e0360388..b99d866d27a4 100644
--- a/features/v2/reporting_and_sharing.feature
+++ b/features/v2/reporting_and_sharing.feature
@@ -11,17 +11,17 @@ Feature: Reporting And Sharing
     And new "CreateSnapshot" request
     And body with value {"data": {"attributes": {"additional_config": {"template_variables": [{"name": "host", "prefix": "host", "values": ["web-server-1", "web-server-2"]}], "timeseries_legend_type": "expanded", "timezone_offset_minutes": 300}, "end": 1692464800000, "height": 185, "is_authenticated": false, "start": 1692464000000, "ttl": "60d", "widget_definition": {"requests": [{"q": "avg:system.cpu.user{*}"}], "type": "timeseries"}, "width": 300}, "type": "create_snapshot"}}
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a graph snapshot returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a graph snapshot returns "Not Found" response
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a graph snapshot returns "OK" response
     When the request is sent
     Then the response status is 200 OK
diff --git a/features/v2/restriction_policies.feature b/features/v2/restriction_policies.feature
index fee687434159..f741650c94cf 100644
--- a/features/v2/restriction_policies.feature
+++ b/features/v2/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/access-policies-lifecycle
+  @team:ddoghq/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/access-policies-lifecycle
+  @team:ddoghq/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/access-policies-lifecycle
+  @team:ddoghq/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/access-policies-lifecycle
+  @team:ddoghq/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/access-policies-lifecycle
+  @team:ddoghq/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/access-policies-lifecycle
+  @team:ddoghq/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
diff --git a/features/v2/roles.feature b/features/v2/roles.feature
index 60dc17e9644d..61a072d65f3e 100644
--- a/features/v2/roles.feature
+++ b/features/v2/roles.feature
@@ -15,7 +15,7 @@ Feature: Roles
     And a valid "appKeyAuth" key in the system
     And an instance of "Roles" API
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Add a user to a role returns "Bad Request" response
     Given new "AddUserToRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -23,7 +23,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Add a user to a role returns "Not found" response
     Given new "AddUserToRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -31,7 +31,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Add a user to a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "user" in the system
@@ -44,7 +44,7 @@ Feature: Roles
     And the response "data[0].type" is equal to "{{ user.data.type }}"
     And the response "data[0].relationships.roles.data" has item with field "id" with value "{{ role.data.id }}"
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Create a new role by cloning an existing role returns "Bad Request" response
     Given there is a valid "role" in the system
     And new "CloneRole" request
@@ -53,7 +53,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Create a new role by cloning an existing role returns "Conflict" response
     Given there is a valid "role" in the system
     And new "CloneRole" request
@@ -62,7 +62,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Create a new role by cloning an existing role returns "Not found" response
     Given new "CloneRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -70,7 +70,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Create a new role by cloning an existing role returns "OK" response
     Given there is a valid "role" in the system
     And new "CloneRole" request
@@ -80,21 +80,21 @@ Feature: Roles
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "{{ unique }} clone"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Create role returns "Bad Request" response
     Given new "CreateRole" request
     And body with value {"data": {"attributes": {"name": "developers", "receives_permissions_from": []}, "relationships": {"permissions": {"data": [{"type": "permissions"}]}}, "type": "roles"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Create role returns "OK" response
     Given new "CreateRole" request
     And body with value {"data": {"attributes": {"name": "developers", "receives_permissions_from": []}, "relationships": {"permissions": {"data": [{"type": "permissions"}]}}, "type": "roles"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Create role with a permission returns "OK" response
     Given new "CreateRole" request
     And there is a valid "permission" in the system
@@ -105,14 +105,14 @@ Feature: Roles
     And the response "data.type" is equal to "roles"
     And the response "data.relationships.permissions.data" has item with field "id" with value "{{ permission.id }}"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Delete role returns "Not found" response
     Given new "DeleteRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Delete role returns "OK" response
     Given there is a valid "role" in the system
     And new "DeleteRole" request
@@ -120,14 +120,14 @@ Feature: Roles
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Get a role returns "Not found" response
     Given new "GetRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Get a role returns "OK" response
     Given there is a valid "role" in the system
     And new "GetRole" request
@@ -137,14 +137,14 @@ Feature: Roles
     And the response "data.attributes.name" has the same value as "role.data.attributes.name"
     And the response "data.id" has the same value as "role.data.id"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Get all users of a role returns "Not found" response
     Given new "ListRoleUsers" request
     And request contains "role_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Get all users of a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "user" in the system
@@ -156,7 +156,7 @@ Feature: Roles
     And the response "meta.page.total_count" is equal to 1
     And the response "data" has item with field "id" with value "{{ user.data.id }}"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Grant permission to a role returns "Bad Request" response
     Given new "AddPermissionToRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -164,7 +164,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Grant permission to a role returns "Not found" response
     Given new "AddPermissionToRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -172,7 +172,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Grant permission to a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -184,14 +184,14 @@ Feature: Roles
     And the response "data[0].type" is equal to "{{ permission.type }}"
     And the response "data" has item with field "id" with value "{{ permission.id }}"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: List permissions for a role returns "Not found" response
     Given new "ListRolePermissions" request
     And request contains "role_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: List permissions for a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -203,7 +203,7 @@ Feature: Roles
     And the response "data[0].type" is equal to "{{ permission.type }}"
     And the response "data" has item with field "id" with value "{{ permission.id }}"
 
-  @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: List permissions including scopes returns "OK" response
     Given new "ListPermissions" request
     And request contains "include_scopes" parameter with value true
@@ -211,13 +211,13 @@ Feature: Roles
     Then the response status is 200 OK
     And the response "data" has item with field "attributes.name" with value "admin"
 
-  @generated @skip @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: List permissions returns "Bad Request" response
     Given new "ListPermissions" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-core-access @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/aaa-core-access @team:ddoghq/access-policies-lifecycle
   Scenario: List permissions returns "OK" response
     Given new "ListPermissions" request
     When the request is sent
@@ -227,14 +227,14 @@ Feature: Roles
     And the response "data" has item with field "attributes.name" with value "admin"
     And the response "data" has item with field "attributes.name_aliases" with value []
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: List role templates returns "OK" response
     Given operation "ListRoleTemplates" enabled
     And new "ListRoleTemplates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: List roles returns "OK" response
     Given there is a valid "role" in the system
     And new "ListRoles" request
@@ -245,7 +245,7 @@ Feature: Roles
     And the response "data[0].id" has the same value as "role.data.id"
     And the response "data[0].attributes.name" has the same value as "role.data.attributes.name"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Remove a user from a role returns "Bad Request" response
     Given new "RemoveUserFromRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -253,7 +253,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Remove a user from a role returns "Not found" response
     Given new "RemoveUserFromRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
@@ -261,7 +261,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Remove a user from a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "user" in the system
@@ -272,7 +272,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/access-policies-lifecycle
+  @skip-validation @team:ddoghq/access-policies-lifecycle
   Scenario: Revoke permission returns "Bad Request" response
     Given there is a valid "role" in the system
     And new "RemovePermissionFromRole" request
@@ -281,7 +281,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Revoke permission returns "Not found" response
     Given there is a valid "permission" in the system
     And new "RemovePermissionFromRole" request
@@ -290,7 +290,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Revoke permission returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -302,7 +302,7 @@ Feature: Roles
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "permissions"
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Update a role returns "Bad Request" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -312,7 +312,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Update a role returns "Bad Role ID" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -322,7 +322,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 422 Bad Role ID in Request
 
-  @team:DataDog/access-policies-lifecycle
+  @team:ddoghq/access-policies-lifecycle
   Scenario: Update a role returns "Not found" response
     Given there is a valid "permission" in the system
     And new "UpdateRole" request
@@ -331,7 +331,7 @@ Feature: Roles
     When the request is sent
     Then the response status is 404 Not found
 
-  @skip @team:DataDog/access-policies-lifecycle
+  @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Update a role returns "OK" response
     Given there is a valid "role" in the system
     And there is a valid "permission" in the system
@@ -342,7 +342,7 @@ Feature: Roles
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "{{ role.data.attributes.name }}-updated"
 
-  @generated @skip @team:DataDog/access-policies-lifecycle
+  @generated @skip @team:ddoghq/access-policies-lifecycle
   Scenario: Update a role returns "Unprocessable Entity" response
     Given new "UpdateRole" request
     And request contains "role_id" parameter from "REPLACE.ME"
diff --git a/features/v2/rum.feature b/features/v2/rum.feature
index e25922fb48cd..6cfb64f14f38 100644
--- a/features/v2/rum.feature
+++ b/features/v2/rum.feature
@@ -10,14 +10,14 @@ Feature: RUM
     And a valid "appKeyAuth" key in the system
     And an instance of "RUM" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Aggregate RUM events returns "Bad Request" response
     Given new "AggregateRUMEvents" request
     And body with value {"compute": [{"aggregation": "pc90", "interval": "5m", "metric": "@duration", "type": "total"}], "filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "group_by": [{"facet": "@view.time_spent", "histogram": {"interval": 10, "max": 100, "min": 50}, "limit": 10, "sort": {"aggregation": "count", "order": "asc"}, "total": false}], "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Aggregate RUM events returns "OK" response
     Given new "AggregateRUMEvents" request
     And body with value {"compute": [{"aggregation": "pc90", "metric": "@view.time_spent", "type": "total"}], "filter": {"from": "now-15m", "query": "@type:view AND @session.type:user", "to": "now"}, "group_by": [{"facet": "@view.time_spent", "limit": 10, "total": false}], "options": {"timezone": "GMT"}, "page": { "limit": 25}}
@@ -26,14 +26,14 @@ Feature: RUM
     And the response "meta.status" is equal to "done"
     And the response "data.buckets" has length 0
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Create a new RUM application returns "Bad Request" response
     Given new "CreateRUMApplication" request
     And body with value {"data": {"attributes": {"name": "wrong_rum_application", "type": "wrong_android"}, "type": "wrong_rum_application_type"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Create a new RUM application returns "OK" response
     Given new "CreateRUMApplication" request
     And body with value {"data": {"attributes": {"name": "test-rum-{{ unique_hash }}", "type": "ios"}, "type": "rum_application_create"}}
@@ -47,7 +47,7 @@ Feature: RUM
     And the response "data.attributes.product_scales.rum_event_processing_scale" has field "last_modified_at"
     And the response "data.attributes.product_scales.product_analytics_retention_scale" has field "last_modified_at"
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Create a new RUM application with Product Scales returns "OK" response
     Given new "CreateRUMApplication" request
     And body with value {"data": {"attributes": {"name": "test-rum-with-product-scales-{{ unique_hash }}", "type": "browser", "rum_event_processing_state": "ERROR_FOCUSED_MODE", "product_analytics_retention_state": "NONE"}, "type": "rum_application_create"}}
@@ -60,7 +60,7 @@ Feature: RUM
     And the response "data.attributes.product_scales.rum_event_processing_scale" has field "last_modified_at"
     And the response "data.attributes.product_scales.product_analytics_retention_scale" has field "last_modified_at"
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Delete a RUM application returns "No Content" response
     Given there is a valid "rum_application" in the system
     And new "DeleteRUMApplication" request
@@ -68,21 +68,21 @@ Feature: RUM
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Delete a RUM application returns "Not Found" response
     Given new "DeleteRUMApplication" request
     And request contains "id" parameter with value "abcde-12345"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a RUM application returns "Not Found" response
     Given new "GetRUMApplication" request
     And request contains "id" parameter with value "abcd1234-0000-0000-abcd-1234abcd5678"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Get a RUM application returns "OK" response
     Given there is a valid "rum_application" in the system
     And new "GetRUMApplication" request
@@ -94,19 +94,19 @@ Feature: RUM
     And the response "data.attributes.name" is equal to "test-rum-{{ unique_hash }}"
     And the response "data.attributes" has field "product_scales"
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a list of RUM events returns "Bad Request" response
     Given new "ListRUMEvents" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a list of RUM events returns "OK" response
     Given new "ListRUMEvents" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/rum-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/rum-backend @with-pagination
   Scenario: Get a list of RUM events returns "OK" response with pagination
     Given new "ListRUMEvents" request
     And request contains "page[limit]" parameter with value 2
@@ -114,13 +114,13 @@ Feature: RUM
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: List all the RUM applications returns "Not Found" response
     Given new "GetRUMApplications" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: List all the RUM applications returns "OK" response
     Given there is a valid "rum_application" in the system
     And new "GetRUMApplications" request
@@ -130,21 +130,21 @@ Feature: RUM
     And the response "data" has item with field "attributes.product_scales.rum_event_processing_scale.state" with value "ALL"
     And the response "data" has item with field "attributes.product_scales.product_analytics_retention_scale.state" with value "NONE"
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Search RUM events returns "Bad Request" response
     Given new "SearchRUMEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Search RUM events returns "OK" response
     Given new "SearchRUMEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "options": {"time_offset": 0, "timezone": "GMT"}, "page": {"limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/rum-backend @with-pagination
+  @replay-only @skip-validation @team:ddoghq/rum-backend @with-pagination
   Scenario: Search RUM events returns "OK" response with pagination
     Given new "SearchRUMEvents" request
     And body with value {"filter": {"from": "now-15m", "query": "@type:session AND @session.type:user", "to": "now"}, "options": {"time_offset": 0, "timezone": "GMT"}, "page": {"limit": 2}, "sort": "timestamp"}
@@ -152,7 +152,7 @@ Feature: RUM
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM application returns "Bad Request" response
     Given new "UpdateRUMApplication" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -160,7 +160,7 @@ Feature: RUM
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM application returns "Not Found" response
     Given new "UpdateRUMApplication" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -168,7 +168,7 @@ Feature: RUM
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Update a RUM application returns "OK" response
     Given there is a valid "rum_application" in the system
     And new "UpdateRUMApplication" request
@@ -185,7 +185,7 @@ Feature: RUM
     And the response "data.attributes.product_scales.rum_event_processing_scale" has field "last_modified_at"
     And the response "data.attributes.product_scales.product_analytics_retention_scale" has field "last_modified_at"
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Update a RUM application returns "Unprocessable Entity." response
     Given there is a valid "rum_application" in the system
     And new "UpdateRUMApplication" request
@@ -194,7 +194,7 @@ Feature: RUM
     When the request is sent
     Then the response status is 422 Unprocessable Entity.
 
-  @skip-validation @team:DataDog/rum-backend
+  @skip-validation @team:ddoghq/rum-backend
   Scenario: Update a RUM application with Product Scales returns "OK" response
     Given there is a valid "rum_application" in the system
     And new "UpdateRUMApplication" request
diff --git a/features/v2/rum_audience_management.feature b/features/v2/rum_audience_management.feature
index b358e9a34921..7591800a0d78 100644
--- a/features/v2/rum_audience_management.feature
+++ b/features/v2/rum_audience_management.feature
@@ -7,7 +7,7 @@ Feature: Rum Audience Management
     And a valid "appKeyAuth" key in the system
     And an instance of "RumAudienceManagement" API
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Create connection returns "Connection created successfully" response
     Given operation "CreateConnection" enabled
     And new "CreateConnection" request
@@ -16,7 +16,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 201 Connection created successfully
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Delete connection returns "Connection deleted successfully" response
     Given operation "DeleteConnection" enabled
     And new "DeleteConnection" request
@@ -25,7 +25,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 204 Connection deleted successfully
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Get account facet info returns "Successful response with facet information" response
     Given operation "GetAccountFacetInfo" enabled
     And new "GetAccountFacetInfo" request
@@ -33,7 +33,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with facet information
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Get mapping returns "Successful response with entity mapping configuration" response
     Given operation "GetMapping" enabled
     And new "GetMapping" request
@@ -41,7 +41,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with entity mapping configuration
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Get user facet info returns "Successful response with facet information" response
     Given operation "GetUserFacetInfo" enabled
     And new "GetUserFacetInfo" request
@@ -49,7 +49,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with facet information
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: List connections returns "Successful response with list of connections" response
     Given operation "ListConnections" enabled
     And new "ListConnections" request
@@ -57,7 +57,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with list of connections
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Query accounts returns "Successful response with account data" response
     Given operation "QueryAccounts" enabled
     And new "QueryAccounts" request
@@ -65,7 +65,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with account data
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Query event filtered users returns "Successful response with filtered user data" response
     Given operation "QueryEventFilteredUsers" enabled
     And new "QueryEventFilteredUsers" request
@@ -73,7 +73,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with filtered user data
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Query users returns "Successful response with user data" response
     Given operation "QueryUsers" enabled
     And new "QueryUsers" request
@@ -81,7 +81,7 @@ Feature: Rum Audience Management
     When the request is sent
     Then the response status is 200 Successful response with user data
 
-  @generated @skip @team:DataDog/audience-management-backend @team:DataDog/product-analytics-ingestion
+  @generated @skip @team:ddoghq/audience-management-backend @team:ddoghq/product-analytics-ingestion
   Scenario: Update connection returns "Connection updated successfully" response
     Given operation "UpdateConnection" enabled
     And new "UpdateConnection" request
diff --git a/features/v2/rum_config.feature b/features/v2/rum_config.feature
index 8d9cc7dd05f9..3d34e0451e1d 100644
--- a/features/v2/rum_config.feature
+++ b/features/v2/rum_config.feature
@@ -9,7 +9,7 @@ Feature: RUM Config
     And a valid "appKeyAuth" key in the system
     And an instance of "RUMConfig" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create the RUM configuration returns "Bad Request" response
     Given operation "CreateRumConfig" enabled
     And new "CreateRumConfig" request
@@ -17,7 +17,7 @@ Feature: RUM Config
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create the RUM configuration returns "Created" response
     Given operation "CreateRumConfig" enabled
     And new "CreateRumConfig" request
@@ -25,14 +25,14 @@ Feature: RUM Config
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get the RUM configuration returns "OK" response
     Given operation "GetRumConfig" enabled
     And new "GetRumConfig" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update the RUM configuration returns "Bad Request" response
     Given operation "UpdateRumConfig" enabled
     And new "UpdateRumConfig" request
@@ -40,7 +40,7 @@ Feature: RUM Config
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update the RUM configuration returns "OK" response
     Given operation "UpdateRumConfig" enabled
     And new "UpdateRumConfig" request
diff --git a/features/v2/rum_insights.feature b/features/v2/rum_insights.feature
index a06b8e62eac8..5c09c0e447b5 100644
--- a/features/v2/rum_insights.feature
+++ b/features/v2/rum_insights.feature
@@ -10,7 +10,7 @@ Feature: RUM Insights
     And a valid "appKeyAuth" key in the system
     And an instance of "RUMInsights" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Query aggregated long tasks returns "Bad Request" response
     Given operation "QueryAggregatedLongTasks" enabled
     And new "QueryAggregatedLongTasks" request
@@ -18,7 +18,7 @@ Feature: RUM Insights
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Query aggregated long tasks returns "Successful response" response
     Given operation "QueryAggregatedLongTasks" enabled
     And new "QueryAggregatedLongTasks" request
@@ -26,7 +26,7 @@ Feature: RUM Insights
     When the request is sent
     Then the response status is 201 Successful response
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Query aggregated waterfall returns "Bad Request" response
     Given operation "QueryAggregatedWaterfall" enabled
     And new "QueryAggregatedWaterfall" request
@@ -34,7 +34,7 @@ Feature: RUM Insights
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Query aggregated waterfall returns "Successful response" response
     Given operation "QueryAggregatedWaterfall" enabled
     And new "QueryAggregatedWaterfall" request
diff --git a/features/v2/rum_metrics.feature b/features/v2/rum_metrics.feature
index c87b3187ba57..771a8599c45c 100644
--- a/features/v2/rum_metrics.feature
+++ b/features/v2/rum_metrics.feature
@@ -9,14 +9,14 @@ Feature: Rum Metrics
     And a valid "appKeyAuth" key in the system
     And an instance of "RumMetrics" API
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Create a RUM-based metric returns "Bad Request" response
     Given new "CreateRumMetric" request
     And body with value {"data": {"id": "rum.actions.invalid", "type": "rum_metrics", "attributes": {"event_type": "action", "compute": {"aggregation_type": "count"}, "uniqueness":{"when": "match"}}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Create a RUM-based metric returns "Conflict" response
     Given there is a valid "rum_metric" in the system
     And new "CreateRumMetric" request
@@ -24,7 +24,7 @@ Feature: Rum Metrics
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Create a RUM-based metric returns "Created" response
     Given new "CreateRumMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": true, "path": "@duration"}, "event_type": "session", "filter": {"query": "@service:web-ui"}, "group_by": [{"path": "@browser.name", "tag_name": "browser_name"}], "uniqueness": {"when": "match"}}, "id": "{{ unique_lower_alnum }}", "type": "rum_metrics"}}
@@ -41,7 +41,7 @@ Feature: Rum Metrics
     And the response "data.attributes.group_by[0].tag_name" is equal to "browser_name"
     And the response "data.attributes.uniqueness.when" is equal to "match"
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Delete a RUM-based metric returns "No Content" response
     Given there is a valid "rum_metric" in the system
     And new "DeleteRumMetric" request
@@ -49,21 +49,21 @@ Feature: Rum Metrics
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Delete a RUM-based metric returns "Not Found" response
     Given new "DeleteRumMetric" request
     And request contains "metric_id" parameter with value "{{ unique }}"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a RUM-based metric returns "Not Found" response
     Given new "GetRumMetric" request
     And request contains "metric_id" parameter with value "{{ unique }}"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a RUM-based metric returns "OK" response
     Given there is a valid "rum_metric" in the system
     And new "GetRumMetric" request
@@ -81,13 +81,13 @@ Feature: Rum Metrics
     And the response "data.attributes.group_by[0].tag_name" has the same value as "rum_metric.data.attributes.group_by[0].tag_name"
     And the response "data.attributes.uniqueness.when" has the same value as "rum_metric.data.attributes.uniqueness.when"
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get all RUM-based metrics returns "OK" response
     Given new "ListRumMetrics" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM-based metric returns "Bad Request" response
     Given there is a valid "rum_metric" in the system
     And new "UpdateRumMetric" request
@@ -96,7 +96,7 @@ Feature: Rum Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM-based metric returns "Conflict" response
     Given there is a valid "rum_metric" in the system
     And new "UpdateRumMetric" request
@@ -105,7 +105,7 @@ Feature: Rum Metrics
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM-based metric returns "Not Found" response
     Given there is a valid "rum_metric" in the system
     And new "UpdateRumMetric" request
@@ -114,7 +114,7 @@ Feature: Rum Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM-based metric returns "OK" response
     Given there is a valid "rum_metric" in the system
     And new "UpdateRumMetric" request
diff --git a/features/v2/rum_operations.feature b/features/v2/rum_operations.feature
index ad0b554d9067..e5171c460a41 100644
--- a/features/v2/rum_operations.feature
+++ b/features/v2/rum_operations.feature
@@ -11,7 +11,7 @@ Feature: RUM Operations
     And a valid "appKeyAuth" key in the system
     And an instance of "RUMOperations" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation link returns "Bad Request" response
     Given operation "CreateRUMOperationStrongLink" enabled
     And new "CreateRUMOperationStrongLink" request
@@ -19,7 +19,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation link returns "Conflict. A link between this operation and journey already exists." response
     Given operation "CreateRUMOperationStrongLink" enabled
     And new "CreateRUMOperationStrongLink" request
@@ -27,7 +27,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 409 Conflict. A link between this operation and journey already exists.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation link returns "Created" response
     Given operation "CreateRUMOperationStrongLink" enabled
     And new "CreateRUMOperationStrongLink" request
@@ -35,7 +35,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation link returns "Not Found. The referenced `operation_id` does not exist." response
     Given operation "CreateRUMOperationStrongLink" enabled
     And new "CreateRUMOperationStrongLink" request
@@ -43,7 +43,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found. The referenced `operation_id` does not exist.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation returns "Bad Request" response
     Given operation "CreateRUMOperation" enabled
     And new "CreateRUMOperation" request
@@ -51,7 +51,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation returns "Conflict. An operation with this name already exists." response
     Given operation "CreateRUMOperation" enabled
     And new "CreateRUMOperation" request
@@ -59,7 +59,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 409 Conflict. An operation with this name already exists.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM operation returns "OK" response
     Given operation "CreateRUMOperation" enabled
     And new "CreateRUMOperation" request
@@ -67,7 +67,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM operation link returns "No Content" response
     Given operation "DeleteRUMOperationStrongLink" enabled
     And new "DeleteRUMOperationStrongLink" request
@@ -76,7 +76,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM operation link returns "Not Found" response
     Given operation "DeleteRUMOperationStrongLink" enabled
     And new "DeleteRUMOperationStrongLink" request
@@ -85,7 +85,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM operation returns "No Content" response
     Given operation "DeleteRUMOperation" enabled
     And new "DeleteRUMOperation" request
@@ -93,7 +93,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM operation returns "Not Found" response
     Given operation "DeleteRUMOperation" enabled
     And new "DeleteRUMOperation" request
@@ -101,7 +101,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM operation by name returns "Bad Request" response
     Given operation "GetRUMOperationByName" enabled
     And new "GetRUMOperationByName" request
@@ -109,7 +109,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM operation by name returns "Not Found" response
     Given operation "GetRUMOperationByName" enabled
     And new "GetRUMOperationByName" request
@@ -117,7 +117,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM operation by name returns "OK" response
     Given operation "GetRUMOperationByName" enabled
     And new "GetRUMOperationByName" request
@@ -125,7 +125,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM operation returns "Not Found" response
     Given operation "GetRUMOperation" enabled
     And new "GetRUMOperation" request
@@ -133,7 +133,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM operation returns "OK" response
     Given operation "GetRUMOperation" enabled
     And new "GetRUMOperation" request
@@ -141,33 +141,33 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: List RUM operation links returns "Bad Request" response
     Given new "ListRUMOperationStrongLinks" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: List RUM operation links returns "OK" response
     Given new "ListRUMOperationStrongLinks" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Search RUM operations returns "Bad Request" response
     Given operation "ListRUMOperations" enabled
     And new "ListRUMOperations" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Search RUM operations returns "OK" response
     Given operation "ListRUMOperations" enabled
     And new "ListRUMOperations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation link returns "Bad Request" response
     Given operation "UpdateRUMOperationStrongLink" enabled
     And new "UpdateRUMOperationStrongLink" request
@@ -177,7 +177,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation link returns "Not Found" response
     Given operation "UpdateRUMOperationStrongLink" enabled
     And new "UpdateRUMOperationStrongLink" request
@@ -187,7 +187,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation link returns "OK" response
     Given operation "UpdateRUMOperationStrongLink" enabled
     And new "UpdateRUMOperationStrongLink" request
@@ -197,7 +197,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation returns "Bad Request" response
     Given operation "UpdateRUMOperation" enabled
     And new "UpdateRUMOperation" request
@@ -206,7 +206,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation returns "Conflict. An operation with this name already exists." response
     Given operation "UpdateRUMOperation" enabled
     And new "UpdateRUMOperation" request
@@ -215,7 +215,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 409 Conflict. An operation with this name already exists.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation returns "Not Found" response
     Given operation "UpdateRUMOperation" enabled
     And new "UpdateRUMOperation" request
@@ -224,7 +224,7 @@ Feature: RUM Operations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM operation returns "OK" response
     Given operation "UpdateRUMOperation" enabled
     And new "UpdateRUMOperation" request
diff --git a/features/v2/rum_remote_config.feature b/features/v2/rum_remote_config.feature
index 363d3f0ac324..57ff5cfd7fbc 100644
--- a/features/v2/rum_remote_config.feature
+++ b/features/v2/rum_remote_config.feature
@@ -9,7 +9,7 @@ Feature: RUM Remote Config
     And a valid "appKeyAuth" key in the system
     And an instance of "RUMRemoteConfig" API
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a RUM SDK configuration returns "Forbidden" response
     Given operation "GetRumSdkConfig" enabled
     And new "GetRumSdkConfig" request
@@ -17,7 +17,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 403 Forbidden
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM SDK configuration returns "Not Found" response
     Given operation "GetRumSdkConfig" enabled
     And new "GetRumSdkConfig" request
@@ -25,7 +25,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM SDK configuration returns "OK" response
     Given operation "GetRumSdkConfig" enabled
     And new "GetRumSdkConfig" request
@@ -33,7 +33,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM SDK configuration returns "Bad Request" response
     Given operation "UpdateRumSdkConfig" enabled
     And new "UpdateRumSdkConfig" request
@@ -42,7 +42,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM SDK configuration returns "Forbidden" response
     Given operation "UpdateRumSdkConfig" enabled
     And new "UpdateRumSdkConfig" request
@@ -51,7 +51,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 403 Forbidden
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM SDK configuration returns "Not Found" response
     Given operation "UpdateRumSdkConfig" enabled
     And new "UpdateRumSdkConfig" request
@@ -60,7 +60,7 @@ Feature: RUM Remote Config
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM SDK configuration returns "OK" response
     Given operation "UpdateRumSdkConfig" enabled
     And new "UpdateRumSdkConfig" request
diff --git a/features/v2/rum_replay_heatmaps.feature b/features/v2/rum_replay_heatmaps.feature
index 69b8076d2a50..b2dbedd75264 100644
--- a/features/v2/rum_replay_heatmaps.feature
+++ b/features/v2/rum_replay_heatmaps.feature
@@ -8,28 +8,28 @@ Feature: Rum Replay Heatmaps
     And a valid "appKeyAuth" key in the system
     And an instance of "RumReplayHeatmaps" API
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Create replay heatmap snapshot returns "Created" response
     Given new "CreateReplayHeatmapSnapshot" request
     And body with value {"data": {"attributes": {"application_id": "aaaaaaaa-1111-2222-3333-bbbbbbbbbbbb", "device_type": "desktop", "event_id": "11111111-2222-3333-4444-555555555555", "is_device_type_selected_by_user": false, "snapshot_name": "My Snapshot", "start": 0, "view_name": "/home"}, "type": "snapshots"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Delete replay heatmap snapshot returns "No Content" response
     Given new "DeleteReplayHeatmapSnapshot" request
     And request contains "snapshot_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: List replay heatmap snapshots returns "OK" response
     Given new "ListReplayHeatmapSnapshots" request
     And request contains "filter[view_name]" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Update replay heatmap snapshot returns "OK" response
     Given new "UpdateReplayHeatmapSnapshot" request
     And request contains "snapshot_id" parameter from "REPLACE.ME"
diff --git a/features/v2/rum_replay_playlists.feature b/features/v2/rum_replay_playlists.feature
index bd1a9f7ae8b9..fcdf495cf701 100644
--- a/features/v2/rum_replay_playlists.feature
+++ b/features/v2/rum_replay_playlists.feature
@@ -8,7 +8,7 @@ Feature: Rum Replay Playlists
     And a valid "appKeyAuth" key in the system
     And an instance of "RumReplayPlaylists" API
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Add RUM replay session to playlist returns "Created" response
     Given new "AddRumReplaySessionToPlaylist" request
     And request contains "ts" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: Rum Replay Playlists
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Add RUM replay session to playlist returns "OK" response
     Given new "AddRumReplaySessionToPlaylist" request
     And request contains "ts" parameter from "REPLACE.ME"
@@ -26,7 +26,7 @@ Feature: Rum Replay Playlists
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Bulk remove RUM replay playlist sessions returns "No Content" response
     Given new "BulkRemoveRumReplayPlaylistSessions" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
@@ -34,41 +34,41 @@ Feature: Rum Replay Playlists
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Create RUM replay playlist returns "Created" response
     Given new "CreateRumReplayPlaylist" request
     And body with value {"data": {"attributes": {"created_by": {"handle": "john.doe@example.com", "id": "00000000-0000-0000-0000-000000000001", "uuid": "00000000-0000-0000-0000-000000000001"}, "name": "My Playlist"}, "type": "rum_replay_playlist"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Delete RUM replay playlist returns "No Content" response
     Given new "DeleteRumReplayPlaylist" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Get RUM replay playlist returns "OK" response
     Given new "GetRumReplayPlaylist" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: List RUM replay playlist sessions returns "OK" response
     Given new "ListRumReplayPlaylistSessions" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: List RUM replay playlists returns "OK" response
     Given new "ListRumReplayPlaylists" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Remove RUM replay session from playlist returns "No Content" response
     Given new "RemoveRumReplaySessionFromPlaylist" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
@@ -76,7 +76,7 @@ Feature: Rum Replay Playlists
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Update RUM replay playlist returns "OK" response
     Given new "UpdateRumReplayPlaylist" request
     And request contains "playlist_id" parameter from "REPLACE.ME"
diff --git a/features/v2/rum_replay_sessions.feature b/features/v2/rum_replay_sessions.feature
index 3aab0ffe818a..7d71cec4e2fd 100644
--- a/features/v2/rum_replay_sessions.feature
+++ b/features/v2/rum_replay_sessions.feature
@@ -3,7 +3,7 @@ Feature: Rum Replay Sessions
   Retrieve segments for RUM replay sessions. Access session replay data
   stored in event platform or blob storage.
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Get segments returns "OK" response
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
diff --git a/features/v2/rum_replay_viewership.feature b/features/v2/rum_replay_viewership.feature
index 22d5630a38ee..9885fe5c42dd 100644
--- a/features/v2/rum_replay_viewership.feature
+++ b/features/v2/rum_replay_viewership.feature
@@ -8,7 +8,7 @@ Feature: Rum Replay Viewership
     And a valid "appKeyAuth" key in the system
     And an instance of "RumReplayViewership" API
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Create RUM replay session watch returns "Created" response
     Given new "CreateRumReplaySessionWatch" request
     And request contains "session_id" parameter from "REPLACE.ME"
@@ -16,21 +16,21 @@ Feature: Rum Replay Viewership
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: Delete RUM replay session watch returns "No Content" response
     Given new "DeleteRumReplaySessionWatch" request
     And request contains "session_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: List RUM replay session watchers returns "OK" response
     Given new "ListRumReplaySessionWatchers" request
     And request contains "session_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/session-replay
+  @generated @skip @team:ddoghq/session-replay
   Scenario: List RUM replay viewership history sessions returns "OK" response
     Given new "ListRumReplayViewershipHistorySessions" request
     When the request is sent
diff --git a/features/v2/rum_retention_filters.feature b/features/v2/rum_retention_filters.feature
index e9823f588cfe..31d5ea00f53a 100644
--- a/features/v2/rum_retention_filters.feature
+++ b/features/v2/rum_retention_filters.feature
@@ -9,7 +9,7 @@ Feature: Rum Retention Filters
     And a valid "appKeyAuth" key in the system
     And an instance of "RumRetentionFilters" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM exclusion filter returns "Bad Request" response
     Given operation "CreateExclusionFilter" enabled
     And new "CreateExclusionFilter" request
@@ -18,7 +18,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a RUM exclusion filter returns "Created" response
     Given operation "CreateExclusionFilter" enabled
     And new "CreateExclusionFilter" request
@@ -27,7 +27,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Create a RUM retention filter returns "Bad Request" response
     Given new "CreateRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -35,7 +35,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Create a RUM retention filter returns "Created" response
     Given new "CreateRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -49,7 +49,7 @@ Feature: Rum Retention Filters
     And the response "data.attributes.query" is equal to "custom_query"
     And the response "data.attributes.sample_rate" is equal to 50
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM exclusion filter returns "Method Not Allowed" response
     Given operation "DeleteExclusionFilter" enabled
     And new "DeleteExclusionFilter" request
@@ -58,7 +58,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 405 Method Not Allowed
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM exclusion filter returns "No Content" response
     Given operation "DeleteExclusionFilter" enabled
     And new "DeleteExclusionFilter" request
@@ -67,7 +67,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM exclusion filter returns "Not Found" response
     Given operation "DeleteExclusionFilter" enabled
     And new "DeleteExclusionFilter" request
@@ -76,7 +76,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Delete a RUM retention filter returns "No Content" response
     Given new "DeleteRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -84,7 +84,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Delete a RUM retention filter returns "Not Found" response
     Given new "DeleteRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -92,7 +92,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM exclusion filter returns "Not Found" response
     Given operation "GetExclusionFilter" enabled
     And new "GetExclusionFilter" request
@@ -101,7 +101,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM exclusion filter returns "OK" response
     Given operation "GetExclusionFilter" enabled
     And new "GetExclusionFilter" request
@@ -110,7 +110,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Get a RUM retention filter returns "Not Found" response
     Given new "GetRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -118,7 +118,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Get a RUM retention filter returns "OK" response
     Given new "GetRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -133,7 +133,7 @@ Feature: Rum Retention Filters
     And the response "data.attributes.query" is equal to "custom_query"
     And the response "data.attributes.sample_rate" is equal to 25
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a permanent RUM retention filter returns "Not Found" response
     Given new "GetPermanentRetentionFilter" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -141,7 +141,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a permanent RUM retention filter returns "OK" response
     Given new "GetPermanentRetentionFilter" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -149,7 +149,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get all RUM exclusion filters returns "OK" response
     Given operation "ListExclusionFilters" enabled
     And new "ListExclusionFilters" request
@@ -157,7 +157,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Get all RUM retention filters returns "OK" response
     Given new "ListRetentionFilters" request
     And request contains "app_id" parameter with value "1d4b9c34-7ac4-423a-91cf-9902d926e9b3"
@@ -165,14 +165,14 @@ Feature: Rum Retention Filters
     Then the response status is 200 OK
     And the response "data" has length 3
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get all permanent RUM retention filters returns "OK" response
     Given new "ListPermanentRetentionFilters" request
     And request contains "app_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Order RUM retention filters returns "Bad Request" response
     Given new "OrderRetentionFilters" request
     And request contains "app_id" parameter with value "1d4b9c34-7ac4-423a-91cf-9902d926e9b3"
@@ -180,7 +180,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Order RUM retention filters returns "Ordered" response
     Given new "OrderRetentionFilters" request
     And request contains "app_id" parameter with value "1d4b9c34-7ac4-423a-91cf-9902d926e9b3"
@@ -191,7 +191,7 @@ Feature: Rum Retention Filters
     And the response "data[1].id" is equal to "42d89430-5b80-426e-a44b-ba3b417ece25"
     And the response "data[2].id" is equal to "bff0bc34-99e9-4c16-adce-f47e71948c23"
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM exclusion filter returns "Bad Request" response
     Given operation "UpdateExclusionFilter" enabled
     And new "UpdateExclusionFilter" request
@@ -201,7 +201,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM exclusion filter returns "Conflict" response
     Given operation "UpdateExclusionFilter" enabled
     And new "UpdateExclusionFilter" request
@@ -211,7 +211,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM exclusion filter returns "Not Found" response
     Given operation "UpdateExclusionFilter" enabled
     And new "UpdateExclusionFilter" request
@@ -221,7 +221,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a RUM exclusion filter returns "Updated" response
     Given operation "UpdateExclusionFilter" enabled
     And new "UpdateExclusionFilter" request
@@ -231,7 +231,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 200 Updated
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM retention filter returns "Bad Request" response
     Given new "UpdateRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -240,7 +240,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/rum-backend
+  @team:ddoghq/rum-backend
   Scenario: Update a RUM retention filter returns "Not Found" response
     Given new "UpdateRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -249,7 +249,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/rum-backend
+  @replay-only @team:ddoghq/rum-backend
   Scenario: Update a RUM retention filter returns "Updated" response
     Given new "UpdateRetentionFilter" request
     And request contains "app_id" parameter with value "a33671aa-24fd-4dcd-ba4b-5bbdbafe7690"
@@ -265,7 +265,7 @@ Feature: Rum Retention Filters
     And the response "data.attributes.query" is equal to "view_query"
     And the response "data.attributes.sample_rate" is equal to 100
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a permanent RUM retention filter returns "Bad Request" response
     Given new "UpdatePermanentRetentionFilter" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -274,7 +274,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a permanent RUM retention filter returns "Not Found" response
     Given new "UpdatePermanentRetentionFilter" request
     And request contains "app_id" parameter from "REPLACE.ME"
@@ -283,7 +283,7 @@ Feature: Rum Retention Filters
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Update a permanent RUM retention filter returns "Updated" response
     Given new "UpdatePermanentRetentionFilter" request
     And request contains "app_id" parameter from "REPLACE.ME"
diff --git a/features/v2/rum_retention_quotas.feature b/features/v2/rum_retention_quotas.feature
index 8f9c1bbe6e44..fe4a80ae28a4 100644
--- a/features/v2/rum_retention_quotas.feature
+++ b/features/v2/rum_retention_quotas.feature
@@ -8,7 +8,7 @@ Feature: RUM Retention Quotas
     And a valid "appKeyAuth" key in the system
     And an instance of "RUMRetentionQuotas" API
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create or update a RUM retention quota config returns "Bad Request" response
     Given new "UpsertRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create or update a RUM retention quota config returns "Not Found" response
     Given new "UpsertRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -26,7 +26,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create or update a RUM retention quota config returns "OK" response
     Given new "UpsertRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -35,7 +35,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM retention quota configuration returns "Bad Request" response
     Given new "DeleteRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -43,7 +43,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM retention quota configuration returns "No Content" response
     Given new "DeleteRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -51,7 +51,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Delete a RUM retention quota configuration returns "Not Found" response
     Given new "DeleteRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -59,7 +59,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM retention quota configuration returns "Bad Request" response
     Given new "GetRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -67,7 +67,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM retention quota configuration returns "Not Found" response
     Given new "GetRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
@@ -75,7 +75,7 @@ Feature: RUM Retention Quotas
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Get a RUM retention quota configuration returns "OK" response
     Given new "GetRumQuotaConfig" request
     And request contains "scope_type" parameter from "REPLACE.ME"
diff --git a/features/v2/rum_teams_ownership.feature b/features/v2/rum_teams_ownership.feature
index 8b1c095359d9..39c2dce95f31 100644
--- a/features/v2/rum_teams_ownership.feature
+++ b/features/v2/rum_teams_ownership.feature
@@ -9,14 +9,14 @@ Feature: Rum Teams Ownership
     And a valid "appKeyAuth" key in the system
     And an instance of "RumTeamsOwnership" API
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Bulk create and remove teams ownership mappings returns "Bad Request" response
     Given new "CreateTeamsOwnershipMappingsBatch" request
     And body with value {"atomic:operations":[{"op":"add","data":{"type":"teams_ownership_mappings","attributes":{"team_handle":"team-rum","view_name":"/checkout","service":"web-checkout","application_id":"invalid-uuid","match_type":"exact"}}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Bulk create and remove teams ownership mappings returns "Bad Request. One or more operations failed validation, so none of the operations were applied." response
     Given operation "CreateTeamsOwnershipMappingsBatch" enabled
     And new "CreateTeamsOwnershipMappingsBatch" request
@@ -24,7 +24,7 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 400 Bad Request. One or more operations failed validation, so none of the operations were applied.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Bulk create and remove teams ownership mappings returns "Conflict. One or more mappings requested for creation already exist." response
     Given operation "CreateTeamsOwnershipMappingsBatch" enabled
     And new "CreateTeamsOwnershipMappingsBatch" request
@@ -32,7 +32,7 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 409 Conflict. One or more mappings requested for creation already exist.
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Bulk create and remove teams ownership mappings returns "Not Found. One or more mappings requested for removal do not exist." response
     Given operation "CreateTeamsOwnershipMappingsBatch" enabled
     And new "CreateTeamsOwnershipMappingsBatch" request
@@ -40,7 +40,7 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 404 Not Found. One or more mappings requested for removal do not exist.
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Bulk create and remove teams ownership mappings returns "OK" response
     Given new "CreateTeamsOwnershipMappingsBatch" request
     And body with value {"atomic:operations":[{"op":"add","data":{"type":"teams_ownership_mappings","attributes":{"team_handle":"team-rum","view_name":"/checkout-{{ unique_lower_alnum }}","service":"web-checkout-{{ unique_lower_alnum }}","match_type":"exact"}}}]}
@@ -50,14 +50,14 @@ Feature: Rum Teams Ownership
     And the response "atomic:results[0].data.attributes.team_handle" is equal to "team-rum"
     And the response "atomic:results[0].data.attributes.match_type" is equal to "exact"
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Bulk create teams ownership mappings without a service or application ID returns "Bad Request" response
     Given new "CreateTeamsOwnershipMappingsBatch" request
     And body with value {"atomic:operations":[{"op":"add","data":{"type":"teams_ownership_mappings","attributes":{"team_handle":"team-rum","view_name":"/checkout-{{ unique_lower_alnum }}","match_type":"exact"}}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a teams ownership mapping returns "Bad Request" response
     Given operation "CreateTeamsOwnershipMapping" enabled
     And new "CreateTeamsOwnershipMapping" request
@@ -65,7 +65,7 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: Create a teams ownership mapping returns "Created" response
     Given operation "CreateTeamsOwnershipMapping" enabled
     And new "CreateTeamsOwnershipMapping" request
@@ -73,14 +73,14 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 201 Created
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Create teams ownership mapping returns "Bad Request" response
     Given new "CreateTeamsOwnershipMapping" request
     And body with value {"data":{"type":"teams_ownership_mappings","attributes":{"team_handle":"team-rum","view_name":"/checkout","service":"web-checkout","application_id":"invalid-uuid","match_type":"exact"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Create teams ownership mapping returns "Created" response
     Given new "CreateTeamsOwnershipMapping" request
     And body with value {"data":{"type":"teams_ownership_mappings","attributes":{"team_handle":"team-rum","view_name":"/checkout-{{ unique_lower_alnum }}","service":"web-checkout-{{ unique_lower_alnum }}","match_type":"exact"}}}
@@ -92,7 +92,7 @@ Feature: Rum Teams Ownership
     And the response "data.attributes.service" is equal to "web-checkout-{{ unique_lower_alnum }}"
     And the response "data.attributes.match_type" is equal to "exact"
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Delete a teams ownership mapping returns "No Content" response
     Given there is a valid "teams_ownership_mapping" in the system
     And new "DeleteTeamsOwnershipMapping" request
@@ -100,21 +100,21 @@ Feature: Rum Teams Ownership
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Delete a teams ownership mapping returns "Not Found" response
     Given new "DeleteTeamsOwnershipMapping" request
     And request contains "id" parameter with value "{{ unique }}"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Get a teams ownership mapping returns "Not Found" response
     Given new "GetTeamsOwnershipMapping" request
     And request contains "id" parameter with value "{{ unique }}"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: Get a teams ownership mapping returns "OK" response
     Given there is a valid "teams_ownership_mapping" in the system
     And new "GetTeamsOwnershipMapping" request
@@ -127,14 +127,14 @@ Feature: Rum Teams Ownership
     And the response "data.attributes.view_name" is equal to "{{ teams_ownership_mapping.data.attributes.view_name }}"
     And the response "data.attributes.match_type" is equal to "exact"
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: List teams ownership mappings returns "Bad Request" response
     Given operation "ListTeamsOwnershipMappings" enabled
     And new "ListTeamsOwnershipMappings" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: List teams ownership mappings returns "OK" response
     Given there is a valid "teams_ownership_mapping" in the system
     And new "ListTeamsOwnershipMappings" request
@@ -148,14 +148,14 @@ Feature: Rum Teams Ownership
     And the response "data[0].attributes.service" is equal to "{{ teams_ownership_mapping.data.attributes.service }}"
     And the response "data[0].attributes.match_type" is equal to "exact"
 
-  @generated @skip @team:DataDog/rum-backend
+  @generated @skip @team:ddoghq/rum-backend
   Scenario: List teams ownership rules returns "Bad Request" response
     Given operation "ListTeamsOwnershipRules" enabled
     And new "ListTeamsOwnershipRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/rum-backend
+  @skip @team:ddoghq/rum-backend
   Scenario: List teams ownership rules returns "OK" response
     Given there is a valid "teams_ownership_mapping" in the system
     And new "ListTeamsOwnershipRules" request
diff --git a/features/v2/salesforce_integration.feature b/features/v2/salesforce_integration.feature
index 63b3c068dfdd..a4de4fbfb305 100644
--- a/features/v2/salesforce_integration.feature
+++ b/features/v2/salesforce_integration.feature
@@ -9,94 +9,94 @@ Feature: Salesforce Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "SalesforceIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Salesforce incident template returns "Bad Request" response
     Given new "CreateIncidentTemplate" request
     And body with value {"data": {"attributes": {"description": "An incident was detected by Datadog monitors.", "name": "production-outage", "owner_id": "005000000000000", "priority": "High", "salesforce_org_id": "596da4af-0563-4097-90ff-07230c3f9db3", "subject": "Datadog Incident: Production Outage"}, "type": "salesforce-incidents-incident-template"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Salesforce incident template returns "CREATED" response
     Given new "CreateIncidentTemplate" request
     And body with value {"data": {"attributes": {"description": "An incident was detected by Datadog monitors.", "name": "production-outage", "owner_id": "005000000000000", "priority": "High", "salesforce_org_id": "596da4af-0563-4097-90ff-07230c3f9db3", "subject": "Datadog Incident: Production Outage"}, "type": "salesforce-incidents-incident-template"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Salesforce incident template returns "Conflict" response
     Given new "CreateIncidentTemplate" request
     And body with value {"data": {"attributes": {"description": "An incident was detected by Datadog monitors.", "name": "production-outage", "owner_id": "005000000000000", "priority": "High", "salesforce_org_id": "596da4af-0563-4097-90ff-07230c3f9db3", "subject": "Datadog Incident: Production Outage"}, "type": "salesforce-incidents-incident-template"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Salesforce incident template returns "Not Found" response
     Given new "CreateIncidentTemplate" request
     And body with value {"data": {"attributes": {"description": "An incident was detected by Datadog monitors.", "name": "production-outage", "owner_id": "005000000000000", "priority": "High", "salesforce_org_id": "596da4af-0563-4097-90ff-07230c3f9db3", "subject": "Datadog Incident: Production Outage"}, "type": "salesforce-incidents-incident-template"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a Salesforce incident template returns "Not Found" response
     Given new "DeleteIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a Salesforce incident template returns "OK" response
     Given new "DeleteIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a connected Salesforce organization returns "Bad Request" response
     Given new "DeleteSalesforceOrganization" request
     And request contains "salesforce_org_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a connected Salesforce organization returns "Not Found" response
     Given new "DeleteSalesforceOrganization" request
     And request contains "salesforce_org_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a connected Salesforce organization returns "OK" response
     Given new "DeleteSalesforceOrganization" request
     And request contains "salesforce_org_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all Salesforce incident templates returns "OK" response
     Given new "GetIncidentTemplates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all connected Salesforce organizations returns "Bad Request" response
     Given new "GetSalesforceOrganizations" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all connected Salesforce organizations returns "Not Found" response
     Given new "GetSalesforceOrganizations" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all connected Salesforce organizations returns "OK" response
     Given new "GetSalesforceOrganizations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Salesforce incident template returns "Bad Request" response
     Given new "UpdateIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
@@ -104,7 +104,7 @@ Feature: Salesforce Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Salesforce incident template returns "Conflict" response
     Given new "UpdateIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
@@ -112,7 +112,7 @@ Feature: Salesforce Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Salesforce incident template returns "Not Found" response
     Given new "UpdateIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
@@ -120,7 +120,7 @@ Feature: Salesforce Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Salesforce incident template returns "OK" response
     Given new "UpdateIncidentTemplate" request
     And request contains "incident_template_id" parameter from "REPLACE.ME"
diff --git a/features/v2/scorecards.feature b/features/v2/scorecards.feature
index 316e24cd4128..0ae2916d065e 100644
--- a/features/v2/scorecards.feature
+++ b/features/v2/scorecards.feature
@@ -9,28 +9,28 @@ Feature: Scorecards
     And a valid "appKeyAuth" key in the system
     And an instance of "Scorecards" API
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create a new campaign returns "Bad Request" response
     Given new "CreateScorecardCampaign" request
     And body with value {"data": {"attributes": {"description": "Campaign to improve security posture for Q1 2024.", "due_date": "2024-03-31T23:59:59Z", "entity_scope": "kind:service AND team:platform", "guidance": "Please ensure all services pass the security requirements.", "key": "q1-security-2024", "name": "Q1 Security Campaign", "owner_id": "550e8400-e29b-41d4-a716-446655440000", "rule_ids": ["q8MQxk8TCqrHnWkx", "r9NRyl9UDrsIoXly"], "start_date": "2024-01-01T00:00:00Z", "status": "in_progress"}, "type": "campaign"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create a new campaign returns "Created" response
     Given new "CreateScorecardCampaign" request
     And body with value {"data": {"attributes": {"description": "Campaign to improve security posture for Q1 2024.", "due_date": "2024-03-31T23:59:59Z", "entity_scope": "kind:service AND team:platform", "guidance": "Please ensure all services pass the security requirements.", "key": "q1-security-2024", "name": "Q1 Security Campaign", "owner_id": "550e8400-e29b-41d4-a716-446655440000", "rule_ids": ["q8MQxk8TCqrHnWkx", "r9NRyl9UDrsIoXly"], "start_date": "2024-01-01T00:00:00Z", "status": "in_progress"}, "type": "campaign"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create a new rule returns "Bad Request" response
     Given new "CreateScorecardRule" request
     And body with value {"data": {"attributes": {"enabled": true, "level": 2, "name": "Team Defined", "scorecard_id": "NOT.FOUND"}, "type": "rule"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create a new rule returns "Created" response
     Given new "CreateScorecardRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "{{unique}}", "scorecard_name": "Observability Best Practices"}, "type": "rule"}}
@@ -39,7 +39,7 @@ Feature: Scorecards
     And the response "data.attributes.scorecard_name" is equal to "Observability Best Practices"
     And the response "data.relationships.scorecard.data" has field "id"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create outcomes batch returns "Bad Request" response
     Given there is a valid "create_scorecard_rule" in the system
     And operation "CreateScorecardOutcomesBatch" enabled
@@ -48,7 +48,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create outcomes batch returns "OK" response
     Given there is a valid "create_scorecard_rule" in the system
     And operation "CreateScorecardOutcomesBatch" enabled
@@ -57,42 +57,42 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a campaign returns "Bad Request" response
     Given new "DeleteScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a campaign returns "No Content" response
     Given new "DeleteScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a campaign returns "Not Found" response
     Given new "DeleteScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a rule returns "Bad Request" response
     Given new "DeleteScorecardRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Delete a rule returns "Not Found" response
     Given new "DeleteScorecardRule" request
     And request contains "rule_id" parameter with value "2a4f524e-168a-429d-bb75-7b1ffeab0cbb"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Delete a rule returns "OK" response
     Given there is a valid "create_scorecard_rule" in the system
     And new "DeleteScorecardRule" request
@@ -100,52 +100,52 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a campaign returns "Bad Request" response
     Given new "GetScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a campaign returns "Not Found" response
     Given new "GetScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a campaign returns "OK" response
     Given new "GetScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all campaigns returns "Bad Request" response
     Given new "ListScorecardCampaigns" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all campaigns returns "OK" response
     Given new "ListScorecardCampaigns" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all rule outcomes returns "Bad Request" response
     Given new "ListScorecardOutcomes" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: List all rule outcomes returns "OK" response
     Given new "ListScorecardOutcomes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/idp @with-pagination
+  @replay-only @skip-validation @team:ddoghq/idp @with-pagination
   Scenario: List all rule outcomes returns "OK" response with pagination
     Given new "ListScorecardOutcomes" request
     And request contains "page[size]" parameter with value 2
@@ -155,19 +155,19 @@ Feature: Scorecards
     Then the response status is 200 OK
     And the response has 2 items
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all rules returns "Bad Request" response
     Given new "ListScorecardRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: List all rules returns "OK" response
     Given new "ListScorecardRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/idp @with-pagination
+  @replay-only @skip-validation @team:ddoghq/idp @with-pagination
   Scenario: List all rules returns "OK" response with pagination
     Given new "ListScorecardRules" request
     And request contains "page[size]" parameter with value 2
@@ -177,27 +177,27 @@ Feature: Scorecards
     Then the response status is 200 OK
     And the response has 4 items
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all scorecards returns "OK" response
     Given new "ListScorecards" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all scores returns "Bad Request" response
     Given new "ListScorecardScores" request
     And request contains "aggregation" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: List all scores returns "OK" response
     Given new "ListScorecardScores" request
     And request contains "aggregation" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update Scorecard outcomes asynchronously returns "Accepted" response
     Given there is a valid "create_scorecard_rule" in the system
     And new "UpdateScorecardOutcomes" request
@@ -205,7 +205,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 202 Accepted
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update Scorecard outcomes asynchronously returns "Bad Request" response
     Given there is a valid "create_scorecard_rule" in the system
     And new "UpdateScorecardOutcomes" request
@@ -215,7 +215,7 @@ Feature: Scorecards
     And the response "errors" has length 1
     And the response "errors[0]" has field "detail"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update Scorecard outcomes asynchronously returns "Conflict" response
     Given new "UpdateScorecardOutcomes" request
     And body with value {"data": {"attributes": {"results": [{"rule_id": "INVALID.RULE_ID", "entity_reference": "service:my-service", "remarks": "See: <a href=\"https://app.datadoghq.com/services\">Services</a>", "state": "pass"}]}, "type": "batched-outcome"}}
@@ -223,28 +223,28 @@ Feature: Scorecards
     Then the response status is 409 Conflict
     And the response "errors" has length 1
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update Scorecard outcomes returns "Accepted" response
     Given new "UpdateScorecardOutcomes" request
     And body with value {"data": {"attributes": {"results": [{"entity_reference": "service:my-service", "remarks": "See: <a href=\"https://app.datadoghq.com/services\">Services</a>", "rule_id": "q8MQxk8TCqrHnWkx", "state": "pass"}]}, "type": "batched-outcome"}}
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update Scorecard outcomes returns "Bad Request" response
     Given new "UpdateScorecardOutcomes" request
     And body with value {"data": {"attributes": {"results": [{"entity_reference": "service:my-service", "remarks": "See: <a href=\"https://app.datadoghq.com/services\">Services</a>", "rule_id": "q8MQxk8TCqrHnWkx", "state": "pass"}]}, "type": "batched-outcome"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update Scorecard outcomes returns "Conflict" response
     Given new "UpdateScorecardOutcomes" request
     And body with value {"data": {"attributes": {"results": [{"entity_reference": "service:my-service", "remarks": "See: <a href=\"https://app.datadoghq.com/services\">Services</a>", "rule_id": "q8MQxk8TCqrHnWkx", "state": "pass"}]}, "type": "batched-outcome"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update a campaign returns "Bad Request" response
     Given new "UpdateScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
@@ -252,7 +252,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update a campaign returns "Not Found" response
     Given new "UpdateScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
@@ -260,7 +260,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update a campaign returns "OK" response
     Given new "UpdateScorecardCampaign" request
     And request contains "campaign_id" parameter from "REPLACE.ME"
@@ -268,7 +268,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update an existing rule returns "Rule updated successfully" response
     Given there is a valid "create_scorecard_rule" in the system
     And new "UpdateScorecardRule" request
@@ -277,7 +277,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 200 Rule updated successfully
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update an existing scorecard rule returns "Bad Request" response
     Given there is a valid "create_scorecard_rule" in the system
     And new "UpdateScorecardRule" request
@@ -286,7 +286,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Update an existing scorecard rule returns "Not Found" response
     Given new "UpdateScorecardRule" request
     And request contains "rule_id" parameter with value "REPLACE.ME"
@@ -294,7 +294,7 @@ Feature: Scorecards
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Update an existing scorecard rule returns "Rule updated successfully" response
     Given new "UpdateScorecardRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
diff --git a/features/v2/seats.feature b/features/v2/seats.feature
index 4c5767750ab3..45a5b405b467 100644
--- a/features/v2/seats.feature
+++ b/features/v2/seats.feature
@@ -8,14 +8,14 @@ Feature: Seats
     And a valid "appKeyAuth" key in the system
     And an instance of "Seats" API
 
-  @generated @skip @team:DataDog/billing-experience
+  @generated @skip @team:ddoghq/billing-experience
   Scenario: Assign seats to users returns "Bad Request" response
     Given new "AssignSeatsUser" request
     And body with value {"data": {"attributes": {"product_code": "", "user_uuids": [""]}, "type": "seat-assignments"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-validation @team:DataDog/billing-experience
+  @skip @skip-validation @team:ddoghq/billing-experience
   Scenario: Assign seats to users returns "Created" response
     Given there is a valid "user" in the system
     And new "AssignSeatsUser" request
@@ -26,14 +26,14 @@ Feature: Seats
     And the response "data.attributes.product_code" is equal to "incident_response"
     And the response "data.attributes.assigned_ids[0]" is equal to "{{ user.data.id }}"
 
-  @skip-validation @team:DataDog/billing-experience
+  @skip-validation @team:ddoghq/billing-experience
   Scenario: Assign seats to users returns "Unprocessable Entity" response
     Given new "AssignSeatsUser" request
     And body with value {"data": {"attributes": {"product_code": "", "user_uuids": [""]}, "type": "seat-assignments"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/billing-experience
+  @team:ddoghq/billing-experience
   Scenario: Assign seats to users returns "Unprocessable Entity" response when product_code is empty
     Given there is a valid "user" in the system
     And new "AssignSeatsUser" request
@@ -41,21 +41,21 @@ Feature: Seats
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/billing-experience
+  @team:ddoghq/billing-experience
   Scenario: Assign seats to users returns "Unprocessable Entity" response when user_uuids is empty
     Given new "AssignSeatsUser" request
     And body with value {"data": {"type": "seat-assignments", "attributes": {"product_code": "incident_response", "user_uuids": []}}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/billing-experience
+  @generated @skip @team:ddoghq/billing-experience
   Scenario: Get users with seats returns "Bad Request" response
     Given new "GetSeatsUsers" request
     And request contains "product_code" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-experience
+  @team:ddoghq/billing-experience
   Scenario: Get users with seats returns "OK" response
     Given new "GetSeatsUsers" request
     And request contains "product_code" parameter with value "incident_response"
@@ -63,21 +63,21 @@ Feature: Seats
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-experience
+  @generated @skip @team:ddoghq/billing-experience
   Scenario: Get users with seats returns "Unprocessable Entity" response
     Given new "GetSeatsUsers" request
     And request contains "product_code" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/billing-experience
+  @generated @skip @team:ddoghq/billing-experience
   Scenario: Unassign seats from users returns "Bad Request" response
     Given new "UnassignSeatsUser" request
     And body with value {"data": {"attributes": {"product_code": "", "user_uuids": [""]}, "type": "seat-assignments"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @skip-validation @team:DataDog/billing-experience
+  @skip @skip-validation @team:ddoghq/billing-experience
   Scenario: Unassign seats from users returns "No Content" response
     Given there is a valid "user" in the system
     And new "UnassignSeatsUser" request
@@ -85,14 +85,14 @@ Feature: Seats
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip-validation @team:DataDog/billing-experience
+  @skip-validation @team:ddoghq/billing-experience
   Scenario: Unassign seats from users returns "Unprocessable Entity" response
     Given new "UnassignSeatsUser" request
     And body with value {"data": {"attributes": {"product_code": "", "user_uuids": [""]}, "type": "seat-assignments"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/billing-experience
+  @team:ddoghq/billing-experience
   Scenario: Unassign seats from users returns "Unprocessable Entity" response when product_code is empty
     Given there is a valid "user" in the system
     And new "UnassignSeatsUser" request
@@ -100,7 +100,7 @@ Feature: Seats
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/billing-experience
+  @team:ddoghq/billing-experience
   Scenario: Unassign seats from users returns "Unprocessable Entity" response when user_uuids is empty
     Given new "UnassignSeatsUser" request
     And body with value {"data": {"type": "seat-assignments", "attributes": {"product_code": "incident_response", "user_uuids": []}}}
diff --git a/features/v2/security_monitoring.feature b/features/v2/security_monitoring.feature
index 4a3d03be1c66..58e774ce389f 100644
--- a/features/v2/security_monitoring.feature
+++ b/features/v2/security_monitoring.feature
@@ -9,7 +9,7 @@ Feature: Security Monitoring
     And a valid "appKeyAuth" key in the system
     And an instance of "SecurityMonitoring" API
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Activate an entity context sync integration returns "Bad Request" response
     Given operation "ActivateIntegration" enabled
     And new "ActivateIntegration" request
@@ -18,7 +18,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Activate an entity context sync integration returns "Not Found" response
     Given operation "ActivateIntegration" enabled
     And new "ActivateIntegration" request
@@ -27,7 +27,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Activate an entity context sync integration returns "OK" response
     Given operation "ActivateIntegration" enabled
     And new "ActivateIntegration" request
@@ -36,7 +36,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Activate content pack returns "Accepted" response
     Given operation "ActivateContentPack" enabled
     And new "ActivateContentPack" request
@@ -44,7 +44,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Activate content pack returns "Not Found" response
     Given operation "ActivateContentPack" enabled
     And new "ActivateContentPack" request
@@ -52,7 +52,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Analyze code returns "Bad Request" response
     Given operation "CreateStaticAnalysisServerAnalysis" enabled
     And new "CreateStaticAnalysisServerAnalysis" request
@@ -60,7 +60,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Analyze code returns "OK" response
     Given operation "CreateStaticAnalysisServerAnalysis" enabled
     And new "CreateStaticAnalysisServerAnalysis" request
@@ -68,7 +68,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Assign or unassign security findings returns "Accepted" response
     Given operation "UpdateFindingsAssignee" enabled
     And new "UpdateFindingsAssignee" request
@@ -76,7 +76,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Assign or unassign security findings returns "Bad Request" response
     Given operation "UpdateFindingsAssignee" enabled
     And new "UpdateFindingsAssignee" request
@@ -84,7 +84,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Assign or unassign security findings returns "Not Found" response
     Given operation "UpdateFindingsAssignee" enabled
     And new "UpdateFindingsAssignee" request
@@ -92,7 +92,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security finding to a Jira issue returns "OK" response
     Given new "AttachJiraIssue" request
     And body with value {"data": {"attributes": {"jira_issue_url": "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"}, "relationships": {"findings": {"data": [{"id": "OTQ3NjJkMmYwMTIzMzMxNTc1Y2Q4MTA5NWU0NTBmMDl-ZjE3NjMxZWVkYzBjZGI1NDY2NWY2OGQxZDk4MDY4MmI=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}}
@@ -102,7 +102,7 @@ Feature: Security Monitoring
     And the response "data.attributes.insights" has item with field "resource_id" with value "OTQ3NjJkMmYwMTIzMzMxNTc1Y2Q4MTA5NWU0NTBmMDl-ZjE3NjMxZWVkYzBjZGI1NDY2NWY2OGQxZDk4MDY4MmI="
     And the response "data.attributes.jira_issue.result.issue_url" is equal to "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security finding to a case returns "OK" response
     Given new "AttachCase" request
     And request contains "case_id" parameter with value "7d16945b-baf8-411e-ab2a-20fe43af1ea3"
@@ -113,21 +113,21 @@ Feature: Security Monitoring
     And the response "data.attributes.status_group" is equal to "SG_OPEN"
     And the response "data.attributes.insights" has item with field "resource_id" with value "ZGZhMDI3ZjdjMDM3YjJmNzcxNTlhZGMwMjdmZWNiNTZ-MTVlYTNmYWU3NjNlOTNlYTE2YjM4N2JmZmI4Yjk5N2Y="
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Jira issue returns "Bad Request" response
     Given new "AttachJiraIssue" request
     And body with value {"data": {"attributes": {"jira_issue_url": "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"}, "relationships": {"findings": {"data": []}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Jira issue returns "Not Found" response
     Given new "AttachJiraIssue" request
     And body with value {"data": {"attributes": {"jira_issue_url": "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"}, "relationships": {"findings": {"data": [{"id": "wrong-finding-id", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Jira issue returns "OK" response
     Given new "AttachJiraIssue" request
     And body with value {"data": {"attributes": {"jira_issue_url": "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"}, "relationships": {"findings": {"data": [{"id": "OTQ3NjJkMmYwMTIzMzMxNTc1Y2Q4MTA5NWU0NTBmMDl-ZjE3NjMxZWVkYzBjZGI1NDY2NWY2OGQxZDk4MDY4MmI=", "type": "findings"}, {"id": "MTNjN2ZmYWMzMDIxYmU1ZDFiZDRjNWUwN2I1NzVmY2F-YTA3MzllMTUzNWM3NmEyZjdiNzEzOWM5YmViZTMzOGM=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}}
@@ -138,49 +138,49 @@ Feature: Security Monitoring
     And the response "data.attributes.insights" has item with field "resource_id" with value "MTNjN2ZmYWMzMDIxYmU1ZDFiZDRjNWUwN2I1NzVmY2F-YTA3MzllMTUzNWM3NmEyZjdiNzEzOWM5YmViZTMzOGM="
     And the response "data.attributes.jira_issue.result.issue_url" is equal to "https://datadoghq-sandbox-538.atlassian.net/browse/CSMSEC-105476"
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Linear issue returns "Bad Request" response
     Given new "AttachLinearIssue" request
     And body with value {"data": {"attributes": {"linear_issue_url": "https://linear.app/your-workspace/issue/ENG-123"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Linear issue returns "Not Found" response
     Given new "AttachLinearIssue" request
     And body with value {"data": {"attributes": {"linear_issue_url": "https://linear.app/your-workspace/issue/ENG-123"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a Linear issue returns "OK" response
     Given new "AttachLinearIssue" request
     And body with value {"data": {"attributes": {"linear_issue_url": "https://linear.app/your-workspace/issue/ENG-123"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a ServiceNow ticket returns "Bad Request" response
     Given new "AttachServiceNowTicket" request
     And body with value {"data": {"attributes": {"servicenow_ticket_url": "https://example.service-now.com/now/nav/ui/classic/params/target/incident.do?sys_id=abcdef0123456789abcdef0123456789"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a ServiceNow ticket returns "Not Found" response
     Given new "AttachServiceNowTicket" request
     And body with value {"data": {"attributes": {"servicenow_ticket_url": "https://example.service-now.com/now/nav/ui/classic/params/target/incident.do?sys_id=abcdef0123456789abcdef0123456789"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a ServiceNow ticket returns "OK" response
     Given new "AttachServiceNowTicket" request
     And body with value {"data": {"attributes": {"servicenow_ticket_url": "https://example.service-now.com/now/nav/ui/classic/params/target/incident.do?sys_id=abcdef0123456789abcdef0123456789"}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a case returns "Bad Request" response
     Given new "AttachCase" request
     And request contains "case_id" parameter with value "7d16945b-baf8-411e-ab2a-20fe43af1ea3"
@@ -188,7 +188,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a case returns "Not Found" response
     Given new "AttachCase" request
     And request contains "case_id" parameter with value "wrong-case-id"
@@ -196,7 +196,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Attach security findings to a case returns "OK" response
     Given new "AttachCase" request
     And request contains "case_id" parameter with value "7d16945b-baf8-411e-ab2a-20fe43af1ea3"
@@ -208,63 +208,63 @@ Feature: Security Monitoring
     And the response "data.attributes.insights" has item with field "resource_id" with value "ZGZhMDI3ZjdjMDM3YjJmNzcxNTlhZGMwMjdmZWNiNTZ-MTVlYTNmYWU3NjNlOTNlYTE2YjM4N2JmZmI4Yjk5N2Y="
     And the response "data.attributes.insights" has item with field "resource_id" with value "MmUzMzZkODQ2YTI3NDU0OTk4NDk3NzhkOTY5YjU2Zjh-YWJjZGI1ODI4OTYzNWM3ZmUwZTBlOWRkYTRiMGUyOGQ="
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk convert rules to Terraform returns "Bad Request" response
     Given new "BulkConvertExistingSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["def-000-u7q", "def-000-7dd"]}, "id": "convert_bulk", "type": "security_monitoring_rules_convert_bulk"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk convert rules to Terraform returns "Not Found" response
     Given new "BulkConvertExistingSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["def-000-u7q", "def-000-7dd"]}, "id": "convert_bulk", "type": "security_monitoring_rules_convert_bulk"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk convert rules to Terraform returns "OK" response
     Given new "BulkConvertExistingSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["def-000-u7q", "def-000-7dd"]}, "id": "convert_bulk", "type": "security_monitoring_rules_convert_bulk"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk delete security monitoring rules returns "Bad Request" response
     Given new "BulkDeleteSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["abc-000-u7q", "abc-000-7dd"]}, "id": "bulk_delete", "type": "bulk_delete_rules"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk delete security monitoring rules returns "Not Found" response
     Given new "BulkDeleteSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["abc-000-u7q", "abc-000-7dd"]}, "id": "bulk_delete", "type": "bulk_delete_rules"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk delete security monitoring rules returns "OK" response
     Given new "BulkDeleteSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["abc-000-u7q", "abc-000-7dd"]}, "id": "bulk_delete", "type": "bulk_delete_rules"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk export security monitoring rules returns "Bad Request" response
     Given new "BulkExportSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": []}, "type": "security_monitoring_rules_bulk_export"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk export security monitoring rules returns "Not Found" response
     Given new "BulkExportSecurityMonitoringRules" request
     And body with value {"data": {"attributes": {"ruleIds": ["non-existent-rule-id"]}, "type": "security_monitoring_rules_bulk_export"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Bulk export security monitoring rules returns "OK" response
     Given there is a valid "security_rule" in the system
     And new "BulkExportSecurityMonitoringRules" request
@@ -272,7 +272,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk subscribe to sample log generation returns "Bad Request" response
     Given operation "BulkCreateSampleLogGenerationSubscriptions" enabled
     And new "BulkCreateSampleLogGenerationSubscriptions" request
@@ -280,7 +280,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk subscribe to sample log generation returns "OK" response
     Given operation "BulkCreateSampleLogGenerationSubscriptions" enabled
     And new "BulkCreateSampleLogGenerationSubscriptions" request
@@ -288,21 +288,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update security signals returns "Bad Request" response
     Given new "BulkEditSecurityMonitoringSignals" request
     And body with value {"data": [{"attributes": {"archive_reason": "none", "assignee": {"uuid": "773b045d-ccf8-4808-bd3b-955ef6a8c940"}, "state": "open"}, "id": "AAAAAWgN8Xwgr1vKDQAAAABBV2dOOFh3ZzZobm1mWXJFYTR0OA", "type": "signal"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update security signals returns "OK" response
     Given new "BulkEditSecurityMonitoringSignals" request
     And body with value {"data": [{"attributes": {"archive_reason": "none", "assignee": {"uuid": "773b045d-ccf8-4808-bd3b-955ef6a8c940"}, "state": "open"}, "id": "AAAAAWgN8Xwgr1vKDQAAAABBV2dOOFh3ZzZobm1mWXJFYTR0OA", "type": "signal"}]}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update triage assignee of security signals returns "Bad Request" response
     Given operation "BulkEditSecurityMonitoringSignalsAssignee" enabled
     And new "BulkEditSecurityMonitoringSignalsAssignee" request
@@ -310,14 +310,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update triage assignee of security signals returns "OK" response
     Given new "BulkEditSecurityMonitoringSignalsAssignee" request
     And body with value {"data": [{"attributes": {"assignee": "773b045d-ccf8-4808-bd3b-955ef6a8c940"}, "id": "AAAAAWgN8Xwgr1vKDQAAAABBV2dOOFh3ZzZobm1mWXJFYTR0OA", "type": "signal"}]}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update triage state of security signals returns "Bad Request" response
     Given operation "BulkEditSecurityMonitoringSignalsState" enabled
     And new "BulkEditSecurityMonitoringSignalsState" request
@@ -325,14 +325,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Bulk update triage state of security signals returns "OK" response
     Given new "BulkEditSecurityMonitoringSignalsState" request
     And body with value {"data": [{"attributes": {"archive_reason": "none", "state": "open"}, "id": "AAAAAWgN8Xwgr1vKDQAAAABBV2dOOFh3ZzZobm1mWXJFYTR0OA", "type": "signal"}]}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Cancel a historical job returns "Bad Request" response
     Given operation "CancelHistoricalJob" enabled
     And new "CancelHistoricalJob" request
@@ -340,7 +340,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Cancel a historical job returns "Conflict" response
     Given operation "CancelHistoricalJob" enabled
     And new "CancelHistoricalJob" request
@@ -348,7 +348,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Cancel a historical job returns "Not Found" response
     Given operation "CancelHistoricalJob" enabled
     And new "CancelHistoricalJob" request
@@ -356,7 +356,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Cancel a historical job returns "OK" response
     Given operation "CancelHistoricalJob" enabled
     And operation "RunHistoricalJob" enabled
@@ -366,7 +366,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the related incidents of a security signal returns "Bad Request" response
     Given new "EditSecurityMonitoringSignalIncidents" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -374,7 +374,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the related incidents of a security signal returns "Not Found" response
     Given new "EditSecurityMonitoringSignalIncidents" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -382,7 +382,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Change the related incidents of a security signal returns "OK" response
     Given new "EditSecurityMonitoringSignalIncidents" request
     And request contains "signal_id" parameter with value "AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE"
@@ -390,7 +390,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "Bad Request" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -398,7 +398,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "Not Found" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -406,7 +406,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Change the triage state of a security signal returns "OK" response
     Given new "EditSecurityMonitoringSignalState" request
     And request contains "signal_id" parameter with value "AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE"
@@ -414,7 +414,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Convert a job result to a signal returns "Bad Request" response
     Given operation "ConvertJobResultToSignal" enabled
     And new "ConvertJobResultToSignal" request
@@ -422,7 +422,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Convert a job result to a signal returns "Not Found" response
     Given operation "ConvertJobResultToSignal" enabled
     And new "ConvertJobResultToSignal" request
@@ -430,7 +430,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Convert a job result to a signal returns "OK" response
     Given operation "ConvertJobResultToSignal" enabled
     And new "ConvertJobResultToSignal" request
@@ -438,21 +438,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Convert a rule from JSON to Terraform returns "Bad Request" response
     Given new "ConvertSecurityMonitoringRuleFromJSONToTerraform" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Convert a rule from JSON to Terraform returns "Not Found" response
     Given new "ConvertSecurityMonitoringRuleFromJSONToTerraform" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection"}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Convert a rule from JSON to Terraform returns "OK" response
     Given new "ConvertSecurityMonitoringRuleFromJSONToTerraform" request
     And body with value {"name":"_{{ unique_hash }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection"}
@@ -460,21 +460,21 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "terraformContent" is equal to "resource \"datadog_security_monitoring_rule\" \"_{{ unique_hash }}\" {\n\tname = \"_{{ unique_hash }}\"\n\tenabled = true\n\tquery {\n\t\tquery = \"@test:true\"\n\t\tgroup_by_fields = []\n\t\thas_optional_group_by_fields = false\n\t\tdistinct_fields = []\n\t\taggregation = \"count\"\n\t\tname = \"\"\n\t\tdata_source = \"logs\"\n\t}\n\toptions {\n\t\tkeep_alive = 3600\n\t\tmax_signal_duration = 86400\n\t\tdetection_method = \"threshold\"\n\t\tevaluation_window = 900\n\t}\n\tcase {\n\t\tname = \"\"\n\t\tstatus = \"info\"\n\t\tnotifications = []\n\t\tcondition = \"a > 0\"\n\t}\n\tmessage = \"Test rule\"\n\ttags = []\n\thas_extended_title = false\n\ttype = \"log_detection\"\n}\n"
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Convert an existing rule from JSON to Terraform returns "Bad Request" response
     Given new "ConvertExistingSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Convert an existing rule from JSON to Terraform returns "Not Found" response
     Given new "ConvertExistingSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Convert an existing rule from JSON to Terraform returns "OK" response
     Given new "ConvertExistingSecurityMonitoringRule" request
     And there is a valid "security_rule_hash" in the system
@@ -483,7 +483,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "terraformContent" is equal to "resource \"datadog_security_monitoring_rule\" \"_{{ unique_hash }}\" {\n\tname = \"_{{ unique_hash }}\"\n\tenabled = true\n\tquery {\n\t\tquery = \"@test:true\"\n\t\tgroup_by_fields = []\n\t\thas_optional_group_by_fields = false\n\t\tdistinct_fields = []\n\t\taggregation = \"count\"\n\t\tname = \"\"\n\t\tdata_source = \"logs\"\n\t}\n\toptions {\n\t\tkeep_alive = 3600\n\t\tmax_signal_duration = 86400\n\t\tdetection_method = \"threshold\"\n\t\tevaluation_window = 900\n\t}\n\tcase {\n\t\tname = \"\"\n\t\tstatus = \"info\"\n\t\tnotifications = []\n\t\tcondition = \"a > 0\"\n\t}\n\tmessage = \"Test rule\"\n\ttags = []\n\thas_extended_title = false\n\ttype = \"log_detection\"\n}\n"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Convert security monitoring resource to Terraform returns "Bad Request" response
     Given operation "ConvertSecurityMonitoringTerraformResource" enabled
     And new "ConvertSecurityMonitoringTerraformResource" request
@@ -492,7 +492,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Convert security monitoring resource to Terraform returns "OK" response
     Given operation "ConvertSecurityMonitoringTerraformResource" enabled
     And new "ConvertSecurityMonitoringTerraformResource" request
@@ -503,7 +503,7 @@ Feature: Security Monitoring
     And the response "data.attributes.type_name" is equal to "datadog_security_monitoring_suppression"
     And the response "data.attributes.resource_id" is equal to "abc-123"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create Jira issue for security finding returns "Created" response
     Given new "CreateJiraIssues" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "YmNlZmJhYTcyMDU5ZDk0ZDhiNjRmNGI0NDk4MDdiNzN-MDJlMjg0NzNmYzJiODY2MzJkNjU0OTI4NmVhZTUyY2U=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}]}
@@ -519,7 +519,7 @@ Feature: Security Monitoring
     And the response "data[0].attributes.insights[0].type" is equal to "SECURITY_FINDING"
     And the response "data[0].attributes.jira_issue.status" is equal to "COMPLETED"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create Jira issue for security findings returns "Created" response
     Given new "CreateJiraIssues" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "a3ZoLXNjbS14eXV-aS0wNWY5MGYwMGE4NDg2ODdlOA==", "type": "findings"}, {"id": "eWswLWJsdC1hZm5-aS0wMjRlYTgwMzVkZTU1MGIwYQ==", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}]}
@@ -537,14 +537,14 @@ Feature: Security Monitoring
     And the response "data[0].attributes.insights[0].type" is equal to "SECURITY_FINDING"
     And the response "data[0].attributes.jira_issue.status" is equal to "COMPLETED"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create Jira issues for security findings returns "Bad Request" response
     Given new "CreateJiraIssues" request
     And body with value {"data": [{"attributes": {}, "relationships": {"findings": {"data": []}, "project": {"data": {"id": "7f198869-c7ef-4afc-97cf-da5cdc13b5c3", "type": "projects"}}}, "type": "jira_issues"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create Jira issues for security findings returns "Created" response
     Given new "CreateJiraIssues" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "eWswLWJsdC1hZm5-aS0wMjRlYTgwMzVkZTU1MGIwYQ==", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}, {"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "a3ZoLXNjbS14eXV-aS0wNWY5MGYwMGE4NDg2ODdlOA==", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "jira_issues"}]}
@@ -568,56 +568,56 @@ Feature: Security Monitoring
     And the response "data[1].attributes.insights[0].type" is equal to "SECURITY_FINDING"
     And the response "data[1].attributes.jira_issue.status" is equal to "COMPLETED"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create Jira issues for security findings returns "Not Found" response
     Given new "CreateJiraIssues" request
     And body with value {"data": [{"attributes": {}, "relationships": {"findings": {"data": [{"id": "ZGZhMDI3ZjdjMDM3YjJmNzcxNTlhZGMwMjdmZWNiNTZ-MTVlYTNmYWU3NjNlOTNlYTE2YjM4N2JmZmI4Yjk5N2Y=", "type": "findings"}]}, "project": {"data": {"id": "00000000-0000-0000-0000-000000000000", "type": "projects"}}}, "type": "jira_issues"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create Linear issues for security findings returns "Bad Request" response
     Given new "CreateLinearIssues" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the Linear issue.", "label_ids": ["a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d"], "linear_project_id": "d4c3b2a1-6f5e-8b7a-0d9c-2f1e4a3b6c5d", "priority": "NOT_DEFINED", "title": "A title for the Linear issue."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create Linear issues for security findings returns "Created" response
     Given new "CreateLinearIssues" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the Linear issue.", "label_ids": ["a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d"], "linear_project_id": "d4c3b2a1-6f5e-8b7a-0d9c-2f1e4a3b6c5d", "priority": "NOT_DEFINED", "title": "A title for the Linear issue."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}]}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create Linear issues for security findings returns "Not Found" response
     Given new "CreateLinearIssues" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the Linear issue.", "label_ids": ["a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d"], "linear_project_id": "d4c3b2a1-6f5e-8b7a-0d9c-2f1e4a3b6c5d", "priority": "NOT_DEFINED", "title": "A title for the Linear issue."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "linear_issues"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create ServiceNow tickets for security findings returns "Bad Request" response
     Given new "CreateServiceNowTickets" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the ServiceNow ticket.", "priority": "NOT_DEFINED", "title": "A title for the ServiceNow ticket."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create ServiceNow tickets for security findings returns "Created" response
     Given new "CreateServiceNowTickets" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the ServiceNow ticket.", "priority": "NOT_DEFINED", "title": "A title for the ServiceNow ticket."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}]}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Create ServiceNow tickets for security findings returns "Not Found" response
     Given new "CreateServiceNowTickets" request
     And body with value {"data": [{"attributes": {"assignee_id": "f315bdaf-9ee7-4808-a9c1-99c15bf0f4d0", "description": "A description of the ServiceNow ticket.", "priority": "NOT_DEFINED", "title": "A title for the ServiceNow ticket."}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}, "project": {"data": {"id": "aeadc05e-98a8-11ec-ac2c-da7ad0900001", "type": "projects"}}}, "type": "servicenow_tickets"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a cloud_configuration rule returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"type":"cloud_configuration","name":"{{ unique }}_cloud","isEnabled":false,"cases":[{"status":"info","notifications":["channel"]}],"options":{"complianceRuleOptions":{"resourceType":"gcp_compute_disk","complexRule": false,"regoRule":{"policy":"package datadog\n\nimport data.datadog.output as dd_output\n\nimport future.keywords.contains\nimport future.keywords.if\nimport future.keywords.in\n\nmilliseconds_in_a_day := ((1000 * 60) * 60) * 24\n\neval(iam_service_account_key) = \"skip\" if {\n\tiam_service_account_key.disabled\n} else = \"pass\" if {\n\t(iam_service_account_key.resource_seen_at / milliseconds_in_a_day) - (iam_service_account_key.valid_after_time / milliseconds_in_a_day) <= 90\n} else = \"fail\"\n\n# This part remains unchanged for all rules\nresults contains result if {\n\tsome resource in input.resources[input.main_resource_type]\n\tresult := dd_output.format(resource, eval(resource))\n}\n","resourceTypes":["gcp_compute_disk"]}}},"message":"ddd","tags":["my:tag"],"complianceSignalOptions":{"userActivationStatus":true,"userGroupByFields":["@account_id"]},"filters":[{"action":"require","query":"resource_id:helo*"},{"action":"suppress","query":"control:helo*"}]}
@@ -628,21 +628,21 @@ Feature: Security Monitoring
     And the response "message" is equal to "ddd"
     And the response "options.complianceRuleOptions.resourceType" is equal to "gcp_compute_disk"
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Create a critical asset returns "Bad Request" response
     Given new "CreateSecurityMonitoringCriticalAsset" request
     And body with value {"data": {"type": "critical_assets", "attributes": {"query": "host:test"}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a critical asset returns "Conflict" response
     Given new "CreateSecurityMonitoringCriticalAsset" request
     And body with value {"data": {"attributes": {"description": "Production database servers handling PII", "enabled": true, "query": "security:monitoring", "rule_query": "type:(log_detection OR signal_correlation OR workload_security OR application_security) source:cloudtrail", "severity": "increase", "tags": ["team:database", "source:cloudtrail"]}, "type": "critical_assets"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a critical asset returns "OK" response
     Given new "CreateSecurityMonitoringCriticalAsset" request
     And body with value {"data": {"type": "critical_assets", "attributes": {"query": "host:{{ unique_lower_alnum }}", "rule_query": "type:(log_detection OR signal_correlation OR workload_security OR application_security) source:cloudtrail", "severity": "decrease", "tags": ["team:security", "env:test"]}}}
@@ -651,14 +651,14 @@ Feature: Security Monitoring
     And the response "data.type" is equal to "critical_assets"
     And the response "data.attributes.severity" is equal to "decrease"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a custom framework returns "Bad Request" response
     Given new "CreateCustomFramework" request
     And body with value {"data":{"type":"custom_framework","attributes":{"name":"name","handle":"","version":"10","icon_url":"test-url","requirements":[{"name":"requirement","controls":[{"name":"control","rules_id":["def-000-be9"]}]}]}}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Create a custom framework returns "Conflict" response
     Given there is a valid "custom_framework" in the system
     And new "CreateCustomFramework" request
@@ -666,14 +666,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Create a custom framework returns "OK" response
     Given new "CreateCustomFramework" request
     And body with value {"data":{"type":"custom_framework","attributes":{"name":"name","handle":"create-framework-new","version":"10","icon_url":"test-url","requirements":[{"name":"requirement","controls":[{"name":"control","rules_id":["def-000-be9"]}]}]}}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a dataset returns "Bad Request" response
     Given operation "CreateSecurityMonitoringDataset" enabled
     And new "CreateSecurityMonitoringDataset" request
@@ -681,7 +681,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a dataset returns "Conflict" response
     Given operation "CreateSecurityMonitoringDataset" enabled
     And new "CreateSecurityMonitoringDataset" request
@@ -689,7 +689,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a dataset returns "Created" response
     Given operation "CreateSecurityMonitoringDataset" enabled
     And new "CreateSecurityMonitoringDataset" request
@@ -697,14 +697,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 201 Created
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Create a detection rule returns "Bad Request" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":""}],"cases":[{"status":"info"}],"options":{},"message":"Test rule","tags":[],"isEnabled":true}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a detection rule returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection", "referenceTables":[{"tableName": "synthetics_test_reference_table_dont_delete", "columnName": "value", "logFieldPath":"testtag", "checkPresence":true, "ruleQueryName":"a"}]}
@@ -715,7 +715,7 @@ Feature: Security Monitoring
     And the response "message" is equal to "Test rule"
     And the response "referenceTables" is equal to [{"tableName": "synthetics_test_reference_table_dont_delete", "columnName": "value", "logFieldPath":"testtag", "checkPresence":true, "ruleQueryName":"a"}]
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with detection method 'anomaly_detection' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}","type":"log_detection","isEnabled":true,"queries":[{"aggregation":"count","dataSource":"logs","distinctFields":[],"groupByFields":["@usr.email","@network.client.ip"],"hasOptionalGroupByFields":false,"name":"","query":"service:app status:error"}],"cases":[{"name":"","status":"info","notifications":[],"condition":"a > 0.995"}],"message":"An anomaly detection rule","options":{"detectionMethod":"anomaly_detection","evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400,"anomalyDetectionOptions":{"bucketDuration":300,"learningDuration":24,"detectionTolerance":3,"learningPeriodBaseline":10}},"tags":[],"filters":[]}
@@ -729,7 +729,7 @@ Feature: Security Monitoring
     And the response "options.anomalyDetectionOptions.learningPeriodBaseline" is equal to 10
     And the response "options.anomalyDetectionOptions.detectionTolerance" is equal to 3
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with detection method 'anomaly_detection' with enabled feature 'instantaneousBaseline' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}","type":"log_detection","isEnabled":true,"queries":[{"aggregation":"count","dataSource":"logs","distinctFields":[],"groupByFields":["@usr.email","@network.client.ip"],"hasOptionalGroupByFields":false,"name":"","query":"service:app status:error"}],"cases":[{"name":"","status":"info","notifications":[],"condition":"a > 0.995"}],"message":"An anomaly detection rule","options":{"detectionMethod":"anomaly_detection","evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400,"anomalyDetectionOptions":{"bucketDuration":300,"learningDuration":24,"detectionTolerance":3,"instantaneousBaseline":true}},"tags":[],"filters":[]}
@@ -740,7 +740,7 @@ Feature: Security Monitoring
     And the response "options.detectionMethod" is equal to "anomaly_detection"
     And the response "options.anomalyDetectionOptions.instantaneousBaseline" is equal to true
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with detection method 'sequence_detection' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}","type":"log_detection","isEnabled":true,"queries":[{"aggregation":"count","dataSource":"logs","distinctFields":[],"groupByFields":[],"hasOptionalGroupByFields":false,"name":"","query":"service:logs-rule-reducer source:paul test2"},{"aggregation":"count","dataSource":"logs","distinctFields":[],"groupByFields":[],"hasOptionalGroupByFields":false,"name":"","query":"service:logs-rule-reducer source:paul test1"}],"cases":[{"name":"","status":"info","notifications":[],"condition":"step_b > 0"}],"message":"Logs and signals asdf","options":{"detectionMethod":"sequence_detection","evaluationWindow":0,"keepAlive":300,"maxSignalDuration":600,"sequenceDetectionOptions":{"stepTransitions":[{"child":"step_b","evaluationWindow":900,"parent":"step_a"}],"steps":[{"condition":"a > 0","evaluationWindow":60,"name":"step_a"},{"condition":"b > 0","evaluationWindow":60,"name":"step_b"}]}},"tags":[]}
@@ -750,7 +750,7 @@ Feature: Security Monitoring
     And the response "type" is equal to "log_detection"
     And the response "options.detectionMethod" is equal to "sequence_detection"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with detection method 'third_party' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}","type":"log_detection","isEnabled":true,"thirdPartyCases":[{"query":"status:error","name":"high","status":"high"},{"query":"status:info","name":"low","status":"low"}],"queries":[],"cases":[],"message":"This is a third party rule","options":{"detectionMethod":"third_party","keepAlive":0,"maxSignalDuration":600,"thirdPartyRuleOptions":{"defaultStatus":"info","rootQueries":[{"query":"source:guardduty @details.alertType:*EC2*", "groupByFields":["instance-id"]},{"query":"source:guardduty", "groupByFields":[]}]}}}
@@ -761,7 +761,7 @@ Feature: Security Monitoring
     And the response "options.detectionMethod" is equal to "third_party"
     And the response "thirdPartyCases[0].query" is equal to "status:error"
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with type 'application_security 'returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"type":"application_security","name":"{{unique}}_appsec_rule","queries":[{"query":"@appsec.security_activity:business_logic.users.login.failure","aggregation":"count","groupByFields":["service","@http.client_ip"],"distinctFields":[]}],"filters":[],"cases":[{"name":"","status":"info","notifications":[],"condition":"a > 100000","actions":[{"type":"block_ip","options":{"duration":900}}, {"type":"user_behavior","options":{"userBehaviorName":"behavior"}}, {"type":"flag_ip","options":{"flaggedIPType":"FLAGGED"}}]}],"options":{"keepAlive":3600,"maxSignalDuration":86400,"evaluationWindow":900,"detectionMethod":"threshold"},"isEnabled":true,"message":"Test rule","tags":[],"groupSignalsBy":["service"]}
@@ -771,7 +771,7 @@ Feature: Security Monitoring
     And the response "type" is equal to "application_security"
     And the response "message" is equal to "Test rule"
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with type 'impossible_travel' and baselineUserLocationsDuration returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"queries":[{"aggregation":"geo_data","groupByFields":["@usr.id"],"distinctFields":[],"metric":"@network.client.geoip","query":"*"}],"cases":[{"name":"","status":"info","notifications":[]}],"hasExtendedTitle":true,"message":"test","isEnabled":true,"options":{"maxSignalDuration":86400,"evaluationWindow":900,"keepAlive":3600,"detectionMethod":"impossible_travel","impossibleTravelOptions":{"baselineUserLocations":true,"baselineUserLocationsDuration":7}},"name":"{{ unique }}","type":"log_detection","tags":[],"filters":[]}
@@ -784,7 +784,7 @@ Feature: Security Monitoring
     And the response "options.impossibleTravelOptions.baselineUserLocations" is equal to true
     And the response "options.impossibleTravelOptions.baselineUserLocationsDuration" is equal to 7
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with type 'impossible_travel' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"queries":[{"aggregation":"geo_data","groupByFields":["@usr.id"],"distinctFields":[],"metric":"@network.client.geoip","query":"*"}],"cases":[{"name":"","status":"info","notifications":[]}],"hasExtendedTitle":true,"message":"test","isEnabled":true,"options":{"maxSignalDuration":86400,"evaluationWindow":900,"keepAlive":3600,"detectionMethod":"impossible_travel","impossibleTravelOptions":{"baselineUserLocations":false}},"name":"{{ unique }}","type":"log_detection","tags":[],"filters":[]}
@@ -795,7 +795,7 @@ Feature: Security Monitoring
     And the response "message" is equal to "test"
     And the response "options.detectionMethod" is equal to "impossible_travel"
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a detection rule with type 'workload_security' returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type": "workload_security"}
@@ -806,7 +806,7 @@ Feature: Security Monitoring
     And the response "message" is equal to "Test rule"
     And the response "isEnabled" is equal to true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a due date rule returns "Bad Request" response
     Given operation "CreateSecurityFindingsAutomationDueDateRule" enabled
     And new "CreateSecurityFindingsAutomationDueDateRule" request
@@ -814,7 +814,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Create a due date rule returns "Successfully created the due date rule" response
     Given operation "CreateSecurityFindingsAutomationDueDateRule" enabled
     And new "CreateSecurityFindingsAutomationDueDateRule" request
@@ -825,7 +825,7 @@ Feature: Security Monitoring
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.enabled" is equal to true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a due date rule returns "Unprocessable Entity" response
     Given operation "CreateSecurityFindingsAutomationDueDateRule" enabled
     And new "CreateSecurityFindingsAutomationDueDateRule" request
@@ -833,7 +833,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a mute rule returns "Bad Request" response
     Given operation "CreateSecurityFindingsAutomationMuteRule" enabled
     And new "CreateSecurityFindingsAutomationMuteRule" request
@@ -841,7 +841,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Create a mute rule returns "Successfully created the mute rule" response
     Given operation "CreateSecurityFindingsAutomationMuteRule" enabled
     And new "CreateSecurityFindingsAutomationMuteRule" request
@@ -852,7 +852,7 @@ Feature: Security Monitoring
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.enabled" is equal to true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a mute rule returns "Unprocessable Entity" response
     Given operation "CreateSecurityFindingsAutomationMuteRule" enabled
     And new "CreateSecurityFindingsAutomationMuteRule" request
@@ -860,42 +860,42 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Create a new signal-based notification rule returns "Bad Request" response
     Given new "CreateSignalNotificationRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule 1", "routing": {"mode": "manual"}, "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["misconfiguration", "attack_path"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Create a new signal-based notification rule returns "Successfully created the notification rule." response
     Given new "CreateSignalNotificationRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule {{ uuid }}", "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["misconfiguration", "attack_path"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 201 Successfully created the notification rule.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Create a new vulnerability-based notification rule returns "Bad Request" response
     Given new "CreateVulnerabilityNotificationRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule 1", "routing": {"mode": "manual"}, "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["misconfiguration", "attack_path"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Create a new vulnerability-based notification rule returns "Successfully created the notification rule." response
     Given new "CreateVulnerabilityNotificationRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule {{ uuid }}", "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["misconfiguration", "attack_path"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 201 Successfully created the notification rule.
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Create a new vulnerability-based notification rule with sast and secret rule types returns "Successfully created the notification rule." response
     Given new "CreateVulnerabilityNotificationRule" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "{{ unique }}", "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["sast_vulnerability", "secret_vulnerability"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 201 Successfully created the notification rule.
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a scheduled detection rule returns "OK" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"indexes":["main"]}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection", "schedulingOptions": {"rrule": "FREQ=HOURLY;INTERVAL=2;", "start": "2025-06-18T12:00:00", "timezone": "Europe/Paris"}}
@@ -906,28 +906,28 @@ Feature: Security Monitoring
     And the response "message" is equal to "Test rule"
     And the response "schedulingOptions" is equal to {"rrule": "FREQ=HOURLY;INTERVAL=2;", "start": "2025-06-18T12:00:00", "timezone": "Europe/Paris"}
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a scheduled rule without rrule returns "Bad Request" response
     Given new "CreateSecurityMonitoringRule" request
     And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"indexes":["main"]}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection", "schedulingOptions": {"start": "2025-06-18T12:00:00", "timezone": "Europe/Paris"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a security filter returns "Bad Request" response
     Given new "CreateSecurityFilter" request
     And body with value {"data": {"attributes": {"exclusion_filters": [{"name": "Exclude staging", "query": "source:staging"}], "filtered_data_type": "logs", "is_enabled": true, "name": "Custom security filter", "query": "service:api"}, "type": "security_filters"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a security filter returns "Conflict" response
     Given new "CreateSecurityFilter" request
     And body with value {"data": {"attributes": {"exclusion_filters": [{"name": "Exclude staging", "query": "source:staging"}], "filtered_data_type": "logs", "is_enabled": true, "name": "Custom security filter", "query": "service:api"}, "type": "security_filters"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Create a security filter returns "OK" response
     Given new "CreateSecurityFilter" request
     And body with value {"data": {"attributes": {"exclusion_filters": [{"name": "Exclude staging", "query": "source:staging"}], "filtered_data_type": "logs", "is_enabled": true, "name": "{{ unique }}", "query": "service:{{ unique_alnum }}"}, "type": "security_filters"}}
@@ -939,7 +939,7 @@ Feature: Security Monitoring
     And the response "data.attributes.exclusion_filters[0].name" is equal to "Exclude staging"
     And the response "data.attributes.exclusion_filters[0].query" is equal to "source:staging"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a severity modifier rule returns "Bad Request" response
     Given operation "CreateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "CreateSecurityFindingsAutomationSeverityModifierRule" request
@@ -947,7 +947,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Create a severity modifier rule returns "Successfully created the severity modifier rule" response
     Given operation "CreateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "CreateSecurityFindingsAutomationSeverityModifierRule" request
@@ -955,7 +955,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 201 Successfully created the severity modifier rule
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a severity modifier rule returns "Unprocessable Entity" response
     Given operation "CreateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "CreateSecurityFindingsAutomationSeverityModifierRule" request
@@ -963,21 +963,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a suppression rule returns "Bad Request" response
     Given new "CreateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"data_exclusion_query": "source:cloudtrail account_id:12345", "description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": 1703187336000, "name": "Custom suppression", "rule_query": "type:log_detection source:cloudtrail", "start_date": 1703187336000, "suppression_query": "env:staging status:low", "tags": ["technique:T1110-brute-force", "source:cloudtrail"]}, "type": "suppressions"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create a suppression rule returns "Conflict" response
     Given new "CreateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"data_exclusion_query": "source:cloudtrail account_id:12345", "description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": 1703187336000, "name": "Custom suppression", "rule_query": "type:log_detection source:cloudtrail", "start_date": 1703187336000, "suppression_query": "env:staging status:low", "tags": ["technique:T1110-brute-force", "source:cloudtrail"]}, "type": "suppressions"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a suppression rule returns "OK" response
     Given new "CreateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "start_date": {{ timestamp('now + 10d') }}000, "expiration_date": {{ timestamp('now + 21d') }}000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "suppression_query": "env:staging status:low", "tags": ["technique:T1110-brute-force", "source:cloudtrail"]}, "type": "suppressions"}}
@@ -987,7 +987,7 @@ Feature: Security Monitoring
     And the response "data.attributes.enabled" is equal to true
     And the response "data.attributes.rule_query" is equal to "type:log_detection source:cloudtrail"
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Create a suppression rule with an exclusion query returns "OK" response
     Given new "CreateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "start_date": {{ timestamp('now + 10d') }}000, "expiration_date": {{ timestamp('now + 21d') }}000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "data_exclusion_query": "account_id:12345"}, "type": "suppressions"}}
@@ -998,7 +998,7 @@ Feature: Security Monitoring
     And the response "data.attributes.rule_query" is equal to "type:log_detection source:cloudtrail"
     And the response "data.attributes.data_exclusion_query" is equal to "account_id:12345"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a ticket creation rule returns "Bad Request" response
     Given operation "CreateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "CreateSecurityFindingsAutomationTicketCreationRule" request
@@ -1006,7 +1006,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Create a ticket creation rule returns "Successfully created the ticket creation rule" response
     Given operation "CreateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "CreateSecurityFindingsAutomationTicketCreationRule" request
@@ -1017,7 +1017,7 @@ Feature: Security Monitoring
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.enabled" is equal to true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create a ticket creation rule returns "Unprocessable Entity" response
     Given operation "CreateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "CreateSecurityFindingsAutomationTicketCreationRule" request
@@ -1025,7 +1025,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create an entity context sync configuration returns "Bad Request" response
     Given operation "CreateSecurityMonitoringIntegrationConfig" enabled
     And new "CreateSecurityMonitoringIntegrationConfig" request
@@ -1033,7 +1033,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Create an entity context sync configuration returns "OK" response
     Given operation "CreateSecurityMonitoringIntegrationConfig" enabled
     And new "CreateSecurityMonitoringIntegrationConfig" request
@@ -1041,7 +1041,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create an inbox rule returns "Bad Request" response
     Given operation "CreateSecurityFindingsAutomationInboxRule" enabled
     And new "CreateSecurityFindingsAutomationInboxRule" request
@@ -1049,7 +1049,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Create an inbox rule returns "Successfully created the inbox rule" response
     Given operation "CreateSecurityFindingsAutomationInboxRule" enabled
     And new "CreateSecurityFindingsAutomationInboxRule" request
@@ -1060,7 +1060,7 @@ Feature: Security Monitoring
     And the response "data.attributes.name" is equal to "{{ unique }}"
     And the response "data.attributes.enabled" is equal to true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Create an inbox rule returns "Unprocessable Entity" response
     Given operation "CreateSecurityFindingsAutomationInboxRule" enabled
     And new "CreateSecurityFindingsAutomationInboxRule" request
@@ -1068,7 +1068,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create case for security finding returns "Created" response
     Given new "CreateCases" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "YjdhNDM3N2QyNTFjYmUwYTY3NDdhMTg0YTk2Yjg5MDl-ZjNmMzAwOTFkZDNhNGQzYzI0MzgxNTk4MjRjZmE2NzE=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "cases"}]}
@@ -1083,7 +1083,7 @@ Feature: Security Monitoring
     And the response "data[0].attributes.insights[0].resource_id" is equal to "YjdhNDM3N2QyNTFjYmUwYTY3NDdhMTg0YTk2Yjg5MDl-ZjNmMzAwOTFkZDNhNGQzYzI0MzgxNTk4MjRjZmE2NzE="
     And the response "data[0].attributes.insights[0].type" is equal to "SECURITY_FINDING"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create case for security findings returns "Created" response
     Given new "CreateCases" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "ZTd5LWNuYi1seWV-aS0wMjI2NGZjZjRmZWQ5ODMyMg==", "type": "findings"}, {"id": "c2FuLXhyaS1kZnN-aS0wODM3MjVhMTM2MDExNzNkOQ==", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "cases"}]}
@@ -1100,14 +1100,14 @@ Feature: Security Monitoring
     And the response "data[0].attributes.insights[0].resource_id" is equal to "ZTd5LWNuYi1seWV-aS0wMjI2NGZjZjRmZWQ5ODMyMg=="
     And the response "data[0].attributes.insights[0].type" is equal to "SECURITY_FINDING"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create cases for security findings returns "Bad Request" response
     Given new "CreateCases" request
     And body with value {"data": [{"attributes": {}, "relationships": {"findings": {"data": []}, "project": {"data": {"id": "7f198869-c7ef-4afc-97cf-da5cdc13b5c3", "type": "projects"}}}, "type": "cases"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create cases for security findings returns "Created" response
     Given new "CreateCases" request
     And body with value {"data": [{"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "YjdhNDM3N2QyNTFjYmUwYTY3NDdhMTg0YTk2Yjg5MDl-ZjNmMzAwOTFkZDNhNGQzYzI0MzgxNTk4MjRjZmE2NzE=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "cases"}, {"attributes": {"title": "A title", "description": "A description"}, "relationships": {"findings": {"data": [{"id": "OGRlMDIwYzk4MjFmZTZiNTQwMzk2ZjUxNzg0MDc0NjR-MTk3Yjk4MDI4ZDQ4YzI2ZGZiMWJmMTNhNDEwZGZkYWI=", "type": "findings"}]}, "project": {"data": {"id": "959a6f71-bac8-4027-b1d3-2264f569296f", "type": "projects"}}}, "type": "cases"}]}
@@ -1129,14 +1129,14 @@ Feature: Security Monitoring
     And the response "data[1].attributes.insights[0].resource_id" is equal to "OGRlMDIwYzk4MjFmZTZiNTQwMzk2ZjUxNzg0MDc0NjR-MTk3Yjk4MDI4ZDQ4YzI2ZGZiMWJmMTNhNDEwZGZkYWI="
     And the response "data[1].attributes.insights[0].type" is equal to "SECURITY_FINDING"
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Create cases for security findings returns "Not Found" response
     Given new "CreateCases" request
     And body with value {"data": [{"attributes": {}, "relationships": {"findings": {"data": [{"id": "ZGZhMDI3ZjdjMDM3YjJmNzcxNTlhZGMwMjdmZWNiNTZ-MTVlYTNmYWU3NjNlOTNlYTE2YjM4N2JmZmI4Yjk5N2Y=", "type": "findings"}]}, "project": {"data": {"id": "00000000-0000-0000-0000-000000000000", "type": "projects"}}}, "type": "cases"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Create or update an indicator triage state returns "Bad Request" response
     Given operation "CreateIoCTriageState" enabled
     And new "CreateIoCTriageState" request
@@ -1144,7 +1144,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Create or update an indicator triage state returns "Created" response
     Given operation "CreateIoCTriageState" enabled
     And new "CreateIoCTriageState" request
@@ -1152,7 +1152,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Deactivate an entity context sync integration returns "Not Found" response
     Given operation "DeactivateIntegration" enabled
     And new "DeactivateIntegration" request
@@ -1160,7 +1160,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Deactivate an entity context sync integration returns "OK" response
     Given operation "DeactivateIntegration" enabled
     And new "DeactivateIntegration" request
@@ -1168,7 +1168,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Deactivate content pack returns "Accepted" response
     Given operation "DeactivateContentPack" enabled
     And new "DeactivateContentPack" request
@@ -1176,7 +1176,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Deactivate content pack returns "Not Found" response
     Given operation "DeactivateContentPack" enabled
     And new "DeactivateContentPack" request
@@ -1184,14 +1184,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Delete a critical asset returns "Not Found" response
     Given new "DeleteSecurityMonitoringCriticalAsset" request
     And request contains "critical_asset_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Delete a critical asset returns "OK" response
     Given there is a valid "critical_asset" in the system
     And new "DeleteSecurityMonitoringCriticalAsset" request
@@ -1199,7 +1199,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Delete a custom framework returns "Bad Request" response
     Given new "DeleteCustomFramework" request
     And request contains "handle" parameter with value "handle-does-not-exist"
@@ -1207,7 +1207,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Delete a custom framework returns "OK" response
     Given there is a valid "custom_framework" in the system
     And new "DeleteCustomFramework" request
@@ -1216,7 +1216,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete a dataset returns "Bad Request" response
     Given operation "DeleteSecurityMonitoringDataset" enabled
     And new "DeleteSecurityMonitoringDataset" request
@@ -1224,7 +1224,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete a dataset returns "No Content" response
     Given operation "DeleteSecurityMonitoringDataset" enabled
     And new "DeleteSecurityMonitoringDataset" request
@@ -1232,7 +1232,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete a dataset returns "Not Found" response
     Given operation "DeleteSecurityMonitoringDataset" enabled
     And new "DeleteSecurityMonitoringDataset" request
@@ -1240,7 +1240,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a due date rule returns "Not Found" response
     Given operation "DeleteSecurityFindingsAutomationDueDateRule" enabled
     And new "DeleteSecurityFindingsAutomationDueDateRule" request
@@ -1248,7 +1248,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Delete a due date rule returns "Rule successfully deleted." response
     Given operation "DeleteSecurityFindingsAutomationDueDateRule" enabled
     And there is a valid "valid_due_date_rule" in the system
@@ -1257,7 +1257,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted.
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a due date rule returns "Successfully deleted the due date rule" response
     Given operation "DeleteSecurityFindingsAutomationDueDateRule" enabled
     And new "DeleteSecurityFindingsAutomationDueDateRule" request
@@ -1265,7 +1265,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Successfully deleted the due date rule
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a mute rule returns "Not Found" response
     Given operation "DeleteSecurityFindingsAutomationMuteRule" enabled
     And new "DeleteSecurityFindingsAutomationMuteRule" request
@@ -1273,7 +1273,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Delete a mute rule returns "Rule successfully deleted." response
     Given operation "DeleteSecurityFindingsAutomationMuteRule" enabled
     And there is a valid "valid_mute_rule" in the system
@@ -1282,7 +1282,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted.
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a mute rule returns "Successfully deleted the mute rule" response
     Given operation "DeleteSecurityFindingsAutomationMuteRule" enabled
     And new "DeleteSecurityFindingsAutomationMuteRule" request
@@ -1290,14 +1290,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Successfully deleted the mute rule
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Delete a non existing rule returns "Not Found" response
     Given new "DeleteSecurityMonitoringRule" request
     And request contains "rule_id" parameter with value "ThisRuleIdProbablyDoesntExist"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Delete a security filter returns "No Content" response
     Given there is a valid "security_filter" in the system
     And new "DeleteSecurityFilter" request
@@ -1305,21 +1305,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete a security filter returns "Not Found" response
     Given new "DeleteSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete a security filter returns "OK" response
     Given new "DeleteSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a severity modifier rule returns "Not Found" response
     Given operation "DeleteSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "DeleteSecurityFindingsAutomationSeverityModifierRule" request
@@ -1327,7 +1327,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Delete a severity modifier rule returns "Rule successfully deleted" response
     Given operation "DeleteSecurityFindingsAutomationSeverityModifierRule" enabled
     And there is a valid "valid_severity_modifier_rule" in the system
@@ -1336,7 +1336,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a severity modifier rule returns "Successfully deleted the severity modifier rule" response
     Given operation "DeleteSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "DeleteSecurityFindingsAutomationSeverityModifierRule" request
@@ -1344,7 +1344,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Successfully deleted the severity modifier rule
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a severity modifier rule returns "Unprocessable Entity" response
     Given operation "DeleteSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "DeleteSecurityFindingsAutomationSeverityModifierRule" request
@@ -1352,14 +1352,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Delete a signal-based notification rule returns "Not Found" response
     Given new "DeleteSignalNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Delete a signal-based notification rule returns "Rule successfully deleted." response
     Given there is a valid "valid_signal_notification_rule" in the system
     And new "DeleteSignalNotificationRule" request
@@ -1367,14 +1367,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted.
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Delete a suppression rule returns "Not Found" response
     Given new "DeleteSecurityMonitoringSuppression" request
     And request contains "suppression_id" parameter with value "does-not-exist"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Delete a suppression rule returns "OK" response
     Given there is a valid "suppression" in the system
     And new "DeleteSecurityMonitoringSuppression" request
@@ -1382,7 +1382,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a ticket creation rule returns "Not Found" response
     Given operation "DeleteSecurityFindingsAutomationTicketCreationRule" enabled
     And new "DeleteSecurityFindingsAutomationTicketCreationRule" request
@@ -1390,7 +1390,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Delete a ticket creation rule returns "Rule successfully deleted." response
     Given operation "DeleteSecurityFindingsAutomationTicketCreationRule" enabled
     And there is a valid "valid_ticket_creation_rule" in the system
@@ -1399,7 +1399,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted.
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete a ticket creation rule returns "Successfully deleted the ticket creation rule" response
     Given operation "DeleteSecurityFindingsAutomationTicketCreationRule" enabled
     And new "DeleteSecurityFindingsAutomationTicketCreationRule" request
@@ -1407,14 +1407,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Successfully deleted the ticket creation rule
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Delete a vulnerability-based notification rule returns "Not Found" response
     Given new "DeleteVulnerabilityNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Delete a vulnerability-based notification rule returns "Rule successfully deleted." response
     Given there is a valid "valid_vulnerability_notification_rule" in the system
     And new "DeleteVulnerabilityNotificationRule" request
@@ -1422,7 +1422,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Rule successfully deleted.
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete an entity context sync configuration returns "Not Found" response
     Given operation "DeleteSecurityMonitoringIntegrationConfig" enabled
     And new "DeleteSecurityMonitoringIntegrationConfig" request
@@ -1430,7 +1430,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete an entity context sync configuration returns "OK" response
     Given operation "DeleteSecurityMonitoringIntegrationConfig" enabled
     And new "DeleteSecurityMonitoringIntegrationConfig" request
@@ -1438,7 +1438,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Delete an existing job returns "Bad Request" response
     Given operation "DeleteHistoricalJob" enabled
     And new "DeleteHistoricalJob" request
@@ -1446,7 +1446,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete an existing job returns "Conflict" response
     Given operation "DeleteHistoricalJob" enabled
     And new "DeleteHistoricalJob" request
@@ -1454,7 +1454,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Delete an existing job returns "Not Found" response
     Given operation "DeleteHistoricalJob" enabled
     And new "DeleteHistoricalJob" request
@@ -1462,7 +1462,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete an existing job returns "OK" response
     Given operation "DeleteHistoricalJob" enabled
     And new "DeleteHistoricalJob" request
@@ -1470,14 +1470,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Delete an existing rule returns "Not Found" response
     Given new "DeleteSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Delete an existing rule returns "OK" response
     Given there is a valid "security_rule" in the system
     And new "DeleteSecurityMonitoringRule" request
@@ -1485,7 +1485,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Delete an inbox rule returns "Not Found" response
     Given operation "DeleteSecurityFindingsAutomationInboxRule" enabled
     And new "DeleteSecurityFindingsAutomationInboxRule" request
@@ -1493,7 +1493,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Delete an inbox rule returns "Successfully deleted the inbox rule" response
     Given operation "DeleteSecurityFindingsAutomationInboxRule" enabled
     And there is a valid "valid_inbox_rule" in the system
@@ -1502,28 +1502,28 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 Successfully deleted the inbox rule
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Detach security findings from their case returns "Bad Request" response
     Given new "DetachCase" request
     And body with value {"data": {"relationships": {"findings": {"data": []}}, "type": "cases"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Detach security findings from their case returns "No Content" response
     Given new "DetachCase" request
     And body with value {"data": {"relationships": {"findings": {"data": [{"id": "YzM2MTFjYzcyNmY0Zjg4MTAxZmRlNjQ1MWU1ZGQwYzR-YzI5NzE5Y2Y4MzU4ZjliNzhkNjYxNTY0ODIzZDQ2YTM=", "type": "findings"}]}}, "type": "cases"}}
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Detach security findings from their case returns "Not Found" response
     Given new "DetachCase" request
     And body with value {"data": {"relationships": {"findings": {"data": [{"id": "wrong-finding-id", "type": "findings"}]}}, "type": "cases"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Disable a default inbox rule returns "Not Found" response
     Given operation "DisableSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "DisableSecurityFindingsAutomationDefaultInboxRule" request
@@ -1531,7 +1531,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Disable a default inbox rule returns "Successfully disabled the default inbox rule" response
     Given operation "DisableSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "DisableSecurityFindingsAutomationDefaultInboxRule" request
@@ -1542,7 +1542,7 @@ Feature: Security Monitoring
     And the response "data.type" is equal to "default_inbox_rules"
     And the response "data.attributes.enabled" is equal to false
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Enable a default inbox rule returns "Not Found" response
     Given operation "EnableSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "EnableSecurityFindingsAutomationDefaultInboxRule" request
@@ -1550,7 +1550,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Enable a default inbox rule returns "Successfully enabled the default inbox rule" response
     Given operation "EnableSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "EnableSecurityFindingsAutomationDefaultInboxRule" request
@@ -1561,7 +1561,7 @@ Feature: Security Monitoring
     And the response "data.type" is equal to "default_inbox_rules"
     And the response "data.attributes.enabled" is equal to true
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Export security monitoring resource to Terraform returns "Not Found" response
     Given operation "ExportSecurityMonitoringTerraformResource" enabled
     And new "ExportSecurityMonitoringTerraformResource" request
@@ -1570,7 +1570,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Export security monitoring resource to Terraform returns "OK" response
     Given operation "ExportSecurityMonitoringTerraformResource" enabled
     And there is a valid "suppression" in the system
@@ -1582,7 +1582,7 @@ Feature: Security Monitoring
     And the response "data.attributes.type_name" is equal to "datadog_security_monitoring_suppression"
     And the response "data.attributes.resource_id" has the same value as "suppression.data.id"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Export security monitoring resources to Terraform returns "Bad Request" response
     Given operation "BulkExportSecurityMonitoringTerraformResources" enabled
     And new "BulkExportSecurityMonitoringTerraformResources" request
@@ -1591,7 +1591,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Export security monitoring resources to Terraform returns "Not Found" response
     Given operation "BulkExportSecurityMonitoringTerraformResources" enabled
     And new "BulkExportSecurityMonitoringTerraformResources" request
@@ -1600,7 +1600,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Export security monitoring resources to Terraform returns "OK" response
     Given operation "BulkExportSecurityMonitoringTerraformResources" enabled
     And there is a valid "suppression" in the system
@@ -1610,7 +1610,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get AST for source code returns "Bad Request" response
     Given operation "CreateStaticAnalysisAst" enabled
     And new "CreateStaticAnalysisAst" request
@@ -1618,7 +1618,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get AST for source code returns "OK" response
     Given operation "CreateStaticAnalysisAst" enabled
     And new "CreateStaticAnalysisAst" request
@@ -1626,14 +1626,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get Entra ID Azure App Registration prerequisites returns "OK" response
     Given operation "GetEntraIdAzureAppRegistrations" enabled
     And new "GetEntraIdAzureAppRegistrations" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: Get SBOM returns "Bad request: The server cannot process the request due to invalid syntax in the request." response
     Given new "GetSBOM" request
     And request contains "asset_type" parameter from "REPLACE.ME"
@@ -1641,7 +1641,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad request: The server cannot process the request due to invalid syntax in the request.
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: Get SBOM returns "Not found: asset not found" response
     Given new "GetSBOM" request
     And request contains "asset_type" parameter with value "Host"
@@ -1649,7 +1649,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not found: asset not found
 
-  @skip @team:DataDog/k9-cloud-vm
+  @skip @team:ddoghq/k9-cloud-vm
   Scenario: Get SBOM returns "OK" response
     Given new "GetSBOM" request
     And request contains "asset_type" parameter with value "Repository"
@@ -1657,7 +1657,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get a SAST ruleset returns "Bad Request" response
     Given operation "GetStaticAnalysisRuleset" enabled
     And new "GetStaticAnalysisRuleset" request
@@ -1665,7 +1665,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get a SAST ruleset returns "Not Found" response
     Given operation "GetStaticAnalysisRuleset" enabled
     And new "GetStaticAnalysisRuleset" request
@@ -1673,7 +1673,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get a SAST ruleset returns "OK" response
     Given operation "GetStaticAnalysisRuleset" enabled
     And new "GetStaticAnalysisRuleset" request
@@ -1681,7 +1681,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Get a cloud configuration rule's details returns "OK" response
     Given there is a valid "cloud_configuration_rule" in the system
     And new "GetSecurityMonitoringRule" request
@@ -1691,14 +1691,14 @@ Feature: Security Monitoring
     And the response "name" is equal to "{{ unique }}_cloud"
     And the response "id" has the same value as "cloud_configuration_rule.id"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a critical asset returns "Not Found" response
     Given new "GetSecurityMonitoringCriticalAsset" request
     And request contains "critical_asset_id" parameter with value "00000000-0000-0000-0000-000000000000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Get a critical asset returns "OK" response
     Given new "GetSecurityMonitoringCriticalAsset" request
     And there is a valid "critical_asset" in the system
@@ -1708,7 +1708,7 @@ Feature: Security Monitoring
     And the response "data.attributes.rule_query" has the same value as "critical_asset.data.attributes.rule_query"
     And the response "data.attributes.severity" is equal to "medium"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a custom framework returns "Bad Request" response
     Given new "GetCustomFramework" request
     And request contains "handle" parameter with value "frame-does-not-exist"
@@ -1716,7 +1716,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Get a custom framework returns "OK" response
     Given there is a valid "custom_framework" in the system
     And new "GetCustomFramework" request
@@ -1725,7 +1725,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset at a specific version returns "Bad Request" response
     Given operation "GetSecurityMonitoringDatasetByVersion" enabled
     And new "GetSecurityMonitoringDatasetByVersion" request
@@ -1734,7 +1734,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset at a specific version returns "Not Found" response
     Given operation "GetSecurityMonitoringDatasetByVersion" enabled
     And new "GetSecurityMonitoringDatasetByVersion" request
@@ -1743,7 +1743,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset at a specific version returns "OK" response
     Given operation "GetSecurityMonitoringDatasetByVersion" enabled
     And new "GetSecurityMonitoringDatasetByVersion" request
@@ -1752,7 +1752,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset returns "Bad Request" response
     Given operation "GetSecurityMonitoringDataset" enabled
     And new "GetSecurityMonitoringDataset" request
@@ -1760,7 +1760,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset returns "Not Found" response
     Given operation "GetSecurityMonitoringDataset" enabled
     And new "GetSecurityMonitoringDataset" request
@@ -1768,7 +1768,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a dataset returns "OK" response
     Given operation "GetSecurityMonitoringDataset" enabled
     And new "GetSecurityMonitoringDataset" request
@@ -1776,7 +1776,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a default inbox rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "GetSecurityFindingsAutomationDefaultInboxRule" request
@@ -1784,7 +1784,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get a default inbox rule returns "Successfully retrieved the default inbox rule" response
     Given operation "GetSecurityFindingsAutomationDefaultInboxRule" enabled
     And new "GetSecurityFindingsAutomationDefaultInboxRule" request
@@ -1794,7 +1794,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "secret_default_rule"
     And the response "data.type" is equal to "default_inbox_rules"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a due date rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationDueDateRule" enabled
     And new "GetSecurityFindingsAutomationDueDateRule" request
@@ -1802,7 +1802,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get a due date rule returns "Successfully retrieved the due date rule" response
     Given operation "GetSecurityFindingsAutomationDueDateRule" enabled
     And there is a valid "valid_due_date_rule" in the system
@@ -1813,7 +1813,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_due_date_rule.data.id }}"
     And the response "data.type" is equal to "due_date_rules"
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Get a finding returns "Bad Request: The server cannot process the request due to invalid syntax in the request." response
     Given operation "GetFinding" enabled
     And new "GetFinding" request
@@ -1821,7 +1821,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Get a finding returns "Not Found: The requested finding cannot be found." response
     Given operation "GetFinding" enabled
     And new "GetFinding" request
@@ -1829,7 +1829,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found: The requested finding cannot be found.
 
-  @replay-only @team:DataDog/cloud-security-posture-management
+  @replay-only @team:ddoghq/cloud-security-posture-management
   Scenario: Get a finding returns "OK" response
     Given operation "GetFinding" enabled
     And new "GetFinding" request
@@ -1838,7 +1838,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "data.attributes.evaluation" is equal to "pass"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a hist signal's details returns "Bad Request" response
     Given operation "GetSecurityMonitoringHistsignal" enabled
     And new "GetSecurityMonitoringHistsignal" request
@@ -1846,7 +1846,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a hist signal's details returns "Not Found" response
     Given operation "GetSecurityMonitoringHistsignal" enabled
     And new "GetSecurityMonitoringHistsignal" request
@@ -1854,7 +1854,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a hist signal's details returns "OK" response
     Given operation "GetSecurityMonitoringHistsignal" enabled
     And new "GetSecurityMonitoringHistsignal" request
@@ -1862,7 +1862,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a job's details returns "Bad Request" response
     Given operation "GetHistoricalJob" enabled
     And new "GetHistoricalJob" request
@@ -1870,7 +1870,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a job's details returns "Not Found" response
     Given operation "GetHistoricalJob" enabled
     And new "GetHistoricalJob" request
@@ -1878,7 +1878,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a job's details returns "OK" response
     Given operation "GetHistoricalJob" enabled
     And operation "RunHistoricalJob" enabled
@@ -1888,7 +1888,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a job's hist signals returns "Bad Request" response
     Given operation "GetSecurityMonitoringHistsignalsByJobId" enabled
     And new "GetSecurityMonitoringHistsignalsByJobId" request
@@ -1896,7 +1896,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a job's hist signals returns "Not Found" response
     Given operation "GetSecurityMonitoringHistsignalsByJobId" enabled
     And new "GetSecurityMonitoringHistsignalsByJobId" request
@@ -1904,7 +1904,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a job's hist signals returns "OK" response
     Given operation "GetSecurityMonitoringHistsignalsByJobId" enabled
     And new "GetSecurityMonitoringHistsignalsByJobId" request
@@ -1912,14 +1912,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a list of security signals returns "Bad Request" response
     Given new "SearchSecurityMonitoringSignals" request
     And body with value {"filter": {"from": "2019-01-02T09:42:36.320Z", "query": "security:attack status:high", "to": "2019-01-03T09:42:36.320Z"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a list of security signals returns "OK" response
     Given new "SearchSecurityMonitoringSignals" request
     And body with value {"filter": {"from": "{{ timeISO("now-15m") }}", "query": "security:attack status:high", "to": "{{ timeISO("now") }}"}, "page": {"limit": 25}, "sort": "timestamp"}
@@ -1929,7 +1929,7 @@ Feature: Security Monitoring
     And the response "meta" has field "request_id"
     And the response "meta.status" is equal to "done"
 
-  @replay-only @skip-validation @team:DataDog/cloud-siem @with-pagination
+  @replay-only @skip-validation @team:ddoghq/cloud-siem @with-pagination
   Scenario: Get a list of security signals returns "OK" response with pagination
     Given new "SearchSecurityMonitoringSignals" request
     And body with value {"filter": {"from": "{{ timeISO("now-15m") }}", "query": "security:attack status:high", "to": "{{ timeISO("now") }}"}, "page": {"limit": 2}, "sort": "timestamp"}
@@ -1937,7 +1937,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a mute rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationMuteRule" enabled
     And new "GetSecurityFindingsAutomationMuteRule" request
@@ -1945,7 +1945,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get a mute rule returns "Successfully retrieved the mute rule" response
     Given operation "GetSecurityFindingsAutomationMuteRule" enabled
     And there is a valid "valid_mute_rule" in the system
@@ -1956,19 +1956,19 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_mute_rule.data.id }}"
     And the response "data.type" is equal to "mute_rules"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a quick list of security signals returns "Bad Request" response
     Given new "ListSecurityMonitoringSignals" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a quick list of security signals returns "OK" response
     Given new "ListSecurityMonitoringSignals" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/cloud-siem @with-pagination
+  @replay-only @skip-validation @team:ddoghq/cloud-siem @with-pagination
   Scenario: Get a quick list of security signals returns "OK" response with pagination
     Given new "ListSecurityMonitoringSignals" request
     And request contains "page[limit]" parameter with value 2
@@ -1976,14 +1976,14 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a rule's details returns "Not Found" response
     Given new "GetSecurityMonitoringRule" request
     And request contains "rule_id" parameter with value "abcde-12345"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Get a rule's details returns "OK" response
     Given new "GetSecurityMonitoringRule" request
     And there is a valid "security_rule" in the system
@@ -1993,7 +1993,7 @@ Feature: Security Monitoring
     And the response "name" is equal to "{{ unique }}"
     And the response "id" has the same value as "security_rule.id"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a rule's version history returns "Bad Request" response
     Given operation "GetRuleVersionHistory" enabled
     And new "GetRuleVersionHistory" request
@@ -2001,7 +2001,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a rule's version history returns "Not Found" response
     Given operation "GetRuleVersionHistory" enabled
     And new "GetRuleVersionHistory" request
@@ -2009,7 +2009,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a rule's version history returns "OK" response
     Given operation "GetRuleVersionHistory" enabled
     And new "GetRuleVersionHistory" request
@@ -2017,14 +2017,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a security filter returns "Not Found" response
     Given new "GetSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a security filter returns "OK" response
     Given there is a valid "security_filter" in the system
     And new "GetSecurityFilter" request
@@ -2037,7 +2037,7 @@ Feature: Security Monitoring
     And the response "data.attributes.exclusion_filters[0].name" is equal to "Exclude logs from staging"
     And the response "data.attributes.exclusion_filters[0].query" is equal to "source:staging"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a severity modifier rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "GetSecurityFindingsAutomationSeverityModifierRule" request
@@ -2045,7 +2045,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get a severity modifier rule returns "Successfully retrieved the severity modifier rule" response
     Given operation "GetSecurityFindingsAutomationSeverityModifierRule" enabled
     And there is a valid "valid_severity_modifier_rule" in the system
@@ -2056,7 +2056,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_severity_modifier_rule.data.id }}"
     And the response "data.type" is equal to "severity_modifier_rules"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a severity modifier rule returns "Unprocessable Entity" response
     Given operation "GetSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "GetSecurityFindingsAutomationSeverityModifierRule" request
@@ -2064,21 +2064,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Get a signal's details returns "Not Found" response
     Given new "GetSecurityMonitoringSignal" request
     And request contains "signal_id" parameter with value "AQAAAYNqUBVU4-rffwAAAABBWU5xVUJWVUFBQjJBd3ptCL3QUEm3nt2"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Get a signal's details returns "OK" response
     Given new "GetSecurityMonitoringSignal" request
     And request contains "signal_id" parameter with value "AQAAAYNqUBVU4-rffwAAAABBWU5xVUJWVUFBQjJBd3ptMDdQUnF3QUE"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a single entity context returns "Bad Request" response
     Given operation "GetSingleEntityContext" enabled
     And new "GetSingleEntityContext" request
@@ -2086,7 +2086,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a single entity context returns "Not Found" response
     Given operation "GetSingleEntityContext" enabled
     And new "GetSingleEntityContext" request
@@ -2094,7 +2094,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get a single entity context returns "OK" response
     Given operation "GetSingleEntityContext" enabled
     And new "GetSingleEntityContext" request
@@ -2102,14 +2102,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Get a suppression rule returns "Not Found" response
     Given new "GetSecurityMonitoringSuppression" request
     And request contains "suppression_id" parameter with value "this-does-not-exist"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Get a suppression rule returns "OK" response
     Given new "GetSecurityMonitoringSuppression" request
     And there is a valid "suppression" in the system
@@ -2119,14 +2119,14 @@ Feature: Security Monitoring
     And the response "data.attributes.rule_query" has the same value as "suppression.data.attributes.rule_query"
     And the response "data.attributes.suppression_query" is equal to "env:test"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a suppression's version history returns "Not Found" response
     Given new "GetSuppressionVersionHistory" request
     And request contains "suppression_id" parameter with value "this-does-not-exist"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get a suppression's version history returns "OK" response
     Given new "GetSuppressionVersionHistory" request
     And there is a valid "suppression" in the system
@@ -2134,7 +2134,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get a ticket creation rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationTicketCreationRule" enabled
     And new "GetSecurityFindingsAutomationTicketCreationRule" request
@@ -2142,7 +2142,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get a ticket creation rule returns "Successfully retrieved the ticket creation rule" response
     Given operation "GetSecurityFindingsAutomationTicketCreationRule" enabled
     And there is a valid "valid_ticket_creation_rule" in the system
@@ -2153,13 +2153,13 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_ticket_creation_rule.data.id }}"
     And the response "data.type" is equal to "ticket_creation_rules"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get all critical assets returns "OK" response
     Given new "ListSecurityMonitoringCriticalAssets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all default inbox rules returns "Successfully retrieved the list of default inbox rules" response
     Given operation "ListSecurityFindingsAutomationDefaultInboxRules" enabled
     And new "ListSecurityFindingsAutomationDefaultInboxRules" request
@@ -2167,7 +2167,7 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of default inbox rules
     And the response "data" has item with field "id" with value "secret_default_rule"
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all due date rules returns "Successfully retrieved the list of due date rules" response
     Given operation "ListSecurityFindingsAutomationDueDateRules" enabled
     And there is a valid "valid_due_date_rule" in the system
@@ -2176,7 +2176,7 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of due date rules
     And the response "data" has item with field "id" with value "{{ valid_due_date_rule.data.id }}"
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all inbox rules returns "Successfully retrieved the list of inbox rules" response
     Given operation "ListSecurityFindingsAutomationInboxRules" enabled
     And there is a valid "valid_inbox_rule" in the system
@@ -2185,7 +2185,7 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of inbox rules
     And the response "data" has item with field "id" with value "{{ valid_inbox_rule.data.id }}"
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all mute rules returns "Successfully retrieved the list of mute rules" response
     Given operation "ListSecurityFindingsAutomationMuteRules" enabled
     And there is a valid "valid_mute_rule" in the system
@@ -2194,7 +2194,7 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of mute rules
     And the response "data" has item with field "id" with value "{{ valid_mute_rule.data.id }}"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get all security filters returns "OK" response
     Given new "ListSecurityFilters" request
     When the request is sent
@@ -2202,14 +2202,14 @@ Feature: Security Monitoring
     And the response "data" has item with field "attributes.filtered_data_type" with value "logs"
     And the response "data" has item with field "attributes.is_builtin" with value true
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get all severity modifier rules returns "Not Found" response
     Given operation "ListSecurityFindingsAutomationSeverityModifierRules" enabled
     And new "ListSecurityFindingsAutomationSeverityModifierRules" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all severity modifier rules returns "Successfully retrieved the list of severity modifier rules" response
     Given operation "ListSecurityFindingsAutomationSeverityModifierRules" enabled
     And there is a valid "valid_severity_modifier_rule" in the system
@@ -2218,13 +2218,13 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of severity modifier rules
     And the response "data" has item with field "id" with value "{{ valid_severity_modifier_rule.data.id }}"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get all suppression rules returns "OK" response
     Given new "ListSecurityMonitoringSuppressions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get all suppression rules returns "OK" response with pagination
     Given new "ListSecurityMonitoringSuppressions" request
     And there is a valid "suppression" in the system
@@ -2236,7 +2236,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get all suppression rules returns "OK" response with sort ascending
     Given new "ListSecurityMonitoringSuppressions" request
     And there is a valid "suppression" in the system
@@ -2247,7 +2247,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "suppression {{ unique_hash }}"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get all suppression rules returns "OK" response with sort descending
     Given new "ListSecurityMonitoringSuppressions" request
     And there is a valid "suppression" in the system
@@ -2258,7 +2258,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "data[0].attributes.name" is equal to "suppression2 {{ unique_hash }}"
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get all ticket creation rules returns "Successfully retrieved the list of ticket creation rules" response
     Given operation "ListSecurityFindingsAutomationTicketCreationRules" enabled
     And there is a valid "valid_ticket_creation_rule" in the system
@@ -2267,7 +2267,7 @@ Feature: Security Monitoring
     Then the response status is 200 Successfully retrieved the list of ticket creation rules
     And the response "data" has item with field "id" with value "{{ valid_ticket_creation_rule.data.id }}"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get an entity context sync configuration returns "Not Found" response
     Given operation "GetSecurityMonitoringIntegrationConfig" enabled
     And new "GetSecurityMonitoringIntegrationConfig" request
@@ -2275,7 +2275,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get an entity context sync configuration returns "OK" response
     Given operation "GetSecurityMonitoringIntegrationConfig" enabled
     And new "GetSecurityMonitoringIntegrationConfig" request
@@ -2283,7 +2283,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Get an inbox rule returns "Not Found" response
     Given operation "GetSecurityFindingsAutomationInboxRule" enabled
     And new "GetSecurityFindingsAutomationInboxRule" request
@@ -2291,7 +2291,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Get an inbox rule returns "Successfully retrieved the inbox rule" response
     Given operation "GetSecurityFindingsAutomationInboxRule" enabled
     And there is a valid "valid_inbox_rule" in the system
@@ -2302,7 +2302,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_inbox_rule.data.id }}"
     And the response "data.type" is equal to "inbox_rules"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get an indicator of compromise returns "Bad Request" response
     Given operation "GetIndicatorOfCompromise" enabled
     And new "GetIndicatorOfCompromise" request
@@ -2310,7 +2310,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Get an indicator of compromise returns "Not Found" response
     Given operation "GetIndicatorOfCompromise" enabled
     And new "GetIndicatorOfCompromise" request
@@ -2318,7 +2318,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: Get an indicator of compromise returns "OK" response
     Given operation "GetIndicatorOfCompromise" enabled
     And new "GetIndicatorOfCompromise" request
@@ -2327,28 +2327,28 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get content pack states returns "Not Found" response
     Given operation "GetContentPacksStates" enabled
     And new "GetContentPacksStates" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get content pack states returns "OK" response
     Given operation "GetContentPacksStates" enabled
     And new "GetContentPacksStates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Get critical assets affecting a specific rule returns "Not Found" response
     Given new "GetCriticalAssetsAffectingRule" request
     And request contains "rule_id" parameter with value "aaa-bbb-ccc-ddd"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get critical assets affecting a specific rule returns "OK" response
     Given new "GetCriticalAssetsAffectingRule" request
     And there is a valid "security_rule" in the system
@@ -2356,7 +2356,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get dataset dependencies returns "Bad Request" response
     Given operation "BatchGetSecurityMonitoringDatasetDependencies" enabled
     And new "BatchGetSecurityMonitoringDatasetDependencies" request
@@ -2364,7 +2364,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get dataset dependencies returns "OK" response
     Given operation "BatchGetSecurityMonitoringDatasetDependencies" enabled
     And new "BatchGetSecurityMonitoringDatasetDependencies" request
@@ -2372,7 +2372,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get default rulesets for a language returns "Bad Request" response
     Given operation "GetStaticAnalysisDefaultRulesets" enabled
     And new "GetStaticAnalysisDefaultRulesets" request
@@ -2380,7 +2380,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get default rulesets for a language returns "OK" response
     Given operation "GetStaticAnalysisDefaultRulesets" enabled
     And new "GetStaticAnalysisDefaultRulesets" request
@@ -2388,21 +2388,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a signal-based notification rule returns "Bad Request" response
     Given new "GetSignalNotificationRule" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a signal-based notification rule returns "Not Found" response
     Given new "GetSignalNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a signal-based notification rule returns "Notification rule details." response
     Given there is a valid "valid_signal_notification_rule" in the system
     And new "GetSignalNotificationRule" request
@@ -2410,21 +2410,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Notification rule details.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a vulnerability notification rule returns "Bad Request" response
     Given new "GetVulnerabilityNotificationRule" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a vulnerability notification rule returns "Not Found" response
     Given new "GetVulnerabilityNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get details of a vulnerability notification rule returns "Notification rule details." response
     Given there is a valid "valid_vulnerability_notification_rule" in the system
     And new "GetVulnerabilityNotificationRule" request
@@ -2432,7 +2432,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Notification rule details.
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get entities related to a signal returns "Bad Request" response
     Given operation "GetSignalEntities" enabled
     And new "GetSignalEntities" request
@@ -2440,7 +2440,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get entities related to a signal returns "Not Found" response
     Given operation "GetSignalEntities" enabled
     And new "GetSignalEntities" request
@@ -2448,7 +2448,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get entities related to a signal returns "OK" response
     Given operation "GetSignalEntities" enabled
     And new "GetSignalEntities" request
@@ -2456,28 +2456,28 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get entity context returns "Bad Request" response
     Given operation "GetEntityContext" enabled
     And new "GetEntityContext" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get entity context returns "OK" response
     Given operation "GetEntityContext" enabled
     And new "GetEntityContext" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get investigation queries for a signal returns "Not Found" response
     Given new "GetInvestigationLogQueriesMatchingSignal" request
     And request contains "signal_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Get investigation queries for a signal returns "OK" response
     Given new "GetInvestigationLogQueriesMatchingSignal" request
     And request contains "signal_id" parameter with value "AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE"
@@ -2489,7 +2489,7 @@ Feature: Security Monitoring
     And the response "data[0].attributes" has field "query_filter"
     And the response "data[0].attributes" has field "url"
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get node types for a language returns "Bad Request" response
     Given operation "GetStaticAnalysisNodeTypes" enabled
     And new "GetStaticAnalysisNodeTypes" request
@@ -2497,7 +2497,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get node types for a language returns "OK" response
     Given operation "GetStaticAnalysisNodeTypes" enabled
     And new "GetStaticAnalysisNodeTypes" request
@@ -2505,21 +2505,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get recently updated entity context returns "Bad Request" response
     Given operation "GetEntityContextRecentlyUpdated" enabled
     And new "GetEntityContextRecentlyUpdated" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get recently updated entity context returns "OK" response
     Given operation "GetEntityContextRecentlyUpdated" enabled
     And new "GetEntityContextRecentlyUpdated" request
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-go @skip-java @skip-ruby @team:DataDog/cloud-siem
+  @skip-go @skip-java @skip-ruby @team:ddoghq/cloud-siem
   Scenario: Get rule version history returns "OK" response
     Given operation "GetRuleVersionHistory" enabled
     And new "GetRuleVersionHistory" request
@@ -2532,21 +2532,21 @@ Feature: Security Monitoring
     And the response "data.attributes.count" is equal to 1
     And the response "data.attributes.data[1].rule.name" has the same value as "security_rule.name"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get sample log generation subscriptions returns "Bad Request" response
     Given operation "ListSampleLogGenerationSubscriptions" enabled
     And new "ListSampleLogGenerationSubscriptions" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get sample log generation subscriptions returns "OK" response
     Given operation "ListSampleLogGenerationSubscriptions" enabled
     And new "ListSampleLogGenerationSubscriptions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get signals matching an event returns "Bad Request" response
     Given operation "GetMatchingSignals" enabled
     And new "GetMatchingSignals" request
@@ -2555,7 +2555,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get signals matching an event returns "Not Found" response
     Given operation "GetMatchingSignals" enabled
     And new "GetMatchingSignals" request
@@ -2564,7 +2564,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get signals matching an event returns "OK" response
     Given operation "GetMatchingSignals" enabled
     And new "GetMatchingSignals" request
@@ -2573,14 +2573,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get suggested actions for a signal returns "Not Found" response
     Given new "GetSuggestedActionsMatchingSignal" request
     And request contains "signal_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Get suggested actions for a signal returns "OK" response
     Given new "GetSuggestedActionsMatchingSignal" request
     And request contains "signal_id" parameter with value "AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE"
@@ -2596,14 +2596,14 @@ Feature: Security Monitoring
     And the response "data[1].attributes" has field "title"
     And the response "data[1].attributes" has field "url"
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get suppressions affecting a specific rule returns "Not Found" response
     Given new "GetSuppressionsAffectingRule" request
     And request contains "rule_id" parameter with value "aaa-bbb-ccc-ddd"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get suppressions affecting a specific rule returns "OK" response
     Given new "GetSuppressionsAffectingRule" request
     And there is a valid "security_rule" in the system
@@ -2611,35 +2611,35 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get suppressions affecting future rule returns "Bad Request" response
     Given new "GetSuppressionsAffectingFutureRule" request
     And body with value {"invalid_key":"invalid_value"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Get suppressions affecting future rule returns "OK" response
     Given new "GetSuppressionsAffectingFutureRule" request
     And body from file "security_monitoring_future_rule_suppression_payload.json"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get the list of signal-based notification rules returns "The list of notification rules." response
     Given there is a valid "valid_signal_notification_rule" in the system
     And new "GetSignalNotificationRules" request
     When the request is sent
     Then the response status is 200 The list of notification rules.
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Get the list of vulnerability notification rules returns "The list of notification rules." response
     Given there is a valid "valid_vulnerability_notification_rule" in the system
     And new "GetVulnerabilityNotificationRules" request
     When the request is sent
     Then the response status is 200 The list of notification rules.
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get the version history of a dataset returns "Bad Request" response
     Given operation "GetSecurityMonitoringDatasetVersionHistory" enabled
     And new "GetSecurityMonitoringDatasetVersionHistory" request
@@ -2647,7 +2647,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get the version history of a dataset returns "Not Found" response
     Given operation "GetSecurityMonitoringDatasetVersionHistory" enabled
     And new "GetSecurityMonitoringDatasetVersionHistory" request
@@ -2655,7 +2655,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get the version history of a dataset returns "OK" response
     Given operation "GetSecurityMonitoringDatasetVersionHistory" enabled
     And new "GetSecurityMonitoringDatasetVersionHistory" request
@@ -2663,13 +2663,13 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Get the version history of security filters returns "OK" response
     Given new "ListSecurityFilterVersions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get tree-sitter WASM file returns "BLOB with the content of the WASM file" response
     Given operation "GetStaticAnalysisTreeSitterWasm" enabled
     And new "GetStaticAnalysisTreeSitterWasm" request
@@ -2677,7 +2677,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 BLOB with the content of the WASM file
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get tree-sitter WASM file returns "Bad Request" response
     Given operation "GetStaticAnalysisTreeSitterWasm" enabled
     And new "GetStaticAnalysisTreeSitterWasm" request
@@ -2685,7 +2685,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: Import security vulnerabilities returns "Bad Request" response
     Given operation "ImportSecurityVulnerabilities" enabled
     And new "ImportSecurityVulnerabilities" request
@@ -2693,7 +2693,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: Import security vulnerabilities returns "Vulnerabilities accepted successfully." response
     Given operation "ImportSecurityVulnerabilities" enabled
     And new "ImportSecurityVulnerabilities" request
@@ -2701,7 +2701,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Vulnerabilities accepted successfully.
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List assets SBOMs returns "Bad request: Invalid pagination token." response
     Given new "ListAssetsSBOMs" request
     And request contains "page[token]" parameter with value "SERVICE:unknown"
@@ -2709,19 +2709,19 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad request: Invalid pagination token.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List assets SBOMs returns "Bad request: The server cannot process the request due to invalid syntax in the request." response
     Given new "ListAssetsSBOMs" request
     When the request is sent
     Then the response status is 400 Bad request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List assets SBOMs returns "Not found: asset not found" response
     Given new "ListAssetsSBOMs" request
     When the request is sent
     Then the response status is 404 Not found: asset not found
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List assets SBOMs returns "OK" response
     Given new "ListAssetsSBOMs" request
     And request contains "filter[package_name]" parameter with value "pandas"
@@ -2729,56 +2729,56 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List codegen rulesets returns "Bad Request" response
     Given operation "ListStaticAnalysisCodegenRulesets" enabled
     And new "ListStaticAnalysisCodegenRulesets" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List codegen rulesets returns "OK" response
     Given operation "ListStaticAnalysisCodegenRulesets" enabled
     And new "ListStaticAnalysisCodegenRulesets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List datasets returns "Bad Request" response
     Given operation "ListSecurityMonitoringDatasets" enabled
     And new "ListSecurityMonitoringDatasets" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List datasets returns "OK" response
     Given operation "ListSecurityMonitoringDatasets" enabled
     And new "ListSecurityMonitoringDatasets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List entity context sync configurations returns "OK" response
     Given operation "ListSecurityMonitoringIntegrationConfigs" enabled
     And new "ListSecurityMonitoringIntegrationConfigs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: List findings returns "Bad Request: The server cannot process the request due to invalid syntax in the request." response
     Given operation "ListFindings" enabled
     And new "ListFindings" request
     When the request is sent
     Then the response status is 400 Bad Request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: List findings returns "Not Found: The requested finding cannot be found." response
     Given operation "ListFindings" enabled
     And new "ListFindings" request
     When the request is sent
     Then the response status is 404 Not Found: The requested finding cannot be found.
 
-  @replay-only @team:DataDog/cloud-security-posture-management
+  @replay-only @team:ddoghq/cloud-security-posture-management
   Scenario: List findings returns "OK" response
     Given operation "ListFindings" enabled
     And new "ListFindings" request
@@ -2786,7 +2786,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "finding"
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: List findings returns "OK" response with details
     Given operation "ListFindings" enabled
     And new "ListFindings" request
@@ -2794,14 +2794,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-security-posture-management @with-pagination
+  @generated @skip @team:ddoghq/cloud-security-posture-management @with-pagination
   Scenario: List findings returns "OK" response with pagination
     Given operation "ListFindings" enabled
     And new "ListFindings" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @skip-terraform-config @team:DataDog/cloud-security-posture-management
+  @skip-terraform-config @team:ddoghq/cloud-security-posture-management
   Scenario: List findings with detection_type query param returns "OK" response
     Given operation "ListFindings" enabled
     And new "ListFindings" request
@@ -2809,42 +2809,42 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List hist signals returns "Bad Request" response
     Given operation "ListSecurityMonitoringHistsignals" enabled
     And new "ListSecurityMonitoringHistsignals" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List hist signals returns "Not Found" response
     Given operation "ListSecurityMonitoringHistsignals" enabled
     And new "ListSecurityMonitoringHistsignals" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List hist signals returns "OK" response
     Given operation "ListSecurityMonitoringHistsignals" enabled
     And new "ListSecurityMonitoringHistsignals" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List historical jobs returns "Bad Request" response
     Given operation "ListHistoricalJobs" enabled
     And new "ListHistoricalJobs" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List historical jobs returns "OK" response
     Given operation "ListHistoricalJobs" enabled
     And new "ListHistoricalJobs" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: List indicators of compromise returns "Bad Request" response
     Given operation "ListIndicatorsOfCompromise" enabled
     And new "ListIndicatorsOfCompromise" request
@@ -2852,7 +2852,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-terraform-config @team:DataDog/cloud-siem
+  @replay-only @skip-terraform-config @team:ddoghq/cloud-siem
   Scenario: List indicators of compromise returns "OK" response
     Given operation "ListIndicatorsOfCompromise" enabled
     And new "ListIndicatorsOfCompromise" request
@@ -2860,14 +2860,14 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: List resource filters returns "Bad Request" response
     Given new "GetResourceEvaluationFilters" request
     And request contains "account_id" parameter with value "123456789"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: List resource filters returns "OK" response
     Given new "GetResourceEvaluationFilters" request
     And request contains "cloud_provider" parameter with value "aws"
@@ -2875,19 +2875,19 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: List rules returns "Bad Request" response
     Given new "ListSecurityMonitoringRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: List rules returns "OK" response
     Given new "ListSecurityMonitoringRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List scanned assets metadata returns "Bad request: Invalid Pagination Token" response
     Given operation "ListScannedAssetsMetadata" enabled
     And new "ListScannedAssetsMetadata" request
@@ -2896,41 +2896,41 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad request: Invalid pagination token.
 
-  @skip @team:DataDog/k9-cloud-vm
+  @skip @team:ddoghq/k9-cloud-vm
   Scenario: List scanned assets metadata returns "Bad request: The server cannot process the request due to invalid syntax in the request." response
     Given operation "ListScannedAssetsMetadata" enabled
     And new "ListScannedAssetsMetadata" request
     When the request is sent
     Then the response status is 400 Bad request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List scanned assets metadata returns "Not found: asset not found" response
     Given operation "ListScannedAssetsMetadata" enabled
     And new "ListScannedAssetsMetadata" request
     When the request is sent
     Then the response status is 404 Not found: asset not found
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List scanned assets metadata returns "OK" response
     Given operation "ListScannedAssetsMetadata" enabled
     And new "ListScannedAssetsMetadata" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform
   Scenario: List security findings returns "Bad Request" response
     Given new "ListSecurityFindings" request
     And request contains "page[cursor]" parameter with value "invalid_cursor"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform
   Scenario: List security findings returns "OK" response
     Given new "ListSecurityFindings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform
   Scenario: List security findings returns "OK" response with pagination
     Given new "ListSecurityFindings" request
     And request contains "page[limit]" parameter with value 5
@@ -2940,7 +2940,7 @@ Feature: Security Monitoring
     And the response "meta.page" has field "after"
     And the response "links" has field "next"
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerabilities returns "Bad request: Invalid pagination token." response
     Given operation "ListVulnerabilities" enabled
     And new "ListVulnerabilities" request
@@ -2949,21 +2949,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad request: Invalid pagination token.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerabilities returns "Bad request: The server cannot process the request due to invalid syntax in the request." response
     Given operation "ListVulnerabilities" enabled
     And new "ListVulnerabilities" request
     When the request is sent
     Then the response status is 400 Bad request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerabilities returns "Not found: There is no request associated with the provided token." response
     Given operation "ListVulnerabilities" enabled
     And new "ListVulnerabilities" request
     When the request is sent
     Then the response status is 404 Not found: There is no request associated with the provided token.
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerabilities returns "OK" response
     Given operation "ListVulnerabilities" enabled
     And new "ListVulnerabilities" request
@@ -2973,7 +2973,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerable assets returns "Bad request: Invalid Pagination Token" response
     Given operation "ListVulnerableAssets" enabled
     And new "ListVulnerableAssets" request
@@ -2982,21 +2982,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad request: Invalid pagination token.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerable assets returns "Bad request: The server cannot process the request due to invalid syntax in the request." response
     Given operation "ListVulnerableAssets" enabled
     And new "ListVulnerableAssets" request
     When the request is sent
     Then the response status is 400 Bad request: The server cannot process the request due to invalid syntax in the request.
 
-  @generated @skip @team:DataDog/k9-cloud-vm
+  @generated @skip @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerable assets returns "Not found: There is no request associated with the provided token." response
     Given operation "ListVulnerableAssets" enabled
     And new "ListVulnerableAssets" request
     When the request is sent
     Then the response status is 404 Not found: There is no request associated with the provided token.
 
-  @team:DataDog/k9-cloud-vm
+  @team:ddoghq/k9-cloud-vm
   Scenario: List vulnerable assets returns "OK" response
     Given operation "ListVulnerableAssets" enabled
     And new "ListVulnerableAssets" request
@@ -3006,7 +3006,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "Bad Request" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -3014,7 +3014,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "Not Found" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -3022,7 +3022,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Modify the triage assignee of a security signal returns "OK" response
     Given new "EditSecurityMonitoringSignalAssignee" request
     And request contains "signal_id" parameter with value "AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE"
@@ -3030,56 +3030,56 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Mute or unmute security findings returns "Accepted" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "PENDING_FIX"}}, "id": "00000000-0000-0000-0000-000000000001", "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Mute or unmute security findings returns "Bad Request" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "PENDING_FIX"}}, "id": "00000000-0000-0000-0000-000000000001", "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Mute or unmute security findings returns "Not Found" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "PENDING_FIX"}}, "id": "00000000-0000-0000-0000-000000000001", "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-investigation
+  @generated @skip @team:ddoghq/k9-investigation
   Scenario: Mute or unmute security findings returns "Unprocessable Entity" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "PENDING_FIX"}}, "id": "00000000-0000-0000-0000-000000000001", "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Mute security findings returns "Accepted" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "RISK_ACCEPTED"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwMC0wYmd-MDE4NjcyMDJkMzE4MDE5ODY5MGE4ZmQ2MmFlMjg0Y2M=", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 202 Accepted
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Mute security findings returns "Not Found" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1778721573794, "is_muted": true, "reason": "RISK_ACCEPTED"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Mute security findings returns "Unprocessable Entity" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "To be resolved later.", "expire_at": 1, "is_muted": true, "reason": "RISK_ACCEPTED"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a signal-based notification rule returns "Bad Request" response
     Given new "PatchSignalNotificationRule" request
     And there is a valid "valid_signal_notification_rule" in the system
@@ -3088,7 +3088,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a signal-based notification rule returns "Not Found" response
     Given new "PatchSignalNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
@@ -3096,7 +3096,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a signal-based notification rule returns "Notification rule successfully patched." response
     Given new "PatchSignalNotificationRule" request
     And there is a valid "valid_signal_notification_rule" in the system
@@ -3105,7 +3105,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Notification rule successfully patched.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a signal-based notification rule returns "The server cannot process the request because it contains invalid data." response
     Given new "PatchSignalNotificationRule" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -3113,7 +3113,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a vulnerability-based notification rule returns "Bad Request" response
     Given new "PatchVulnerabilityNotificationRule" request
     And there is a valid "valid_vulnerability_notification_rule" in the system
@@ -3122,7 +3122,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a vulnerability-based notification rule returns "Not Found" response
     Given new "PatchVulnerabilityNotificationRule" request
     And request contains "id" parameter with value "000-000-000"
@@ -3130,7 +3130,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-security-posture-management
+  @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a vulnerability-based notification rule returns "Notification rule successfully patched." response
     Given new "PatchVulnerabilityNotificationRule" request
     And there is a valid "valid_vulnerability_notification_rule" in the system
@@ -3139,7 +3139,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Notification rule successfully patched.
 
-  @generated @skip @team:DataDog/cloud-security-posture-management
+  @generated @skip @team:ddoghq/cloud-security-posture-management
   Scenario: Patch a vulnerability-based notification rule returns "The server cannot process the request because it contains invalid data." response
     Given new "PatchVulnerabilityNotificationRule" request
     And request contains "id" parameter from "REPLACE.ME"
@@ -3147,7 +3147,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder due date rules returns "Bad Request" response
     Given operation "ReorderSecurityFindingsAutomationDueDateRules" enabled
     And new "ReorderSecurityFindingsAutomationDueDateRules" request
@@ -3155,7 +3155,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Reorder due date rules returns "Successfully reordered the due date rules" response
     Given operation "ReorderSecurityFindingsAutomationDueDateRules" enabled
     And there is a valid "valid_due_date_rule" in the system
@@ -3164,7 +3164,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully reordered the due date rules
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder due date rules returns "Unprocessable Entity" response
     Given operation "ReorderSecurityFindingsAutomationDueDateRules" enabled
     And new "ReorderSecurityFindingsAutomationDueDateRules" request
@@ -3172,7 +3172,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder inbox rules returns "Bad Request" response
     Given operation "ReorderSecurityFindingsAutomationInboxRules" enabled
     And new "ReorderSecurityFindingsAutomationInboxRules" request
@@ -3180,7 +3180,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Reorder inbox rules returns "Successfully reordered the inbox rules" response
     Given operation "ReorderSecurityFindingsAutomationInboxRules" enabled
     And there is a valid "valid_inbox_rule" in the system
@@ -3189,7 +3189,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully reordered the inbox rules
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder inbox rules returns "Unprocessable Entity" response
     Given operation "ReorderSecurityFindingsAutomationInboxRules" enabled
     And new "ReorderSecurityFindingsAutomationInboxRules" request
@@ -3197,7 +3197,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder mute rules returns "Bad Request" response
     Given operation "ReorderSecurityFindingsAutomationMuteRules" enabled
     And new "ReorderSecurityFindingsAutomationMuteRules" request
@@ -3205,7 +3205,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Reorder mute rules returns "Successfully reordered the mute rules" response
     Given operation "ReorderSecurityFindingsAutomationMuteRules" enabled
     And there is a valid "valid_mute_rule" in the system
@@ -3214,7 +3214,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully reordered the mute rules
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder mute rules returns "Unprocessable Entity" response
     Given operation "ReorderSecurityFindingsAutomationMuteRules" enabled
     And new "ReorderSecurityFindingsAutomationMuteRules" request
@@ -3222,7 +3222,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder severity modifier rules returns "Bad Request" response
     Given operation "ReorderSecurityFindingsAutomationSeverityModifierRules" enabled
     And new "ReorderSecurityFindingsAutomationSeverityModifierRules" request
@@ -3230,7 +3230,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Reorder severity modifier rules returns "Successfully reordered the severity modifier rules" response
     Given operation "ReorderSecurityFindingsAutomationSeverityModifierRules" enabled
     And there is a valid "valid_severity_modifier_rule" in the system
@@ -3239,7 +3239,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully reordered the severity modifier rules
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder severity modifier rules returns "Unprocessable Entity" response
     Given operation "ReorderSecurityFindingsAutomationSeverityModifierRules" enabled
     And new "ReorderSecurityFindingsAutomationSeverityModifierRules" request
@@ -3247,7 +3247,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder ticket creation rules returns "Bad Request" response
     Given operation "ReorderSecurityFindingsAutomationTicketCreationRules" enabled
     And new "ReorderSecurityFindingsAutomationTicketCreationRules" request
@@ -3255,7 +3255,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Reorder ticket creation rules returns "Successfully reordered the ticket creation rules" response
     Given operation "ReorderSecurityFindingsAutomationTicketCreationRules" enabled
     And there is a valid "valid_ticket_creation_rule" in the system
@@ -3264,7 +3264,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully reordered the ticket creation rules
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Reorder ticket creation rules returns "Unprocessable Entity" response
     Given operation "ReorderSecurityFindingsAutomationTicketCreationRules" enabled
     And new "ReorderSecurityFindingsAutomationTicketCreationRules" request
@@ -3272,7 +3272,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Restore a rule to a historical version returns "Bad Request" response
     Given operation "RestoreSecurityMonitoringRule" enabled
     And new "RestoreSecurityMonitoringRule" request
@@ -3281,7 +3281,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Restore a rule to a historical version returns "Conflict" response
     Given operation "RestoreSecurityMonitoringRule" enabled
     And there is a valid "security_rule" in the system
@@ -3292,7 +3292,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Restore a rule to a historical version returns "Not Found" response
     Given operation "RestoreSecurityMonitoringRule" enabled
     And there is a valid "security_rule" in the system
@@ -3302,7 +3302,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Restore a rule to a historical version returns "OK" response
     Given operation "RestoreSecurityMonitoringRule" enabled
     And there is a valid "security_rule" in the system
@@ -3314,14 +3314,14 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "id" has the same value as "security_rule.id"
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Returns a list of Secrets rules returns "OK" response
     Given operation "GetSecretsRules" enabled
     And new "GetSecretsRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Ruleset get multiple returns "OK" response
     Given operation "ListMultipleRulesets" enabled
     And new "ListMultipleRulesets" request
@@ -3329,7 +3329,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Run a historical job returns "Bad Request" response
     Given operation "RunHistoricalJob" enabled
     And new "RunHistoricalJob" request
@@ -3337,7 +3337,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Run a historical job returns "Not Found" response
     Given operation "RunHistoricalJob" enabled
     And new "RunHistoricalJob" request
@@ -3345,7 +3345,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Run a historical job returns "Status created" response
     Given operation "RunHistoricalJob" enabled
     And new "RunHistoricalJob" request
@@ -3353,7 +3353,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 201 Status created
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Search hist signals returns "Bad Request" response
     Given operation "SearchSecurityMonitoringHistsignals" enabled
     And new "SearchSecurityMonitoringHistsignals" request
@@ -3361,7 +3361,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Search hist signals returns "Not Found" response
     Given operation "SearchSecurityMonitoringHistsignals" enabled
     And new "SearchSecurityMonitoringHistsignals" request
@@ -3369,7 +3369,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Search hist signals returns "OK" response
     Given operation "SearchSecurityMonitoringHistsignals" enabled
     And new "SearchSecurityMonitoringHistsignals" request
@@ -3377,21 +3377,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform
   Scenario: Search security findings returns "Bad Request" response
     Given new "SearchSecurityFindings" request
     And body with value {"page": {"cursor": "invalid_cursor"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform
   Scenario: Search security findings returns "OK" response
     Given new "SearchSecurityFindings" request
     And body with value {"data": {"attributes": {"filter": "@severity:(critical OR high)"}}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/cloud-security-posture-management @team:DataDog/k9-findings-platform @with-pagination
+  @team:ddoghq/cloud-security-posture-management @team:ddoghq/k9-findings-platform @with-pagination
   Scenario: Search security findings returns "OK" response with pagination
     Given new "SearchSecurityFindings" request
     And body with value {"data": {"attributes": {"filter": "@severity:(critical OR high)", "page": {"limit": 1}}}}
@@ -3401,7 +3401,7 @@ Feature: Security Monitoring
     And the response "meta.page" has field "after"
     And the response "links" has field "next"
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Subscribe to sample log generation returns "Bad Request" response
     Given operation "CreateSampleLogGenerationSubscription" enabled
     And new "CreateSampleLogGenerationSubscription" request
@@ -3409,7 +3409,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Subscribe to sample log generation returns "OK" response
     Given operation "CreateSampleLogGenerationSubscription" enabled
     And new "CreateSampleLogGenerationSubscription" request
@@ -3417,35 +3417,35 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Test a notification rule returns "Bad Request" response
     Given new "SendSecurityMonitoringNotificationPreview" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule 1", "routing": {"mode": "manual"}, "selectors": {"query": "(source:production_service OR env:prod)", "rule_types": ["misconfiguration", "attack_path"], "severities": ["critical"], "trigger_source": "security_findings"}, "targets": ["@john.doe@email.com"], "time_aggregation": 86400}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Test a notification rule returns "OK" response
     Given new "SendSecurityMonitoringNotificationPreview" request
     And body with value {"data": {"attributes": {"enabled": true, "name": "Rule 1", "selectors": {"query": "env:prod", "rule_types": ["log_detection"], "severities": ["critical"], "trigger_source": "security_signals"}, "targets": ["@john.doe@email.com"]}, "type": "notification_rules"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Test a rule returns "Bad Request" response
     Given new "TestSecurityMonitoringRule" request
     And body with value {"rule": {"cases": [], "filters": [{"action": "require"}], "hasExtendedTitle": true, "isEnabled": true, "message": "", "name": "My security monitoring rule.", "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}, "thirdPartyRuleOptions": {"defaultNotifications": [], "defaultStatus": "critical", "rootQueries": [{"groupByFields": [], "query": "source:cloudtrail"}]}}, "queries": [], "tags": ["env:prod", "team:security"], "thirdPartyCases": [], "type": "application_security"}, "ruleQueryPayloads": [{"expectedResult": true, "index": 0, "payload": {"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Test a rule returns "Not Found" response
     Given new "TestSecurityMonitoringRule" request
     And body with value {"rule": {"cases": [], "filters": [{"action": "require"}], "hasExtendedTitle": true, "isEnabled": true, "message": "", "name": "My security monitoring rule.", "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}, "thirdPartyRuleOptions": {"defaultNotifications": [], "defaultStatus": "critical", "rootQueries": [{"groupByFields": [], "query": "source:cloudtrail"}]}}, "queries": [], "tags": ["env:prod", "team:security"], "thirdPartyCases": [], "type": "application_security"}, "ruleQueryPayloads": [{"expectedResult": true, "index": 0, "payload": {"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-go @skip-java @skip-ruby @skip-typescript @team:DataDog/cloud-siem
+  @skip-go @skip-java @skip-ruby @skip-typescript @team:ddoghq/cloud-siem
   Scenario: Test a rule returns "OK" response
     Given new "TestSecurityMonitoringRule" request
     And body with value {"rule": {"cases": [{"name": "","status": "info","notifications": [],"condition": "a > 0"}],"hasExtendedTitle": true,"isEnabled": true,"message": "My security monitoring rule message.","name": "My security monitoring rule.","options": {"decreaseCriticalityBasedOnEnv": false,"detectionMethod": "threshold","evaluationWindow": 0,"keepAlive": 0,"maxSignalDuration": 0},"queries": [{"query": "source:source_here","groupByFields": ["@userIdentity.assumed_role"],"distinctFields": [],"aggregation": "count","name": ""}],"tags": ["env:prod", "team:security"],"type": "log_detection"}, "ruleQueryPayloads": [{"expectedResult": true,"index": 0,"payload": {"ddsource": "source_here","ddtags": "env:staging,version:5.1","hostname": "i-012345678","message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World","service": "payment","userIdentity": {"assumed_role" : "fake assumed_role"}}}]}
@@ -3453,7 +3453,7 @@ Feature: Security Monitoring
     Then the response status is 200 OK
     And the response "results[0]" is equal to true
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Test an existing rule returns "Bad Request" response
     Given new "TestExistingSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -3461,7 +3461,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Test an existing rule returns "Not Found" response
     Given new "TestExistingSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -3469,7 +3469,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Test an existing rule returns "OK" response
     Given new "TestExistingSecurityMonitoringRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -3477,28 +3477,28 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Unmute security findings returns "Accepted" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "Resolved.", "is_muted": false, "reason": "NO_PENDING_FIX"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwMC0wYmd-MDE4NjcyMDJkMzE4MDE5ODY5MGE4ZmQ2MmFlMjg0Y2M=", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 202 Accepted
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Unmute security findings returns "Not Found" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "Resolved.", "is_muted": false, "reason": "NO_PENDING_FIX"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-investigation
+  @team:ddoghq/k9-investigation
   Scenario: Unmute security findings returns "Unprocessable Entity" response
     Given new "MuteSecurityFindings" request
     And body with value {"data": {"attributes": {"mute": {"description": "Resolved.", "is_muted": false, "reason": "RISK_ACCEPTED"}}, "relationships": {"findings": {"data": [{"id": "ZGVmLTAwcC1pZXJ-aS0wZjhjNjMyZDNmMzRlZTgzNw==", "type": "findings"}]}}, "type": "mute"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Unsubscribe from sample log generation returns "Bad Request" response
     Given operation "DeleteSampleLogGenerationSubscription" enabled
     And new "DeleteSampleLogGenerationSubscription" request
@@ -3506,7 +3506,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Unsubscribe from sample log generation returns "OK" response
     Given operation "DeleteSampleLogGenerationSubscription" enabled
     And new "DeleteSampleLogGenerationSubscription" request
@@ -3514,7 +3514,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Update a cloud configuration rule's details returns "OK" response
     Given new "UpdateSecurityMonitoringRule" request
     And there is a valid "cloud_configuration_rule" in the system
@@ -3525,7 +3525,7 @@ Feature: Security Monitoring
     And the response "name" is equal to "{{ unique }}_cloud_updated"
     And the response "id" has the same value as "cloud_configuration_rule.id"
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Update a critical asset returns "Bad Request" response
     Given new "UpdateSecurityMonitoringCriticalAsset" request
     And request contains "critical_asset_id" parameter with value "00000000-0000-0000-0000-000000000000"
@@ -3533,7 +3533,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a critical asset returns "Concurrent Modification" response
     Given new "UpdateSecurityMonitoringCriticalAsset" request
     And request contains "critical_asset_id" parameter from "REPLACE.ME"
@@ -3541,7 +3541,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update a critical asset returns "Not Found" response
     Given new "UpdateSecurityMonitoringCriticalAsset" request
     And request contains "critical_asset_id" parameter with value "00000000-0000-0000-0000-000000000001"
@@ -3549,7 +3549,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Update a critical asset returns "OK" response
     Given new "UpdateSecurityMonitoringCriticalAsset" request
     And there is a valid "critical_asset" in the system
@@ -3562,7 +3562,7 @@ Feature: Security Monitoring
     And the response "data.attributes.enabled" is equal to false
     And the response "data.attributes.version" is equal to 2
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update a custom framework returns "Bad Request" response
     Given new "UpdateCustomFramework" request
     And request contains "handle" parameter with value "create-framework-new"
@@ -3571,7 +3571,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/cloud-siem
+  @replay-only @team:ddoghq/cloud-siem
   Scenario: Update a custom framework returns "OK" response
     Given there is a valid "custom_framework" in the system
     And new "UpdateCustomFramework" request
@@ -3581,7 +3581,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a dataset returns "Bad Request" response
     Given operation "UpdateSecurityMonitoringDataset" enabled
     And new "UpdateSecurityMonitoringDataset" request
@@ -3590,7 +3590,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a dataset returns "Conflict" response
     Given operation "UpdateSecurityMonitoringDataset" enabled
     And new "UpdateSecurityMonitoringDataset" request
@@ -3599,7 +3599,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a dataset returns "No Content" response
     Given operation "UpdateSecurityMonitoringDataset" enabled
     And new "UpdateSecurityMonitoringDataset" request
@@ -3608,7 +3608,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a dataset returns "Not Found" response
     Given operation "UpdateSecurityMonitoringDataset" enabled
     And new "UpdateSecurityMonitoringDataset" request
@@ -3617,7 +3617,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a due date rule returns "Bad Request" response
     Given operation "UpdateSecurityFindingsAutomationDueDateRule" enabled
     And new "UpdateSecurityFindingsAutomationDueDateRule" request
@@ -3626,7 +3626,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a due date rule returns "Not Found" response
     Given operation "UpdateSecurityFindingsAutomationDueDateRule" enabled
     And new "UpdateSecurityFindingsAutomationDueDateRule" request
@@ -3635,7 +3635,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Update a due date rule returns "Successfully updated the due date rule" response
     Given operation "UpdateSecurityFindingsAutomationDueDateRule" enabled
     And there is a valid "valid_due_date_rule" in the system
@@ -3647,7 +3647,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_due_date_rule.data.id }}"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a due date rule returns "Unprocessable Entity" response
     Given operation "UpdateSecurityFindingsAutomationDueDateRule" enabled
     And new "UpdateSecurityFindingsAutomationDueDateRule" request
@@ -3656,7 +3656,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a mute rule returns "Bad Request" response
     Given operation "UpdateSecurityFindingsAutomationMuteRule" enabled
     And new "UpdateSecurityFindingsAutomationMuteRule" request
@@ -3665,7 +3665,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a mute rule returns "Not Found" response
     Given operation "UpdateSecurityFindingsAutomationMuteRule" enabled
     And new "UpdateSecurityFindingsAutomationMuteRule" request
@@ -3674,7 +3674,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Update a mute rule returns "Successfully updated the mute rule" response
     Given operation "UpdateSecurityFindingsAutomationMuteRule" enabled
     And there is a valid "valid_mute_rule" in the system
@@ -3686,7 +3686,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_mute_rule.data.id }}"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a mute rule returns "Unprocessable Entity" response
     Given operation "UpdateSecurityFindingsAutomationMuteRule" enabled
     And new "UpdateSecurityFindingsAutomationMuteRule" request
@@ -3695,7 +3695,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a security filter returns "Bad Request" response
     Given new "UpdateSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
@@ -3703,7 +3703,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a security filter returns "Concurrent Modification" response
     Given new "UpdateSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
@@ -3711,7 +3711,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a security filter returns "Not Found" response
     Given new "UpdateSecurityFilter" request
     And request contains "security_filter_id" parameter from "REPLACE.ME"
@@ -3719,7 +3719,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update a security filter returns "OK" response
     Given new "UpdateSecurityFilter" request
     And there is a valid "security_filter" in the system
@@ -3731,7 +3731,7 @@ Feature: Security Monitoring
     And the response "data.attributes.filtered_data_type" is equal to "logs"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a severity modifier rule returns "Bad Request" response
     Given operation "UpdateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "UpdateSecurityFindingsAutomationSeverityModifierRule" request
@@ -3740,7 +3740,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a severity modifier rule returns "Not Found" response
     Given operation "UpdateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "UpdateSecurityFindingsAutomationSeverityModifierRule" request
@@ -3749,7 +3749,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Update a severity modifier rule returns "Successfully updated the severity modifier rule" response
     Given operation "UpdateSecurityFindingsAutomationSeverityModifierRule" enabled
     And there is a valid "valid_severity_modifier_rule" in the system
@@ -3759,7 +3759,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 Successfully updated the severity modifier rule
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a severity modifier rule returns "Unprocessable Entity" response
     Given operation "UpdateSecurityFindingsAutomationSeverityModifierRule" enabled
     And new "UpdateSecurityFindingsAutomationSeverityModifierRule" request
@@ -3768,7 +3768,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a suppression rule returns "Bad Request" response
     Given new "UpdateSecurityMonitoringSuppression" request
     And request contains "suppression_id" parameter from "REPLACE.ME"
@@ -3776,7 +3776,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a suppression rule returns "Concurrent Modification" response
     Given new "UpdateSecurityMonitoringSuppression" request
     And request contains "suppression_id" parameter from "REPLACE.ME"
@@ -3784,7 +3784,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 409 Concurrent Modification
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update a suppression rule returns "Not Found" response
     Given new "UpdateSecurityMonitoringSuppression" request
     And request contains "suppression_id" parameter from "REPLACE.ME"
@@ -3792,7 +3792,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Update a suppression rule returns "OK" response
     Given new "UpdateSecurityMonitoringSuppression" request
     And there is a valid "suppression" in the system
@@ -3804,7 +3804,7 @@ Feature: Security Monitoring
     And the response "data.attributes.suppression_query" is equal to "env:staging status:low"
     And the response "data.attributes.version" is equal to 2
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a ticket creation rule returns "Bad Request" response
     Given operation "UpdateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "UpdateSecurityFindingsAutomationTicketCreationRule" request
@@ -3813,7 +3813,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a ticket creation rule returns "Not Found" response
     Given operation "UpdateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "UpdateSecurityFindingsAutomationTicketCreationRule" request
@@ -3822,7 +3822,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Update a ticket creation rule returns "Successfully updated the ticket creation rule" response
     Given operation "UpdateSecurityFindingsAutomationTicketCreationRule" enabled
     And there is a valid "valid_ticket_creation_rule" in the system
@@ -3834,7 +3834,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_ticket_creation_rule.data.id }}"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update a ticket creation rule returns "Unprocessable Entity" response
     Given operation "UpdateSecurityFindingsAutomationTicketCreationRule" enabled
     And new "UpdateSecurityFindingsAutomationTicketCreationRule" request
@@ -3843,7 +3843,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update an entity context sync configuration returns "Bad Request" response
     Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
     And new "UpdateSecurityMonitoringIntegrationConfig" request
@@ -3852,7 +3852,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update an entity context sync configuration returns "Not Found" response
     Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
     And new "UpdateSecurityMonitoringIntegrationConfig" request
@@ -3861,7 +3861,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Update an entity context sync configuration returns "OK" response
     Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
     And new "UpdateSecurityMonitoringIntegrationConfig" request
@@ -3870,7 +3870,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Update an existing rule returns "Bad Request" response
     Given new "UpdateSecurityMonitoringRule" request
     And there is a valid "security_rule" in the system
@@ -3879,7 +3879,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update an existing rule returns "Not Found" response
     Given new "UpdateSecurityMonitoringRule" request
     And request contains "rule_id" parameter with value "abcde-12345"
@@ -3887,7 +3887,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-validation @team:DataDog/cloud-siem
+  @skip-validation @team:ddoghq/cloud-siem
   Scenario: Update an existing rule returns "OK" response
     Given new "UpdateSecurityMonitoringRule" request
     And there is a valid "security_rule" in the system
@@ -3898,7 +3898,7 @@ Feature: Security Monitoring
     And the response "name" is equal to "{{ unique }}-Updated"
     And the response "id" has the same value as "security_rule.id"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update an inbox rule returns "Bad Request" response
     Given operation "UpdateSecurityFindingsAutomationInboxRule" enabled
     And new "UpdateSecurityFindingsAutomationInboxRule" request
@@ -3907,7 +3907,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update an inbox rule returns "Not Found" response
     Given operation "UpdateSecurityFindingsAutomationInboxRule" enabled
     And new "UpdateSecurityFindingsAutomationInboxRule" request
@@ -3916,7 +3916,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/k9-automation
+  @team:ddoghq/k9-automation
   Scenario: Update an inbox rule returns "Successfully updated the inbox rule" response
     Given operation "UpdateSecurityFindingsAutomationInboxRule" enabled
     And there is a valid "valid_inbox_rule" in the system
@@ -3928,7 +3928,7 @@ Feature: Security Monitoring
     And the response "data.id" is equal to "{{ valid_inbox_rule.data.id }}"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/k9-automation
+  @generated @skip @team:ddoghq/k9-automation
   Scenario: Update an inbox rule returns "Unprocessable Entity" response
     Given operation "UpdateSecurityFindingsAutomationInboxRule" enabled
     And new "UpdateSecurityFindingsAutomationInboxRule" request
@@ -3937,21 +3937,21 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update resource filters returns "Bad Request" response
     Given new "UpdateResourceEvaluationFilters" request
     And body with value {"data": {"attributes": {"cloud_provider": {"invalid": {"aws_account_id": ["tag1:v1"]}}}, "id": "csm_resource_filter", "type": "csm_resource_filter"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Update resource filters returns "OK" response
     Given new "UpdateResourceEvaluationFilters" request
     And body with value {"data": {"attributes": {"cloud_provider": {"aws": {"aws_account_id": ["tag1:v1"]}}}, "id": "csm_resource_filter", "type": "csm_resource_filter"}}
     When the request is sent
     Then the response status is 201 OK
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Update security signal triage state or assignee returns "Bad Request" response
     Given new "EditSecurityMonitoringSignal" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -3959,7 +3959,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Update security signal triage state or assignee returns "Not Found" response
     Given new "EditSecurityMonitoringSignal" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -3967,7 +3967,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/cloud-siem
+  @skip @team:ddoghq/cloud-siem
   Scenario: Update security signal triage state or assignee returns "OK" response
     Given new "EditSecurityMonitoringSignal" request
     And request contains "signal_id" parameter from "REPLACE.ME"
@@ -3975,49 +3975,49 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-typescript @skip-validation @team:DataDog/cloud-siem
+  @skip-go @skip-java @skip-python @skip-ruby @skip-rust @skip-typescript @skip-validation @team:ddoghq/cloud-siem
   Scenario: Validate a detection rule returns "Bad Request" response
     Given new "ValidateSecurityMonitoringRule" request
     And body with value {"cases":[{"name":"","status":"info","notifications":[],"condition":"a > 0"}],"hasExtendedTitle":true,"isEnabled":true,"message":"My security monitoring rule","name":"My security monitoring rule","options":{"evaluationWindow":1800,"keepAlive":999999,"maxSignalDuration":1800,"detectionMethod":"threshold"},"queries":[{"query":"source:source_here","groupByFields":["@userIdentity.assumed_role"],"distinctFields":[],"aggregation":"count","name":""}],"tags":["env:prod","team:security"],"type":"log_detection"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Validate a detection rule returns "OK" response
     Given new "ValidateSecurityMonitoringRule" request
     And body with value {"cases":[{"name":"","status":"info","notifications":[],"condition":"a > 0"}],"hasExtendedTitle":true,"isEnabled":true,"message":"My security monitoring rule","name":"My security monitoring rule","options":{"evaluationWindow":1800,"keepAlive":1800,"maxSignalDuration":1800,"detectionMethod":"threshold"},"queries":[{"query":"source:source_here","groupByFields":["@userIdentity.assumed_role"],"distinctFields":[],"aggregation":"count","name":""}],"tags":["env:prod","team:security"],"type":"log_detection"}
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Validate a detection rule with detection method 'new_value' with enabled feature 'instantaneousBaseline' returns "OK" response
     Given new "ValidateSecurityMonitoringRule" request
     And body with value {"cases":[{"name":"","status":"info","notifications":[]}],"hasExtendedTitle":true,"isEnabled":true,"message":"My security monitoring rule","name":"My security monitoring rule","options":{"evaluationWindow":0,"keepAlive":300,"maxSignalDuration":600,"detectionMethod":"new_value","newValueOptions":{"forgetAfter":7,"instantaneousBaseline":true,"learningDuration":1,"learningThreshold":0,"learningMethod":"duration"}},"queries":[{"query":"source:source_here","groupByFields":["@userIdentity.assumed_role"],"distinctFields":[],"metric":"name","metrics":["name"],"aggregation":"new_value","name":"","dataSource":"logs"}],"tags":["env:prod","team:security"],"type":"log_detection"}
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Validate a detection rule with detection method 'sequence_detection' returns "OK" response
     Given new "ValidateSecurityMonitoringRule" request
     And body with value {"cases":[{"name":"","status":"info","notifications":[],"condition":"step_b > 0"}],"hasExtendedTitle":true,"isEnabled":true,"message":"My security monitoring rule","name":"My security monitoring rule","options":{"evaluationWindow":0,"keepAlive":300,"maxSignalDuration":600,"detectionMethod":"sequence_detection","sequenceDetectionOptions":{"stepTransitions":[{"child":"step_b","evaluationWindow":900,"parent":"step_a"}],"steps":[{"condition":"a > 0","evaluationWindow":60,"name":"step_a"},{"condition":"b > 0","evaluationWindow":60,"name":"step_b"}]}},"queries":[{"query":"source:source_here","groupByFields":["@userIdentity.assumed_role"],"distinctFields":[],"aggregation":"count","name":""},{"query":"source:source_here2","groupByFields":[],"distinctFields":[],"aggregation":"count","name":""}],"tags":["env:prod","team:security"],"type":"log_detection"}
     When the request is sent
     Then the response status is 204 OK
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Validate a suppression rule returns "Bad Request" response
     Given new "ValidateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"name" : "cold_harbour", "enabled": false, "rule_query":"rule:[A-Invalid", "data_exclusion_query": "not enough attributes"}, "type": "suppressions"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/cloud-siem
+  @team:ddoghq/cloud-siem
   Scenario: Validate a suppression rule returns "OK" response
     Given new "ValidateSecurityMonitoringSuppression" request
     And body with value {"data": {"attributes": {"data_exclusion_query": "source:cloudtrail account_id:12345", "description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "name": "Custom suppression", "rule_query": "type:log_detection source:cloudtrail"}, "type": "suppressions"}}
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Validate an entity context sync configuration returns "Bad Request" response
     Given operation "ValidateSecurityMonitoringIntegrationConfig" enabled
     And new "ValidateSecurityMonitoringIntegrationConfig" request
@@ -4025,7 +4025,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Validate an entity context sync configuration returns "Not Found" response
     Given operation "ValidateSecurityMonitoringIntegrationConfig" enabled
     And new "ValidateSecurityMonitoringIntegrationConfig" request
@@ -4033,7 +4033,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Validate an entity context sync configuration returns "OK" response
     Given operation "ValidateSecurityMonitoringIntegrationConfig" enabled
     And new "ValidateSecurityMonitoringIntegrationConfig" request
@@ -4041,7 +4041,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Validate entity context sync credentials returns "Bad Request" response
     Given operation "ValidateSecurityMonitoringIntegrationCredentials" enabled
     And new "ValidateSecurityMonitoringIntegrationCredentials" request
@@ -4049,7 +4049,7 @@ Feature: Security Monitoring
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Validate entity context sync credentials returns "OK" response
     Given operation "ValidateSecurityMonitoringIntegrationCredentials" enabled
     And new "ValidateSecurityMonitoringIntegrationCredentials" request
diff --git a/features/v2/sensitive_data_scanner.feature b/features/v2/sensitive_data_scanner.feature
index d439e16daa21..00415164c39b 100644
--- a/features/v2/sensitive_data_scanner.feature
+++ b/features/v2/sensitive_data_scanner.feature
@@ -10,14 +10,14 @@ Feature: Sensitive Data Scanner
     And a valid "appKeyAuth" key in the system
     And an instance of "SensitiveDataScanner" API
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Create Scanning Group returns "Bad Request" response
     Given new "CreateScanningGroup" request
     And body with value {"data": {"attributes": {"filter": {}, "product_list": ["logs"], "samplings": [{"product": "logs", "rate": 100.0}]}, "relationships": {"configuration": {"data": {"type": "sensitive_data_scanner_configuration"}}, "rules": {"data": [{"type": "sensitive_data_scanner_rule"}]}}, "type": "sensitive_data_scanner_group"}, "meta": {"version": 0}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Create Scanning Group returns "OK" response
     Given a valid "configuration" in the system
     And new "CreateScanningGroup" request
@@ -27,7 +27,7 @@ Feature: Sensitive Data Scanner
     And the response "data.type" is equal to "sensitive_data_scanner_group"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Create Scanning Rule returns "Bad Request" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -36,7 +36,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Create Scanning Rule returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -50,7 +50,7 @@ Feature: Sensitive Data Scanner
     And the response "data.attributes.included_keyword_configuration.character_count" is equal to 35
     And the response "data.attributes.included_keyword_configuration.keywords[0]" is equal to "credit card"
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Create Scanning Rule with should_save_match returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -61,7 +61,7 @@ Feature: Sensitive Data Scanner
     And the response "data.type" is equal to "sensitive_data_scanner_rule"
     And the response "data.attributes.name" is equal to "{{ unique }}"
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Group returns "Bad Request" response
     Given new "DeleteScanningGroup" request
     And request contains "group_id" parameter from "REPLACE.ME"
@@ -69,7 +69,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Group returns "Not Found" response
     Given new "DeleteScanningGroup" request
     And request contains "group_id" parameter from "REPLACE.ME"
@@ -77,7 +77,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Group returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -87,7 +87,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Rule returns "Bad Request" response
     Given new "DeleteScanningRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -95,7 +95,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Rule returns "Not Found" response
     Given new "DeleteScanningRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -103,7 +103,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Delete Scanning Rule returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -114,13 +114,13 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: List Scanning Groups returns "Bad Request" response
     Given new "ListScanningGroups" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: List Scanning Groups returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -129,19 +129,19 @@ Feature: Sensitive Data Scanner
     Then the response status is 200 OK
     And the response "included" has item with field "id" with value "{{ group.data.id }}"
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: List standard patterns returns "Bad Request" response
     Given new "ListStandardPatterns" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @team:DataDog/sensitive-data-scanner
+  @integration-only @team:ddoghq/sensitive-data-scanner
   Scenario: List standard patterns returns "OK" response
     Given new "ListStandardPatterns" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Reorder Groups returns "Bad Request" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -150,7 +150,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/sensitive-data-scanner
+  @replay-only @team:ddoghq/sensitive-data-scanner
   Scenario: Reorder Groups returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -160,7 +160,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Group returns "Bad Request" response
     Given new "UpdateScanningGroup" request
     And request contains "group_id" parameter from "REPLACE.ME"
@@ -168,7 +168,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Group returns "Not Found" response
     Given new "UpdateScanningGroup" request
     And request contains "group_id" parameter from "REPLACE.ME"
@@ -176,7 +176,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Group returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -186,7 +186,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Rule returns "Bad Request" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
@@ -197,7 +197,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/sensitive-data-scanner
+  @generated @skip @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Rule returns "Not Found" response
     Given new "UpdateScanningRule" request
     And request contains "rule_id" parameter from "REPLACE.ME"
@@ -205,7 +205,7 @@ Feature: Sensitive Data Scanner
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/sensitive-data-scanner
+  @team:ddoghq/sensitive-data-scanner
   Scenario: Update Scanning Rule returns "OK" response
     Given a valid "configuration" in the system
     And there is a valid "scanning_group" in the system
diff --git a/features/v2/service_accounts.feature b/features/v2/service_accounts.feature
index 732472417750..19d7d85dd85c 100644
--- a/features/v2/service_accounts.feature
+++ b/features/v2/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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an access token for a service account returns "Bad Request" response
     Given new "CreateServiceAccountAccessToken" 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
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Create an access token for a service account returns "Created" response
     Given there is a valid "service_account_user" in the system
     And new "CreateServiceAccountAccessToken" request
@@ -49,7 +49,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"
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Create an access token for a service account returns "Not Found" response
     Given new "CreateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -57,7 +57,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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -65,7 +65,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/credentials-management @team:DataDog/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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
@@ -76,7 +76,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/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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
@@ -88,7 +88,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/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -98,7 +98,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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -106,7 +106,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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -115,7 +115,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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -124,7 +124,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management @team:DataDog/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -138,7 +138,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
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Get an access token for a service account returns "Not Found" response
     Given new "GetServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -146,7 +146,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Get an access token for a service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_access_token" for "service_account_user"
@@ -159,7 +159,7 @@ Feature: Service Accounts
     And the response "data.type" is equal to "service_access_tokens"
     And the response "data.id" is equal to "{{ service_account_access_token.data.id }}"
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -167,7 +167,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/credentials-management @team:DataDog/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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"
@@ -180,21 +180,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
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: List access tokens for a service account returns "Bad Request" response
     Given new "ListServiceAccountAccessTokens" 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
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: List access tokens for a service account returns "Not Found" response
     Given new "ListServiceAccountAccessTokens" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: List access tokens for a service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And new "ListServiceAccountAccessTokens" request
@@ -203,21 +203,21 @@ Feature: Service Accounts
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/credentials-management @team:DataDog/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/credentials-management @team:ddoghq/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/org-management
+  @team:ddoghq/credentials-management @team:ddoghq/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
@@ -226,7 +226,7 @@ Feature: Service Accounts
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Revoke an access token for a service account returns "No Content" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_access_token" for "service_account_user"
@@ -236,7 +236,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Revoke an access token for a service account returns "Not Found" response
     Given new "RevokeServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -244,7 +244,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Update an access token for a service account returns "Bad Request" response
     Given new "UpdateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -253,7 +253,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/credentials-management
+  @generated @skip @team:ddoghq/credentials-management
   Scenario: Update an access token for a service account returns "Not Found" response
     Given new "UpdateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
@@ -262,7 +262,7 @@ Feature: Service Accounts
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/credentials-management
+  @skip-terraform-config @team:ddoghq/credentials-management
   Scenario: Update an access token for a service account returns "OK" response
     Given there is a valid "service_account_user" in the system
     And there is a valid "service_account_access_token" for "service_account_user"
diff --git a/features/v2/service_definition.feature b/features/v2/service_definition.feature
index a36431dc8289..52535225242b 100644
--- a/features/v2/service_definition.feature
+++ b/features/v2/service_definition.feature
@@ -11,28 +11,28 @@ Feature: Service Definition
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceDefinition" API
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update service definition returns "Bad Request" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"application": "my-app", "ci-pipeline-fingerprints": ["j88xdEy0J5lc", "eZ7LMljCk8vo"], "contacts": [{"contact": "https://teams.microsoft.com/myteam", "name": "My team channel", "type": "slack"}], "dd-service": "my-service", "description": "My service description", "extensions": {"myorg/extension": "extensionValue"}, "integrations": {"opsgenie": {"region": "US", "service-url": "https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"}, "pagerduty": {"service-url": "https://my-org.pagerduty.com/service-directory/PMyService"}}, "languages": ["dotnet", "go", "java", "js", "php", "python", "ruby", "c++"], "lifecycle": "sandbox", "links": [{"name": "Runbook", "provider": "Github", "type": "runbook", "url": "https://my-runbook"}], "schema-version": "v2.2", "tags": ["my:tag", "service:tag"], "team": "my-team", "tier": "High", "type": "web"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update service definition returns "CREATED" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"application": "my-app", "ci-pipeline-fingerprints": ["j88xdEy0J5lc", "eZ7LMljCk8vo"], "contacts": [{"contact": "https://teams.microsoft.com/myteam", "name": "My team channel", "type": "slack"}], "dd-service": "my-service", "description": "My service description", "extensions": {"myorg/extension": "extensionValue"}, "integrations": {"opsgenie": {"region": "US", "service-url": "https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"}, "pagerduty": {"service-url": "https://my-org.pagerduty.com/service-directory/PMyService"}}, "languages": ["dotnet", "go", "java", "js", "php", "python", "ruby", "c++"], "lifecycle": "sandbox", "links": [{"name": "Runbook", "provider": "Github", "type": "runbook", "url": "https://my-runbook"}], "schema-version": "v2.2", "tags": ["my:tag", "service:tag"], "team": "my-team", "tier": "High", "type": "web"}
     When the request is sent
     Then the response status is 200 CREATED
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update service definition returns "Conflict" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"application": "my-app", "ci-pipeline-fingerprints": ["j88xdEy0J5lc", "eZ7LMljCk8vo"], "contacts": [{"contact": "https://teams.microsoft.com/myteam", "name": "My team channel", "type": "slack"}], "dd-service": "my-service", "description": "My service description", "extensions": {"myorg/extension": "extensionValue"}, "integrations": {"opsgenie": {"region": "US", "service-url": "https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"}, "pagerduty": {"service-url": "https://my-org.pagerduty.com/service-directory/PMyService"}}, "languages": ["dotnet", "go", "java", "js", "php", "python", "ruby", "c++"], "lifecycle": "sandbox", "links": [{"name": "Runbook", "provider": "Github", "type": "runbook", "url": "https://my-runbook"}], "schema-version": "v2.2", "tags": ["my:tag", "service:tag"], "team": "my-team", "tier": "High", "type": "web"}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create or update service definition using schema v2 returns "CREATED" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"contacts": [{"contact": "contact@datadoghq.com", "name": "Team Email", "type": "email"}], "dd-service": "service-{{ unique_lower_alnum }}", "dd-team": "my-team", "docs": [{"name": "Architecture", "provider": "google drive", "url": "https://gdrive/mydoc"}], "extensions": {"myorgextension": "extensionvalue"}, "integrations": {"opsgenie": {"region": "US", "service-url": "https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"}, "pagerduty": "https://my-org.pagerduty.com/service-directory/PMyService"}, "links": [{"name": "Runbook", "type": "runbook", "url": "https://my-runbook"}], "repos": [{"name": "Source Code", "provider": "GitHub", "url": "https://github.com/DataDog/schema"}], "schema-version": "v2", "tags": ["my:tag", "service:tag"], "team": "my-team"}
@@ -41,7 +41,7 @@ Feature: Service Definition
     And the response "data[0].attributes.meta.ingested-schema-version" is equal to "v2"
     And the response "data[0].attributes.schema.dd-service" is equal to "service-{{ unique_lower_alnum }}"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create or update service definition using schema v2-1 returns "CREATED" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"contacts":[{"contact":"contact@datadoghq.com","name":"Team Email","type":"email"}],"dd-service":"service-{{ unique_lower_alnum }}","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source Code","type":"repo","provider":"GitHub","url":"https://github.com/DataDog/schema"},{"name":"Architecture","type":"doc","provider":"Gigoogle drivetHub","url":"https://my-runbook"}],"schema-version":"v2.1","tags":["my:tag","service:tag"],"team":"my-team"}
@@ -50,7 +50,7 @@ Feature: Service Definition
     And the response "data[0].attributes.meta.ingested-schema-version" is equal to "v2.1"
     And the response "data[0].attributes.schema.dd-service" is equal to "service-{{ unique_lower_alnum }}"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create or update service definition using schema v2-2 returns "CREATED" response
     Given new "CreateOrUpdateServiceDefinitions" request
     And body with value {"contacts":[{"contact":"contact@datadoghq.com","name":"Team Email","type":"email"}],"dd-service":"service-{{ unique_lower_alnum }}","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source Code","type":"repo","provider":"GitHub","url":"https://github.com/DataDog/schema"},{"name":"Architecture","type":"doc","provider":"Gigoogle drivetHub","url":"https://my-runbook"}],"schema-version":"v2.2","tags":["my:tag","service:tag"],"team":"my-team"}
@@ -59,14 +59,14 @@ Feature: Service Definition
     And the response "data[0].attributes.meta.ingested-schema-version" is equal to "v2.2"
     And the response "data[0].attributes.schema.dd-service" is equal to "service-{{ unique_lower_alnum }}"
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single service definition returns "Bad Request" response
     Given new "DeleteServiceDefinition" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Delete a single service definition returns "Not Found" response
     Given new "DeleteServiceDefinition" request
     And request contains "service_name" parameter with value "not-a-service"
@@ -74,28 +74,28 @@ Feature: Service Definition
     Then the response status is 404 Not Found
     And the response "errors[0]" is equal to "Not Found"
 
-  @replay-only @team:DataDog/idp
+  @replay-only @team:ddoghq/idp
   Scenario: Delete a single service definition returns "OK" response
     Given new "DeleteServiceDefinition" request
     And request contains "service_name" parameter with value "service-definition-test"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a single service definition returns "Bad Request" response
     Given new "GetServiceDefinition" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a single service definition returns "Conflict" response
     Given new "GetServiceDefinition" request
     And request contains "service_name" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Get a single service definition returns "Not Found" response
     Given new "GetServiceDefinition" request
     And request contains "service_name" parameter with value "not-a-service"
@@ -103,7 +103,7 @@ Feature: Service Definition
     Then the response status is 404 Not Found
     And the response "errors[0]" is equal to "Not Found"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Get a single service definition returns "OK" response
     Given new "GetServiceDefinition" request
     And request contains "service_name" parameter with value "service-definition-test"
@@ -114,7 +114,7 @@ Feature: Service Definition
     And the response "data.attributes.schema.schema-version" is equal to "v2.1"
     And the response "data.attributes.schema.dd-service" is equal to "service-definition-test"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Get all service definitions returns "OK" response
     Given new "ListServiceDefinitions" request
     And request contains "schema_version" parameter with value "v2.1"
@@ -123,7 +123,7 @@ Feature: Service Definition
     And the response "data[0].attributes.meta.ingestion-source" is equal to "api"
     And the response "data[0].attributes.schema.schema-version" is equal to "v2.1"
 
-  @replay-only @skip-validation @team:DataDog/idp @with-pagination
+  @replay-only @skip-validation @team:ddoghq/idp @with-pagination
   Scenario: Get all service definitions returns "OK" response with pagination
     Given new "ListServiceDefinitions" request
     And request contains "page[size]" parameter with value 2
diff --git a/features/v2/service_level_objectives.feature b/features/v2/service_level_objectives.feature
index 4dc11df9e57d..f2c1e32d059f 100644
--- a/features/v2/service_level_objectives.feature
+++ b/features/v2/service_level_objectives.feature
@@ -13,7 +13,7 @@ Feature: Service Level Objectives
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceLevelObjectives" API
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create a new SLO report returns "Bad Request" response
     Given operation "CreateSLOReportJob" enabled
     And new "CreateSLOReportJob" request
@@ -21,7 +21,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Create a new SLO report returns "OK" response
     Given operation "CreateSLOReportJob" enabled
     And new "CreateSLOReportJob" request
@@ -30,7 +30,7 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data.type" is equal to "report_id"
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get SLO report returns "Bad Request" response
     Given operation "GetSLOReport" enabled
     And new "GetSLOReport" request
@@ -38,7 +38,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get SLO report returns "Not Found" response
     Given operation "GetSLOReport" enabled
     And new "GetSLOReport" request
@@ -46,7 +46,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip @team:DataDog/slo-app
+  @skip @team:ddoghq/slo-app
   Scenario: Get SLO report returns "OK" response
     Given operation "GetSLOReport" enabled
     And new "GetSLOReport" request
@@ -54,7 +54,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get SLO report status returns "Bad Request" response
     Given operation "GetSLOReportJobStatus" enabled
     And new "GetSLOReportJobStatus" request
@@ -62,7 +62,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get SLO report status returns "Not Found" response
     Given operation "GetSLOReportJobStatus" enabled
     And new "GetSLOReportJobStatus" request
@@ -70,7 +70,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/slo-app
+  @team:ddoghq/slo-app
   Scenario: Get SLO report status returns "OK" response
     Given operation "GetSLOReportJobStatus" enabled
     And new "GetSLOReportJobStatus" request
@@ -80,7 +80,7 @@ Feature: Service Level Objectives
     Then the response status is 200 OK
     And the response "data.type" is equal to "report_id"
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get SLO status returns "Bad Request" response
     Given operation "GetSloStatus" enabled
     And new "GetSloStatus" request
@@ -90,7 +90,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get SLO status returns "Not Found" response
     Given operation "GetSloStatus" enabled
     And new "GetSloStatus" request
@@ -100,7 +100,7 @@ Feature: Service Level Objectives
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/slo-app
+  @generated @skip @team:ddoghq/slo-app
   Scenario: Get SLO status returns "OK" response
     Given operation "GetSloStatus" enabled
     And new "GetSloStatus" request
diff --git a/features/v2/servicenow_integration.feature b/features/v2/servicenow_integration.feature
index 21093fd0f799..3c84d1403850 100644
--- a/features/v2/servicenow_integration.feature
+++ b/features/v2/servicenow_integration.feature
@@ -9,144 +9,144 @@ Feature: ServiceNow Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "ServiceNowIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create ServiceNow template returns "Bad Request" response
     Given new "CreateServiceNowTemplate" request
     And body with value {"data": {"attributes": {"assignment_group_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "business_service_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "fields_mapping": {"category": "software", "priority": "1"}, "handle_name": "incident-template", "instance_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "servicenow_tablename": "incident", "user_id": "65b3341b-0680-47f9-a6d4-134db45c603e"}, "type": "servicenow_templates"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create ServiceNow template returns "Created" response
     Given new "CreateServiceNowTemplate" request
     And body with value {"data": {"attributes": {"assignment_group_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "business_service_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "fields_mapping": {"category": "software", "priority": "1"}, "handle_name": "incident-template", "instance_id": "65b3341b-0680-47f9-a6d4-134db45c603e", "servicenow_tablename": "incident", "user_id": "65b3341b-0680-47f9-a6d4-134db45c603e"}, "type": "servicenow_templates"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete ServiceNow template returns "Bad Request" response
     Given new "DeleteServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete ServiceNow template returns "Not Found" response
     Given new "DeleteServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete ServiceNow template returns "OK" response
     Given new "DeleteServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get ServiceNow template returns "Bad Request" response
     Given new "GetServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get ServiceNow template returns "Not Found" response
     Given new "GetServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get ServiceNow template returns "OK" response
     Given new "GetServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow assignment groups returns "Bad Request" response
     Given new "ListServiceNowAssignmentGroups" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow assignment groups returns "Not Found" response
     Given new "ListServiceNowAssignmentGroups" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow assignment groups returns "OK" response
     Given new "ListServiceNowAssignmentGroups" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow business services returns "Bad Request" response
     Given new "ListServiceNowBusinessServices" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow business services returns "Not Found" response
     Given new "ListServiceNowBusinessServices" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow business services returns "OK" response
     Given new "ListServiceNowBusinessServices" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow instances returns "Not Found" response
     Given new "ListServiceNowInstances" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow instances returns "OK" response
     Given new "ListServiceNowInstances" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow templates returns "OK" response
     Given new "ListServiceNowTemplates" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow users returns "Bad Request" response
     Given new "ListServiceNowUsers" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow users returns "Not Found" response
     Given new "ListServiceNowUsers" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: List ServiceNow users returns "OK" response
     Given new "ListServiceNowUsers" request
     And request contains "instance_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update ServiceNow template returns "Bad Request" response
     Given new "UpdateServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
@@ -154,7 +154,7 @@ Feature: ServiceNow Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update ServiceNow template returns "Not Found" response
     Given new "UpdateServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
@@ -162,7 +162,7 @@ Feature: ServiceNow Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update ServiceNow template returns "OK" response
     Given new "UpdateServiceNowTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
diff --git a/features/v2/slack_integration.feature b/features/v2/slack_integration.feature
index 0ef645a642a9..65e82e313913 100644
--- a/features/v2/slack_integration.feature
+++ b/features/v2/slack_integration.feature
@@ -10,13 +10,13 @@ Feature: Slack Integration
     And an instance of "SlackIntegration" API
     And new "ListSlackUserBindings" request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: List Slack user bindings returns "Bad Request" response
     Given request contains "user_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/chat-integrations
+  @generated @skip @team:ddoghq/chat-integrations
   Scenario: List Slack user bindings returns "OK" response
     Given request contains "user_uuid" parameter from "REPLACE.ME"
     When the request is sent
diff --git a/features/v2/snowflake_integration.feature b/features/v2/snowflake_integration.feature
index f6f4056e4e52..1229e8c6ee95 100644
--- a/features/v2/snowflake_integration.feature
+++ b/features/v2/snowflake_integration.feature
@@ -10,7 +10,7 @@ Feature: Snowflake Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "SnowflakeIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Snowflake integration account returns "Bad Request" response
     Given operation "CreateSnowflakeIntegrationAccount" enabled
     And new "CreateSnowflakeIntegrationAccount" request
@@ -18,7 +18,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Snowflake integration account returns "Created" response
     Given operation "CreateSnowflakeIntegrationAccount" enabled
     And new "CreateSnowflakeIntegrationAccount" request
@@ -26,7 +26,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Snowflake integration account returns "Not Found" response
     Given operation "CreateSnowflakeIntegrationAccount" enabled
     And new "CreateSnowflakeIntegrationAccount" request
@@ -34,7 +34,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Snowflake integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "CreateSnowflakeIntegrationAccount" enabled
     And new "CreateSnowflakeIntegrationAccount" request
@@ -42,7 +42,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Snowflake integration account returns "Bad Request" response
     Given operation "DeleteSnowflakeIntegrationAccount" enabled
     And new "DeleteSnowflakeIntegrationAccount" request
@@ -50,7 +50,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Snowflake integration account returns "Not Found" response
     Given operation "DeleteSnowflakeIntegrationAccount" enabled
     And new "DeleteSnowflakeIntegrationAccount" request
@@ -58,7 +58,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Snowflake integration account returns "OK" response
     Given operation "DeleteSnowflakeIntegrationAccount" enabled
     And new "DeleteSnowflakeIntegrationAccount" request
@@ -66,7 +66,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Snowflake integration account returns "Bad Request" response
     Given operation "GetSnowflakeIntegrationAccount" enabled
     And new "GetSnowflakeIntegrationAccount" request
@@ -74,7 +74,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Snowflake integration account returns "Not Found" response
     Given operation "GetSnowflakeIntegrationAccount" enabled
     And new "GetSnowflakeIntegrationAccount" request
@@ -82,7 +82,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Snowflake integration account returns "OK" response
     Given operation "GetSnowflakeIntegrationAccount" enabled
     And new "GetSnowflakeIntegrationAccount" request
@@ -90,28 +90,28 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Snowflake integration accounts returns "Bad Request" response
     Given operation "ListSnowflakeIntegrationAccounts" enabled
     And new "ListSnowflakeIntegrationAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Snowflake integration accounts returns "Not Found" response
     Given operation "ListSnowflakeIntegrationAccounts" enabled
     And new "ListSnowflakeIntegrationAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Snowflake integration accounts returns "OK" response
     Given operation "ListSnowflakeIntegrationAccounts" enabled
     And new "ListSnowflakeIntegrationAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Snowflake integration account returns "Bad Request" response
     Given operation "UpdateSnowflakeIntegrationAccount" enabled
     And new "UpdateSnowflakeIntegrationAccount" request
@@ -120,7 +120,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Snowflake integration account returns "Not Found" response
     Given operation "UpdateSnowflakeIntegrationAccount" enabled
     And new "UpdateSnowflakeIntegrationAccount" request
@@ -129,7 +129,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Snowflake integration account returns "OK" response
     Given operation "UpdateSnowflakeIntegrationAccount" enabled
     And new "UpdateSnowflakeIntegrationAccount" request
@@ -138,7 +138,7 @@ Feature: Snowflake Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Snowflake integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "UpdateSnowflakeIntegrationAccount" enabled
     And new "UpdateSnowflakeIntegrationAccount" request
diff --git a/features/v2/software_catalog.feature b/features/v2/software_catalog.feature
index 27059527041f..2715139658cd 100644
--- a/features/v2/software_catalog.feature
+++ b/features/v2/software_catalog.feature
@@ -7,42 +7,42 @@ Feature: Software Catalog
     And a valid "appKeyAuth" key in the system
     And an instance of "SoftwareCatalog" API
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update entities returns "ACCEPTED" response
     Given new "UpsertCatalogEntity" request
     And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
     When the request is sent
     Then the response status is 202 ACCEPTED
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update entities returns "Bad Request" response
     Given new "UpsertCatalogEntity" request
     And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/idp
+  @skip @team:ddoghq/idp
   Scenario: Create or update entities without metadata name returns "Internal Server Error" response
     Given new "UpsertCatalogEntity" request
     And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}}
     When the request is sent
     Then the response status is 500 Internal Server Error
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update kinds returns "ACCEPTED" response
     Given new "UpsertCatalogKind" request
     And body with value {"kind": "my-job"}
     When the request is sent
     Then the response status is 202 ACCEPTED
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Create or update kinds returns "Bad Request" response
     Given new "UpsertCatalogKind" request
     And body with value {"kind": "my-job"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Create or update software catalog entity using schema v3 returns "ACCEPTED" response
     Given new "UpsertCatalogEntity" request
     And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "service-{{ unique_lower_alnum }}", "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}}
@@ -52,49 +52,49 @@ Feature: Software Catalog
     And the response "data[0].attributes.kind" is equal to "service"
     And the response "data[0].attributes.name" is equal to "service-{{ unique_lower_alnum }}"
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single entity returns "Bad Request" response
     Given new "DeleteCatalogEntity" request
     And request contains "entity_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single entity returns "Not Found" response
     Given new "DeleteCatalogEntity" request
     And request contains "entity_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single entity returns "OK" response
     Given new "DeleteCatalogEntity" request
     And request contains "entity_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single kind returns "Bad Request" response
     Given new "DeleteCatalogKind" request
     And request contains "kind_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single kind returns "Not Found" response
     Given new "DeleteCatalogKind" request
     And request contains "kind_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Delete a single kind returns "OK" response
     Given new "DeleteCatalogKind" request
     And request contains "kind_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @skip @team:DataDog/idp
+  @skip @team:ddoghq/idp
   Scenario: Delete an entity returns "Not Found" response
     Given new "DeleteCatalogEntity" request
     And request contains "entity_id" parameter with value "service:not-a-service"
@@ -102,50 +102,50 @@ Feature: Software Catalog
     Then the response status is 404 Not Found
     And the response "errors[0]" is equal to "Not Found"
 
-  @team:DataDog/idp
+  @team:ddoghq/idp
   Scenario: Get a list of entities returns "OK" response
     Given new "ListCatalogEntity" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp @with-pagination
+  @generated @skip @team:ddoghq/idp @with-pagination
   Scenario: Get a list of entities returns "OK" response with pagination
     Given new "ListCatalogEntity" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a list of entity kinds returns "Bad Request" response
     Given new "ListCatalogKind" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Get a list of entity kinds returns "OK" response
     Given new "ListCatalogKind" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp @with-pagination
+  @generated @skip @team:ddoghq/idp @with-pagination
   Scenario: Get a list of entity kinds returns "OK" response with pagination
     Given new "ListCatalogKind" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @replay-only @team:DataDog/idp
+  @replay-only @team:ddoghq/idp
   Scenario: Get a list of entity relations returns "OK" response
     Given new "ListCatalogRelation" request
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip-validation @team:DataDog/idp @with-pagination
+  @replay-only @skip-validation @team:ddoghq/idp @with-pagination
   Scenario: Get a list of entity relations returns "OK" response with pagination
     Given new "ListCatalogRelation" request
     And request contains "page[limit]" parameter with value 20
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/idp
+  @generated @skip @team:ddoghq/idp
   Scenario: Preview catalog entities returns "Accepted" response
     Given new "PreviewCatalogEntities" request
     When the request is sent
diff --git a/features/v2/spa.feature b/features/v2/spa.feature
index b3d5d0fec0c2..c175f767e9fc 100644
--- a/features/v2/spa.feature
+++ b/features/v2/spa.feature
@@ -6,7 +6,7 @@ Feature: Spa
   Background:
     Given an instance of "Spa" API
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA Recommendations returns "Bad Request" response
     Given operation "GetSPARecommendations" enabled
     And new "GetSPARecommendations" request
@@ -14,7 +14,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA Recommendations returns "OK" response
     Given operation "GetSPARecommendations" enabled
     And new "GetSPARecommendations" request
@@ -22,7 +22,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA Recommendations with a shard parameter returns "Bad Request" response
     Given operation "GetSPARecommendationsWithShard" enabled
     And new "GetSPARecommendationsWithShard" request
@@ -31,7 +31,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA Recommendations with a shard parameter returns "OK" response
     Given operation "GetSPARecommendationsWithShard" enabled
     And new "GetSPARecommendationsWithShard" request
@@ -40,7 +40,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA recommendations v2 returns "Bad Request" response
     Given operation "GetSPARecommendationsV2" enabled
     And new "GetSPARecommendationsV2" request
@@ -49,7 +49,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA recommendations v2 returns "Not Found" response
     Given operation "GetSPARecommendationsV2" enabled
     And new "GetSPARecommendationsV2" request
@@ -58,7 +58,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/data-and-analytics-processing
+  @generated @skip @team:ddoghq/data-and-analytics-processing
   Scenario: Get SPA recommendations v2 returns "OK" response
     Given operation "GetSPARecommendationsV2" enabled
     And new "GetSPARecommendationsV2" request
@@ -67,7 +67,7 @@ Feature: Spa
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/data-and-analytics-processing
+  @skip @team:ddoghq/data-and-analytics-processing
   Scenario: GetSPARecommendations returns a JSON:API Recommendation with driver and executor estimations
     Given new "GetSPARecommendations" request
     And a valid "apiKeyAuth" key in the system
diff --git a/features/v2/spans.feature b/features/v2/spans.feature
index bd1cfba58a79..eabdf2baafa1 100644
--- a/features/v2/spans.feature
+++ b/features/v2/spans.feature
@@ -7,14 +7,14 @@ Feature: Spans
     And a valid "appKeyAuth" key in the system
     And an instance of "Spans" API
 
-  @skip @team:DataDog/apm
+  @skip @team:ddoghq/apm
   Scenario: Aggregate spans returns "Bad Request" response
     Given new "AggregateSpans" request
     And body with value {"compute": [{"aggregation": "pc90", "interval": "5m", "metric": "@duration", "type": "total"}], "filter": {"from": "now-15m", "query": "service:web* AND @http.status_code:[200 TO 299]", "to": "now"}, "group_by": [{"facet": "host", "histogram": {"interval": 10, "max": 100, "min": 50}, "limit": 10, "sort": {"aggregation": "count", "order": "asc"}, "total": false}], "options": {"timezone": "GMT"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Aggregate spans returns "OK" response
     Given new "AggregateSpans" request
     And body with value {"data":{"attributes": {"compute": [{"aggregation": "count", "interval": "5m", "type": "timeseries"}],"filter": {"from": "now-15m", "query": "*", "to": "now"}},"type":"aggregate_request"}}
@@ -22,20 +22,20 @@ Feature: Spans
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Get a list of spans returns "Bad Request." response
     Given new "ListSpansGet" request
     When the request is sent
     Then the response status is 400 Bad Request.
 
-  @replay-only @team:DataDog/apm
+  @replay-only @team:ddoghq/apm
   Scenario: Get a list of spans returns "OK" response
     Given new "ListSpansGet" request
     When the request is sent
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "spans"
 
-  @replay-only @skip-validation @team:DataDog/apm @with-pagination
+  @replay-only @skip-validation @team:ddoghq/apm @with-pagination
   Scenario: Get a list of spans returns "OK" response with pagination
     Given new "ListSpansGet" request
     And request contains "page[limit]" parameter with value 2
@@ -43,7 +43,7 @@ Feature: Spans
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Get a list of spans returns "Unprocessable Entity." response
     Given new "ListSpansGet" request
     And request contains "filter[from]" parameter with value "now"
@@ -51,14 +51,14 @@ Feature: Spans
     When the request is sent
     Then the response status is 422 Unprocessable Entity.
 
-  @skip @team:DataDog/apm
+  @skip @team:ddoghq/apm
   Scenario: Search spans returns "Bad Request." response
     Given new "ListSpans" request
     And body with value {"filter": {"from": "now-15m", "query": "service:web*", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "timestamp"}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/apm
+  @replay-only @team:ddoghq/apm
   Scenario: Search spans returns "OK" response
     Given new "ListSpans" request
     And body with value {"data": {"attributes": {"filter": {"from": "now-15m", "query": "*", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"limit": 25}, "sort": "timestamp"}, "type": "search_request"}}
@@ -66,7 +66,7 @@ Feature: Spans
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "spans"
 
-  @replay-only @skip-validation @team:DataDog/apm @with-pagination
+  @replay-only @skip-validation @team:ddoghq/apm @with-pagination
   Scenario: Search spans returns "OK" response with pagination
     Given new "ListSpans" request
     And body with value {"data": {"attributes": {"filter": {"from": "now-15m", "query": "service:python*", "to": "now"}, "options": {"timezone": "GMT"}, "page": {"limit": 2}, "sort": "timestamp"}, "type": "search_request"}}
@@ -74,7 +74,7 @@ Feature: Spans
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Search spans returns "Unprocessable Entity." response
     Given new "ListSpans" request
     And body with value {"data": {"attributes": {"filter": {"from": "now", "query": "service:web* AND @http.status_code:[200 TO 299]", "to": "now-15m"}, "options": {"timezone": "GMT"}, "page": {"limit": 10}, "sort": "timestamp"}, "type": "search_request"}}
diff --git a/features/v2/spans_metrics.feature b/features/v2/spans_metrics.feature
index 9de01b47e5f6..3cfd6bdc9f6c 100644
--- a/features/v2/spans_metrics.feature
+++ b/features/v2/spans_metrics.feature
@@ -10,21 +10,21 @@ Feature: Spans Metrics
     And a valid "appKeyAuth" key in the system
     And an instance of "SpansMetrics" API
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Create a span-based metric returns "Bad Request" response
     Given new "CreateSpansMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": false, "path": "@duration"}, "filter": {"query": "@http.status_code:200 service:my-service"}, "group_by": [{"path": "resource_name", "tag_name": "resource_name"}]}, "id": "my.metric", "type": "spans_metrics"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Create a span-based metric returns "Conflict" response
     Given new "CreateSpansMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": false, "path": "@duration"}, "filter": {"query": "@http.status_code:200 service:my-service"}, "group_by": [{"path": "resource_name", "tag_name": "resource_name"}]}, "id": "my.metric", "type": "spans_metrics"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Create a span-based metric returns "OK" response
     Given new "CreateSpansMetric" request
     And body with value {"data": {"attributes": {"compute": {"aggregation_type": "distribution", "include_percentiles": false, "path": "@duration"}, "filter": {"query": "@http.status_code:200 service:my-service"}, "group_by": [{"path": "resource_name", "tag_name": "resource_name"}]}, "id": "{{ unique_alnum }}", "type": "spans_metrics"}}
@@ -34,14 +34,14 @@ Feature: Spans Metrics
     And the response "data.type" is equal to "spans_metrics"
     And the response "data.attributes.compute.aggregation_type" is equal to "distribution"
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Delete a span-based metric returns "Not Found" response
     Given new "DeleteSpansMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Delete a span-based metric returns "OK" response
     Given there is a valid "spans_metric" in the system
     And new "DeleteSpansMetric" request
@@ -49,14 +49,14 @@ Feature: Spans Metrics
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Get a span-based metric returns "Not Found" response
     Given new "GetSpansMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Get a span-based metric returns "OK" response
     Given there is a valid "spans_metric" in the system
     And new "GetSpansMetric" request
@@ -65,7 +65,7 @@ Feature: Spans Metrics
     Then the response status is 200 OK
     And the response "data.attributes.filter.query" has the same value as "spans_metric.data.attributes.filter.query"
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Get all span-based metrics returns "OK" response
     Given there is a valid "spans_metric" in the system
     And new "ListSpansMetrics" request
@@ -73,7 +73,7 @@ Feature: Spans Metrics
     Then the response status is 200 OK
     And the response "data[0].type" is equal to "spans_metrics"
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Update a span-based metric returns "Bad Request" response
     Given new "UpdateSpansMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -81,7 +81,7 @@ Feature: Spans Metrics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/apm
+  @generated @skip @team:ddoghq/apm
   Scenario: Update a span-based metric returns "Not Found" response
     Given new "UpdateSpansMetric" request
     And request contains "metric_id" parameter from "REPLACE.ME"
@@ -89,7 +89,7 @@ Feature: Spans Metrics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/apm
+  @team:ddoghq/apm
   Scenario: Update a span-based metric returns "OK" response
     Given there is a valid "spans_metric" in the system
     And new "UpdateSpansMetric" request
diff --git a/features/v2/static_analysis.feature b/features/v2/static_analysis.feature
index 8a7dc3489ae5..94f84200a6fb 100644
--- a/features/v2/static_analysis.feature
+++ b/features/v2/static_analysis.feature
@@ -7,7 +7,7 @@ Feature: Static Analysis
     And a valid "appKeyAuth" key in the system
     And an instance of "StaticAnalysis" API
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule Revision returns "Bad request" response
     Given operation "CreateCustomRuleRevision" enabled
     And new "CreateCustomRuleRevision" request
@@ -17,7 +17,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule Revision returns "Rule not found" response
     Given operation "CreateCustomRuleRevision" enabled
     And new "CreateCustomRuleRevision" request
@@ -27,7 +27,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule Revision returns "Successfully created" response
     Given operation "CreateCustomRuleRevision" enabled
     And new "CreateCustomRuleRevision" request
@@ -37,7 +37,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule returns "Bad request" response
     Given operation "CreateCustomRule" enabled
     And new "CreateCustomRule" request
@@ -46,7 +46,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule returns "Conflict - rule already exists" response
     Given operation "CreateCustomRule" enabled
     And new "CreateCustomRule" request
@@ -55,7 +55,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 409 Conflict - rule already exists
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule returns "Precondition failed - validation error or ruleset not found" response
     Given operation "CreateCustomRule" enabled
     And new "CreateCustomRule" request
@@ -64,7 +64,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition failed - validation error or ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Rule returns "Successfully created" response
     Given operation "CreateCustomRule" enabled
     And new "CreateCustomRule" request
@@ -73,7 +73,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Ruleset returns "Bad Request" response
     Given operation "CreateCustomRuleset" enabled
     And new "CreateCustomRuleset" request
@@ -81,7 +81,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Ruleset returns "Conflict" response
     Given operation "CreateCustomRuleset" enabled
     And new "CreateCustomRuleset" request
@@ -89,7 +89,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Ruleset returns "OK" response
     Given operation "CreateCustomRuleset" enabled
     And new "CreateCustomRuleset" request
@@ -97,7 +97,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create Custom Ruleset returns "Precondition Failed" response
     Given operation "CreateCustomRuleset" enabled
     And new "CreateCustomRuleset" request
@@ -105,7 +105,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition Failed
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule returns "Bad Request" response
     Given operation "CreateAiCustomRule" enabled
     And new "CreateAiCustomRule" request
@@ -114,7 +114,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule returns "Conflict - rule already exists" response
     Given operation "CreateAiCustomRule" enabled
     And new "CreateAiCustomRule" request
@@ -123,7 +123,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 409 Conflict - rule already exists
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule returns "Precondition Failed - validation error or ruleset not found" response
     Given operation "CreateAiCustomRule" enabled
     And new "CreateAiCustomRule" request
@@ -132,7 +132,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition Failed - validation error or ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule returns "Successfully created" response
     Given operation "CreateAiCustomRule" enabled
     And new "CreateAiCustomRule" request
@@ -141,7 +141,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule revision returns "Bad Request" response
     Given operation "CreateAiCustomRuleRevision" enabled
     And new "CreateAiCustomRuleRevision" request
@@ -151,7 +151,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule revision returns "Rule not found" response
     Given operation "CreateAiCustomRuleRevision" enabled
     And new "CreateAiCustomRuleRevision" request
@@ -161,7 +161,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom rule revision returns "Successfully created" response
     Given operation "CreateAiCustomRuleRevision" enabled
     And new "CreateAiCustomRuleRevision" request
@@ -171,7 +171,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom ruleset returns "Bad Request" response
     Given operation "CreateAiCustomRuleset" enabled
     And new "CreateAiCustomRuleset" request
@@ -179,7 +179,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom ruleset returns "Conflict - ruleset already exists" response
     Given operation "CreateAiCustomRuleset" enabled
     And new "CreateAiCustomRuleset" request
@@ -187,7 +187,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 409 Conflict - ruleset already exists
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom ruleset returns "Precondition Failed - validation error" response
     Given operation "CreateAiCustomRuleset" enabled
     And new "CreateAiCustomRuleset" request
@@ -195,7 +195,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition Failed - validation error
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI custom ruleset returns "Successfully created" response
     Given operation "CreateAiCustomRuleset" enabled
     And new "CreateAiCustomRuleset" request
@@ -203,7 +203,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI memory violation result returns "Bad Request" response
     Given operation "CreateAiMemoryViolationResult" enabled
     And new "CreateAiMemoryViolationResult" request
@@ -211,7 +211,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI memory violation result returns "Not Found" response
     Given operation "CreateAiMemoryViolationResult" enabled
     And new "CreateAiMemoryViolationResult" request
@@ -219,7 +219,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Create an AI memory violation result returns "Successfully created" response
     Given operation "CreateAiMemoryViolationResult" enabled
     And new "CreateAiMemoryViolationResult" request
@@ -227,7 +227,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully created
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Rule returns "Bad request" response
     Given operation "DeleteCustomRule" enabled
     And new "DeleteCustomRule" request
@@ -236,7 +236,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Rule returns "Rule not found" response
     Given operation "DeleteCustomRule" enabled
     And new "DeleteCustomRule" request
@@ -245,7 +245,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Rule returns "Successfully deleted" response
     Given operation "DeleteCustomRule" enabled
     And new "DeleteCustomRule" request
@@ -254,7 +254,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully deleted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Ruleset returns "Bad request" response
     Given operation "DeleteCustomRuleset" enabled
     And new "DeleteCustomRuleset" request
@@ -262,7 +262,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Ruleset returns "Ruleset not found" response
     Given operation "DeleteCustomRuleset" enabled
     And new "DeleteCustomRuleset" request
@@ -270,7 +270,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete Custom Ruleset returns "Successfully deleted" response
     Given operation "DeleteCustomRuleset" enabled
     And new "DeleteCustomRuleset" request
@@ -278,7 +278,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully deleted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom rule returns "Bad Request" response
     Given operation "DeleteAiCustomRule" enabled
     And new "DeleteAiCustomRule" request
@@ -287,7 +287,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom rule returns "Rule not found" response
     Given operation "DeleteAiCustomRule" enabled
     And new "DeleteAiCustomRule" request
@@ -296,7 +296,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom rule returns "Successfully deleted" response
     Given operation "DeleteAiCustomRule" enabled
     And new "DeleteAiCustomRule" request
@@ -305,7 +305,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully deleted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom ruleset returns "Bad Request" response
     Given operation "DeleteAiCustomRuleset" enabled
     And new "DeleteAiCustomRuleset" request
@@ -313,7 +313,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom ruleset returns "Ruleset not found" response
     Given operation "DeleteAiCustomRuleset" enabled
     And new "DeleteAiCustomRuleset" request
@@ -321,7 +321,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI custom ruleset returns "Successfully deleted" response
     Given operation "DeleteAiCustomRuleset" enabled
     And new "DeleteAiCustomRuleset" request
@@ -329,7 +329,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully deleted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI memory violation result returns "Bad Request" response
     Given operation "DeleteAiMemoryViolationResult" enabled
     And new "DeleteAiMemoryViolationResult" request
@@ -337,7 +337,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI memory violation result returns "Memory violation result not found" response
     Given operation "DeleteAiMemoryViolationResult" enabled
     And new "DeleteAiMemoryViolationResult" request
@@ -345,7 +345,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Memory violation result not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Delete an AI memory violation result returns "Successfully deleted" response
     Given operation "DeleteAiMemoryViolationResult" enabled
     And new "DeleteAiMemoryViolationResult" request
@@ -353,7 +353,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully deleted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule returns "Bad Request" response
     Given operation "GetAiCustomRule" enabled
     And new "GetAiCustomRule" request
@@ -362,7 +362,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule returns "Rule not found" response
     Given operation "GetAiCustomRule" enabled
     And new "GetAiCustomRule" request
@@ -371,7 +371,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule returns "Successful response" response
     Given operation "GetAiCustomRule" enabled
     And new "GetAiCustomRule" request
@@ -380,7 +380,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule revision returns "Bad Request" response
     Given operation "GetAiCustomRuleRevision" enabled
     And new "GetAiCustomRuleRevision" request
@@ -390,7 +390,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule revision returns "Revision not found" response
     Given operation "GetAiCustomRuleRevision" enabled
     And new "GetAiCustomRuleRevision" request
@@ -400,7 +400,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Revision not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom rule revision returns "Successful response" response
     Given operation "GetAiCustomRuleRevision" enabled
     And new "GetAiCustomRuleRevision" request
@@ -410,7 +410,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom ruleset returns "Bad Request" response
     Given operation "GetAiCustomRuleset" enabled
     And new "GetAiCustomRuleset" request
@@ -418,7 +418,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom ruleset returns "Ruleset not found" response
     Given operation "GetAiCustomRuleset" enabled
     And new "GetAiCustomRuleset" request
@@ -426,7 +426,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Get an AI custom ruleset returns "Successful response" response
     Given operation "GetAiCustomRuleset" enabled
     And new "GetAiCustomRuleset" request
@@ -434,14 +434,14 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Get the list of SPDX licenses returns "OK" response
     Given operation "ListSCALicenses" enabled
     And new "ListSCALicenses" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI custom rule revisions returns "Bad Request" response
     Given operation "ListAiCustomRuleRevisions" enabled
     And new "ListAiCustomRuleRevisions" request
@@ -450,7 +450,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI custom rule revisions returns "Rule not found" response
     Given operation "ListAiCustomRuleRevisions" enabled
     And new "ListAiCustomRuleRevisions" request
@@ -459,7 +459,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI custom rule revisions returns "Successful response" response
     Given operation "ListAiCustomRuleRevisions" enabled
     And new "ListAiCustomRuleRevisions" request
@@ -468,7 +468,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast @with-pagination
+  @generated @skip @team:ddoghq/k9-vm-ast @with-pagination
   Scenario: List AI custom rule revisions returns "Successful response" response with pagination
     Given operation "ListAiCustomRuleRevisions" enabled
     And new "ListAiCustomRuleRevisions" request
@@ -477,56 +477,56 @@ Feature: Static Analysis
     When the request with pagination is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI custom rulesets returns "Successful response" response
     Given operation "ListAiCustomRulesets" enabled
     And new "ListAiCustomRulesets" request
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI memory violation results returns "Bad Request" response
     Given operation "ListAiMemoryViolationResults" enabled
     And new "ListAiMemoryViolationResults" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI memory violation results returns "Not Found" response
     Given operation "ListAiMemoryViolationResults" enabled
     And new "ListAiMemoryViolationResults" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI memory violation results returns "Successful response" response
     Given operation "ListAiMemoryViolationResults" enabled
     And new "ListAiMemoryViolationResults" request
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI prompts returns "Bad Request" response
     Given operation "ListAiPrompts" enabled
     And new "ListAiPrompts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI prompts returns "Not Found" response
     Given operation "ListAiPrompts" enabled
     And new "ListAiPrompts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List AI prompts returns "Successful response" response
     Given operation "ListAiPrompts" enabled
     And new "ListAiPrompts" request
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List Custom Rule Revisions returns "Bad request" response
     Given operation "ListCustomRuleRevisions" enabled
     And new "ListCustomRuleRevisions" request
@@ -535,7 +535,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List Custom Rule Revisions returns "Rule not found" response
     Given operation "ListCustomRuleRevisions" enabled
     And new "ListCustomRuleRevisions" request
@@ -544,7 +544,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List Custom Rule Revisions returns "Successful response" response
     Given operation "ListCustomRuleRevisions" enabled
     And new "ListCustomRuleRevisions" request
@@ -553,7 +553,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast @with-pagination
+  @generated @skip @team:ddoghq/k9-vm-ast @with-pagination
   Scenario: List Custom Rule Revisions returns "Successful response" response with pagination
     Given operation "ListCustomRuleRevisions" enabled
     And new "ListCustomRuleRevisions" request
@@ -562,14 +562,14 @@ Feature: Static Analysis
     When the request with pagination is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: List Custom Rulesets returns "OK" response
     Given operation "ListCustomRulesets" enabled
     And new "ListCustomRulesets" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: POST request to resolve vulnerable symbols returns "OK" response
     Given operation "CreateSCAResolveVulnerableSymbols" enabled
     And new "CreateSCAResolveVulnerableSymbols" request
@@ -577,7 +577,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Post dependencies for analysis returns "OK" response
     Given operation "CreateSCAResult" enabled
     And new "CreateSCAResult" request
@@ -585,7 +585,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Retrieve a dependency scan result returns "Not Found" response
     Given operation "GetSCAScan" enabled
     And new "GetSCAScan" request
@@ -593,7 +593,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Retrieve a dependency scan result returns "OK" response
     Given operation "GetSCAScan" enabled
     And new "GetSCAScan" request
@@ -601,7 +601,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Revert Custom Rule Revision returns "Bad request" response
     Given operation "RevertCustomRuleRevision" enabled
     And new "RevertCustomRuleRevision" request
@@ -611,7 +611,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Revert Custom Rule Revision returns "Successfully reverted" response
     Given operation "RevertCustomRuleRevision" enabled
     And new "RevertCustomRuleRevision" request
@@ -621,7 +621,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully reverted
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule Revision returns "Bad request" response
     Given operation "GetCustomRuleRevision" enabled
     And new "GetCustomRuleRevision" request
@@ -631,7 +631,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule Revision returns "Revision not found" response
     Given operation "GetCustomRuleRevision" enabled
     And new "GetCustomRuleRevision" request
@@ -641,7 +641,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Revision not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule Revision returns "Successful response" response
     Given operation "GetCustomRuleRevision" enabled
     And new "GetCustomRuleRevision" request
@@ -651,7 +651,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule returns "Bad request" response
     Given operation "GetCustomRule" enabled
     And new "GetCustomRule" request
@@ -660,7 +660,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule returns "Rule not found" response
     Given operation "GetCustomRule" enabled
     And new "GetCustomRule" request
@@ -669,7 +669,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Rule not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Rule returns "Successful response" response
     Given operation "GetCustomRule" enabled
     And new "GetCustomRule" request
@@ -678,7 +678,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Ruleset returns "Bad request" response
     Given operation "GetCustomRuleset" enabled
     And new "GetCustomRuleset" request
@@ -686,7 +686,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Ruleset returns "Ruleset not found" response
     Given operation "GetCustomRuleset" enabled
     And new "GetCustomRuleset" request
@@ -694,7 +694,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 404 Ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Show Custom Ruleset returns "Successful response" response
     Given operation "GetCustomRuleset" enabled
     And new "GetCustomRuleset" request
@@ -702,7 +702,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successful response
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Submit libraries for vulnerability scanning returns "Accepted" response
     Given operation "CreateSCAScan" enabled
     And new "CreateSCAScan" request
@@ -710,7 +710,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 202 Accepted
 
-  @generated @skip @team:DataDog/k9-vm-sca
+  @generated @skip @team:ddoghq/k9-vm-sca
   Scenario: Submit libraries for vulnerability scanning returns "Bad Request" response
     Given operation "CreateSCAScan" enabled
     And new "CreateSCAScan" request
@@ -718,7 +718,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update Custom Ruleset returns "Bad request" response
     Given operation "UpdateCustomRuleset" enabled
     And new "UpdateCustomRuleset" request
@@ -727,7 +727,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update Custom Ruleset returns "Precondition failed - validation error or ruleset not found" response
     Given operation "UpdateCustomRuleset" enabled
     And new "UpdateCustomRuleset" request
@@ -736,7 +736,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition failed - validation error or ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update Custom Ruleset returns "Successfully updated" response
     Given operation "UpdateCustomRuleset" enabled
     And new "UpdateCustomRuleset" request
@@ -745,7 +745,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 200 Successfully updated
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update an AI custom ruleset returns "Bad Request" response
     Given operation "UpdateAiCustomRuleset" enabled
     And new "UpdateAiCustomRuleset" request
@@ -754,7 +754,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update an AI custom ruleset returns "Precondition Failed - validation error or ruleset not found" response
     Given operation "UpdateAiCustomRuleset" enabled
     And new "UpdateAiCustomRuleset" request
@@ -763,7 +763,7 @@ Feature: Static Analysis
     When the request is sent
     Then the response status is 412 Precondition Failed - validation error or ruleset not found
 
-  @generated @skip @team:DataDog/k9-vm-ast
+  @generated @skip @team:ddoghq/k9-vm-ast
   Scenario: Update an AI custom ruleset returns "Successfully updated" response
     Given operation "UpdateAiCustomRuleset" enabled
     And new "UpdateAiCustomRuleset" request
diff --git a/features/v2/status_pages.feature b/features/v2/status_pages.feature
index 95da2ead98a8..26237ffb6125 100644
--- a/features/v2/status_pages.feature
+++ b/features/v2/status_pages.feature
@@ -10,7 +10,7 @@ Feature: Status Pages
     And a valid "appKeyAuth" key in the system
     And an instance of "StatusPages" API
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create backfilled degradation returns "Created" response
     Given there is a valid "status_page" in the system
     And new "CreateBackfilledDegradation" request
@@ -20,7 +20,7 @@ Feature: Status Pages
     Then the response status is 201 Created
     And the response "data.attributes.title" is equal to "Past API Outage"
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create backfilled maintenance returns "Created" response
     Given there is a valid "status_page" in the system
     And new "CreateBackfilledMaintenance" request
@@ -30,7 +30,7 @@ Feature: Status Pages
     Then the response status is 201 Created
     And the response "data.attributes.title" is equal to "Past Database Maintenance"
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create component returns "Created" response
     Given there is a valid "status_page" in the system
     And new "CreateComponent" request
@@ -40,7 +40,7 @@ Feature: Status Pages
     Then the response status is 201 Created
     And the response "data.attributes.status" is equal to "operational"
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create degradation returns "Created" response
     Given there is a valid "status_page" in the system
     And new "CreateDegradation" request
@@ -50,7 +50,7 @@ Feature: Status Pages
     Then the response status is 201 Created
     And the response "data.attributes.updates" has length 1
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create degradation template returns "Created" response
     Given new "CreateDegradationTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -58,7 +58,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create maintenance returns "Created" response
     Given there is a valid "status_page" in the system
     And new "CreateMaintenance" request
@@ -68,7 +68,7 @@ Feature: Status Pages
     Then the response status is 201 Created
     And the response "data.attributes.updates" has length 1
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Create maintenance template returns "Created" response
     Given new "CreateMaintenanceTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -76,14 +76,14 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Create status page returns "Created" response
     Given new "CreateStatusPage" request
     And body with value {"data": {"attributes": {"name": "A Status Page", "domain_prefix": "{{ unique_hash }}", "components":[{"name": "Login", "type": "component", "position": 0},{"name": "Settings", "type": "component", "position": 1}], "type": "internal", "visualization_type": "bars_and_uptime_percentage"}, "type": "status_pages"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete component returns "No Content" response
     Given new "DeleteComponent" request
     And there is a valid "status_page" in the system
@@ -92,7 +92,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete degradation returns "No Content" response
     Given new "DeleteDegradation" request
     And there is a valid "status_page" in the system
@@ -102,7 +102,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete degradation template returns "No Content" response
     Given new "DeleteDegradationTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -110,7 +110,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Delete maintenance template returns "No Content" response
     Given new "DeleteMaintenanceTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -118,7 +118,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Delete status page returns "No Content" response
     Given new "DeleteStatusPage" request
     And there is a valid "status_page" in the system
@@ -126,7 +126,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Edit degradation update returns "OK" response
     Given new "EditDegradationUpdate" request
     And request contains "degradation_id" parameter from "REPLACE.ME"
@@ -136,7 +136,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Edit maintenance update returns "OK" response
     Given new "PatchMaintenanceUpdate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -146,7 +146,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get component returns "OK" response
     Given new "GetComponent" request
     And there is a valid "status_page" in the system
@@ -155,7 +155,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get degradation returns "OK" response
     Given new "GetDegradation" request
     And there is a valid "status_page" in the system
@@ -165,7 +165,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get degradation template returns "OK" response
     Given new "GetDegradationTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -173,7 +173,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get maintenance returns "OK" response
     Given there is a valid "status_page" in the system
     And there is a valid "maintenance" in the system
@@ -183,7 +183,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Get maintenance template returns "OK" response
     Given new "GetMaintenanceTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -191,7 +191,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Get status page returns "OK" response
     Given new "GetStatusPage" request
     And there is a valid "status_page" in the system
@@ -199,7 +199,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List components returns "OK" response
     Given new "ListComponents" request
     And there is a valid "status_page" in the system
@@ -207,14 +207,14 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List degradation templates returns "OK" response
     Given new "ListDegradationTemplates" request
     And request contains "page_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List degradations returns "OK" response
     Given new "ListDegradations" request
     And there is a valid "status_page" in the system
@@ -222,14 +222,14 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: List maintenance templates returns "OK" response
     Given new "ListMaintenanceTemplates" request
     And request contains "page_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List maintenances returns "OK" response
     Given there is a valid "status_page" in the system
     And there is a valid "maintenance" in the system
@@ -237,14 +237,14 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: List status pages returns "OK" response
     Given new "ListStatusPages" request
     And there is a valid "status_page" in the system
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Publish status page returns "No Content" response
     Given there is a valid "status_page" in the system
     And new "PublishStatusPage" request
@@ -252,7 +252,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Schedule maintenance returns "Created" response
     Given new "CreateMaintenance" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -260,7 +260,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Soft delete degradation update returns "No Content" response
     Given new "SoftDeleteDegradationUpdate" request
     And request contains "degradation_id" parameter from "REPLACE.ME"
@@ -269,14 +269,14 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Unpublish status page returns "No Content" response
     Given new "UnpublishStatusPage" request
     And request contains "page_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update component returns "OK" response
     Given new "UpdateComponent" request
     And there is a valid "status_page" in the system
@@ -287,7 +287,7 @@ Feature: Status Pages
     Then the response status is 200 OK
     And the response "data.attributes.name" is equal to "Logs Indexing"
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update degradation returns "OK" response
     Given new "UpdateDegradation" request
     And there is a valid "status_page" in the system
@@ -299,7 +299,7 @@ Feature: Status Pages
     Then the response status is 200 OK
     And the response "data.attributes.title" is equal to "Elevated API Latency in US1"
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update degradation template returns "OK" response
     Given new "UpdateDegradationTemplate" request
     And request contains "template_id" parameter from "REPLACE.ME"
@@ -308,7 +308,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update maintenance returns "OK" response
     Given there is a valid "status_page" in the system
     And there is a valid "maintenance" in the system
@@ -319,7 +319,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/incident-app
+  @generated @skip @team:ddoghq/incident-app
   Scenario: Update maintenance template returns "OK" response
     Given new "UpdateMaintenanceTemplate" request
     And request contains "page_id" parameter from "REPLACE.ME"
@@ -328,7 +328,7 @@ Feature: Status Pages
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/incident-app
+  @team:ddoghq/incident-app
   Scenario: Update status page returns "OK" response
     Given new "UpdateStatusPage" request
     And there is a valid "status_page" in the system
diff --git a/features/v2/statuspage_integration.feature b/features/v2/statuspage_integration.feature
index 453997ce7dc9..34a4f0560b57 100644
--- a/features/v2/statuspage_integration.feature
+++ b/features/v2/statuspage_integration.feature
@@ -9,112 +9,112 @@ Feature: Statuspage Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "StatuspageIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Statuspage URL setting returns "Bad Request" response
     Given new "CreateStatuspageUrlSetting" request
     And body with value {"data": {"attributes": {"custom_tags": "team:collaboration-integrations,env:prod", "url": "https://example.statuspage.io"}, "type": "statuspage-url-setting"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Statuspage URL setting returns "CREATED" response
     Given new "CreateStatuspageUrlSetting" request
     And body with value {"data": {"attributes": {"custom_tags": "team:collaboration-integrations,env:prod", "url": "https://example.statuspage.io"}, "type": "statuspage-url-setting"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create a Statuspage URL setting returns "Conflict" response
     Given new "CreateStatuspageUrlSetting" request
     And body with value {"data": {"attributes": {"custom_tags": "team:collaboration-integrations,env:prod", "url": "https://example.statuspage.io"}, "type": "statuspage-url-setting"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create the Statuspage account returns "Bad Request" response
     Given new "CreateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create the Statuspage account returns "CREATED" response
     Given new "CreateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create the Statuspage account returns "Conflict" response
     Given new "CreateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a Statuspage URL setting returns "Bad Request" response
     Given new "DeleteStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a Statuspage URL setting returns "Not Found" response
     Given new "DeleteStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete a Statuspage URL setting returns "OK" response
     Given new "DeleteStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete the Statuspage account returns "Bad Request" response
     Given new "DeleteStatuspageAccount" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete the Statuspage account returns "Not Found" response
     Given new "DeleteStatuspageAccount" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete the Statuspage account returns "OK" response
     Given new "DeleteStatuspageAccount" request
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all Statuspage URL settings returns "Not Found" response
     Given new "ListStatuspageUrlSettings" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all Statuspage URL settings returns "OK" response
     Given new "ListStatuspageUrlSettings" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get the Statuspage account returns "Not Found" response
     Given new "GetStatuspageAccount" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get the Statuspage account returns "OK" response
     Given new "GetStatuspageAccount" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Statuspage URL setting returns "Bad Request" response
     Given new "UpdateStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
@@ -122,7 +122,7 @@ Feature: Statuspage Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Statuspage URL setting returns "Conflict" response
     Given new "UpdateStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
@@ -130,7 +130,7 @@ Feature: Statuspage Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Statuspage URL setting returns "Not Found" response
     Given new "UpdateStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
@@ -138,7 +138,7 @@ Feature: Statuspage Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update a Statuspage URL setting returns "OK" response
     Given new "UpdateStatuspageUrlSetting" request
     And request contains "statuspage_url_setting_id" parameter from "REPLACE.ME"
@@ -146,21 +146,21 @@ Feature: Statuspage Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update the Statuspage account returns "Bad Request" response
     Given new "UpdateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update the Statuspage account returns "Not Found" response
     Given new "UpdateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update the Statuspage account returns "OK" response
     Given new "UpdateStatuspageAccount" request
     And body with value {"data": {"attributes": {"api_key": "00000000-0000-0000-0000-000000000000"}, "type": "statuspage-account"}}
diff --git a/features/v2/stegadography.feature b/features/v2/stegadography.feature
index 86c2d3a2a8b8..9ff95e392e2e 100644
--- a/features/v2/stegadography.feature
+++ b/features/v2/stegadography.feature
@@ -9,18 +9,18 @@ Feature: Stegadography
     And an instance of "Stegadography" API
     And new "GetStegadographyWidgets" request
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Get widgets from an image returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @integration-only @skip-terraform-config @skip-validation @team:DataDog/dataviz-backend-maintainers
+  @integration-only @skip-terraform-config @skip-validation @team:ddoghq/dataviz-backend-maintainers
   Scenario: Get widgets from an image returns "OK" response
     Given request contains "image" parameter with value "fixtures/stegadography/image.png"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Get widgets from an image returns "Unsupported Media Type" response
     When the request is sent
     Then the response status is 415 Unsupported Media Type
diff --git a/features/v2/storage_management.feature b/features/v2/storage_management.feature
index ae0a17945386..20f903bfa5a3 100644
--- a/features/v2/storage_management.feature
+++ b/features/v2/storage_management.feature
@@ -9,28 +9,28 @@ Feature: Storage Management
     And a valid "appKeyAuth" key in the system
     And an instance of "StorageManagement" API
 
-  @generated @skip @team:DataDog/storage-management
+  @generated @skip @team:ddoghq/storage-management
   Scenario: Delete a Storage Management configuration returns "No Content" response
     Given new "DeleteSyncConfig" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/storage-management
+  @generated @skip @team:ddoghq/storage-management
   Scenario: Delete a Storage Management configuration returns "Not Found" response
     Given new "DeleteSyncConfig" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/storage-management
+  @generated @skip @team:ddoghq/storage-management
   Scenario: Enable Storage Management for a bucket returns "Bad Request" response
     Given new "UpsertSyncConfig" request
     And body with value {"data": {"attributes": {"aws": {"aws_account_id": "123456789012", "destination_bucket_name": "my-inventory-bucket", "destination_bucket_region": "us-east-1", "destination_prefix": "logs/"}, "azure": {"client_id": "11111111-1111-1111-1111-111111111111", "container": "inventory-container", "resource_group": "my-resource-group", "storage_account": "mystorageaccount", "subscription_id": "33333333-3333-3333-3333-333333333333", "tenant_id": "22222222-2222-2222-2222-222222222222"}, "gcp": {"destination_bucket_name": "my-inventory-reports", "project_id": "my-gcp-project", "service_account_email": "reader@my-gcp-project.iam.gserviceaccount.com", "source_bucket_name": "my-monitored-bucket"}}, "id": "aws", "type": "cloud_provider"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/storage-management
+  @generated @skip @team:ddoghq/storage-management
   Scenario: Enable Storage Management for a bucket returns "OK" response
     Given new "UpsertSyncConfig" request
     And body with value {"data": {"attributes": {"aws": {"aws_account_id": "123456789012", "destination_bucket_name": "my-inventory-bucket", "destination_bucket_region": "us-east-1", "destination_prefix": "logs/"}, "azure": {"client_id": "11111111-1111-1111-1111-111111111111", "container": "inventory-container", "resource_group": "my-resource-group", "storage_account": "mystorageaccount", "subscription_id": "33333333-3333-3333-3333-333333333333", "tenant_id": "22222222-2222-2222-2222-222222222222"}, "gcp": {"destination_bucket_name": "my-inventory-reports", "project_id": "my-gcp-project", "service_account_email": "reader@my-gcp-project.iam.gserviceaccount.com", "source_bucket_name": "my-monitored-bucket"}}, "id": "aws", "type": "cloud_provider"}}
diff --git a/features/v2/synthetics.feature b/features/v2/synthetics.feature
index f43e2e2c997e..8be0ca8c284a 100644
--- a/features/v2/synthetics.feature
+++ b/features/v2/synthetics.feature
@@ -17,7 +17,7 @@ Feature: Synthetics
     And a valid "appKeyAuth" key in the system
     And an instance of "Synthetics" API
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Abort a multipart upload of a test file returns "API error response." response
     Given new "AbortTestFileMultipartUpload" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Abort a multipart upload of a test file returns "No Content" response
     Given new "AbortTestFileMultipartUpload" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -33,7 +33,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Add a test to a Synthetics downtime returns "Bad Request" response
     Given new "AddTestToSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -41,7 +41,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Add a test to a Synthetics downtime returns "Not Found" response
     Given new "AddTestToSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -49,7 +49,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Add a test to a Synthetics downtime returns "OK" response
     Given new "AddTestToSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -57,35 +57,35 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Bulk delete suites returns "API error response." response
     Given new "DeleteSyntheticsSuites" request
     And body with value {"data": {"attributes": {"public_ids": [""]}, "type": "delete_suites_request"}}
     When the request is sent
     Then the response status is 400 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Bulk delete suites returns "OK" response
     Given new "DeleteSyntheticsSuites" request
     And body with value {"data": {"attributes": {"public_ids": [""]}, "type": "delete_suites_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Bulk delete tests returns "API error response." response
     Given new "DeleteSyntheticsTests" request
     And body with value {"data": {"attributes": {"public_ids": ["abc-def-123"]}, "type": "delete_tests_request"}}
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Bulk delete tests returns "OK" response
     Given new "DeleteSyntheticsTests" request
     And body with value {"data": {"attributes": {"public_ids": ["abc-def-123"]}, "type": "delete_tests_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Complete a multipart upload of a test file returns "API error response." response
     Given new "CompleteTestFileMultipartUpload" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -93,7 +93,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Complete a multipart upload of a test file returns "No Content" response
     Given new "CompleteTestFileMultipartUpload" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -101,70 +101,70 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a Network Path test returns "API error response." response
     Given new "CreateSyntheticsNetworkTest" request
     And body with value {"data": {"attributes": {"config": {"assertions": [{"operator": "lessThan", "property": "avg", "target": 500, "type": "latency"}], "request": {"e2e_queries": 50, "host": "", "max_ttl": 30, "port": 443, "tcp_method": "prefer_sack", "traceroute_queries": 3}}, "locations": ["aws:us-east-1", "agent:my-agent-name"], "message": "Network Path test notification", "name": "Example Network Path test", "options": {"monitor_options": {"notification_preset_name": "show_all"}, "restricted_roles": ["xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"], "retry": {}, "scheduling": {"timeframes": [{"day": 1, "from": "07:00", "to": "16:00"}, {"day": 3, "from": "07:00", "to": "16:00"}], "timezone": "America/New_York"}}, "status": "live", "subtype": "tcp", "tags": ["env:production"], "type": "network"}, "type": "network"}}
     When the request is sent
     Then the response status is 400 API error response.
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a Network Path test returns "OK" response
     Given new "CreateSyntheticsNetworkTest" request
     And body with value {"data": {"attributes": {"config": {"assertions": [{"operator": "lessThan", "property": "avg", "target": 500, "type": "latency"}], "request": {"host": "example.com", "port": 443, "tcp_method": "prefer_sack", "max_ttl": 30, "e2e_queries": 50, "traceroute_queries": 3}}, "locations": ["aws:us-east-1", "agent:my-agent-name"], "message": "Network Path test notification", "name": "Example Network Path test", "options": {"tick_every": 60}, "status": "live", "subtype": "tcp", "tags": ["env:production"], "type": "network"}, "type": "network"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a Synthetics downtime returns "Bad Request" response
     Given new "CreateSyntheticsDowntime" request
     And body with value {"data": {"attributes": {"isEnabled": true, "name": "Weekly maintenance", "testIds": ["abc-def-123"], "timeSlots": [{"duration": 3600, "start": {"day": 15, "hour": 10, "minute": 30, "month": 1, "year": 2024}, "timezone": "Europe/Paris"}]}, "type": "downtime"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a Synthetics downtime returns "Created" response
     Given new "CreateSyntheticsDowntime" request
     And body with value {"data": {"attributes": {"isEnabled": true, "name": "Weekly maintenance", "testIds": ["abc-def-123"], "timeSlots": [{"duration": 3600, "start": {"day": 15, "hour": 10, "minute": 30, "month": 1, "year": 2024}, "timezone": "Europe/Paris"}]}, "type": "downtime"}}
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a test suite returns "API error response." response
     Given new "CreateSyntheticsSuite" request
     And body with value {"data": {"attributes": {"message": "Notification message", "name": "Example suite name", "options": {}, "tags": ["env:production"], "tests": [{"alerting_criticality": "critical", "public_id": ""}], "type": "suite"}, "type": "suites"}}
     When the request is sent
     Then the response status is 400 API error response.
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Create a test suite returns "OK" response
     Given new "CreateSyntheticsSuite" request
     And body with value {"data": {"attributes": {"message": "Notification message", "name": "Example suite name", "options": {}, "tags": ["env:production"], "tests": [], "type": "suite"}, "type": "suites"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a Synthetics downtime returns "Bad Request" response
     Given new "DeleteSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a Synthetics downtime returns "No Content" response
     Given new "DeleteSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Delete a Synthetics downtime returns "Not Found" response
     Given new "DeleteSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a Network Path test returns "API error response." response
     Given new "UpdateSyntheticsNetworkTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -172,7 +172,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a Network Path test returns "OK" response
     Given new "UpdateSyntheticsNetworkTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -180,7 +180,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a test suite returns "API error response." response
     Given new "EditSyntheticsSuite" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -188,7 +188,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Edit a test suite returns "OK" response
     Given new "EditSyntheticsSuite" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -196,42 +196,42 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Network Path test returns "API error response." response
     Given new "GetSyntheticsNetworkTest" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @replay-only @team:DataDog/synthetics-orchestrating-managing
+  @replay-only @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Network Path test returns "OK" response
     Given new "GetSyntheticsNetworkTest" request
     And request contains "public_id" parameter with value "c7a-uwa-wn2"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Synthetics downtime returns "Bad Request" response
     Given new "GetSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Synthetics downtime returns "Not Found" response
     Given new "GetSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a Synthetics downtime returns "OK" response
     Given new "GetSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test result returns "API error response." response
     Given new "GetSyntheticsBrowserTestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -239,7 +239,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test result returns "OK" response
     Given new "GetSyntheticsBrowserTestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -247,35 +247,35 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test's latest results returns "API error response." response
     Given new "ListSyntheticsBrowserTestLatestResults" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a browser test's latest results returns "OK" response
     Given new "ListSyntheticsBrowserTestLatestResults" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a fast test result returns "API error response." response
     Given new "GetSyntheticsFastTestResult" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a fast test result returns "OK" response
     Given new "GetSyntheticsFastTestResult" request
     And request contains "id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a presigned URL for downloading a test file returns "API error response." response
     Given new "GetTestFileDownloadUrl" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -283,7 +283,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a presigned URL for downloading a test file returns "OK" response
     Given new "GetTestFileDownloadUrl" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -291,7 +291,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a specific version of a test returns "API error response." response
     Given new "GetSyntheticsTestVersion" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -299,7 +299,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a specific version of a test returns "OK" response
     Given new "GetSyntheticsTestVersion" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -307,21 +307,21 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a suite returns "API error response." response
     Given new "GetSyntheticsSuite" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a suite returns "OK" response
     Given new "GetSyntheticsSuite" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test result returns "API error response." response
     Given new "GetSyntheticsTestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -329,7 +329,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test result returns "OK" response
     Given new "GetSyntheticsTestResult" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -337,56 +337,56 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test's latest results returns "API error response." response
     Given new "ListSyntheticsTestLatestResults" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get a test's latest results returns "OK" response
     Given new "ListSyntheticsTestLatestResults" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get available subtests for a multistep test returns "OK" response
     Given new "GetApiMultistepSubtests" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get parent suites for a test returns "API error response." response
     Given new "GetTestParentSuites" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get parent suites for a test returns "OK" response
     Given new "GetTestParentSuites" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get parent tests for a subtest returns "API error response." response
     Given new "GetApiMultistepSubtestParents" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get parent tests for a subtest returns "OK" response
     Given new "GetApiMultistepSubtestParents" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get presigned URLs for uploading a test file returns "API error response." response
     Given new "GetTestFileMultipartPresignedUrls" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -394,7 +394,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get presigned URLs for uploading a test file returns "OK" response
     Given new "GetTestFileMultipartPresignedUrls" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -402,39 +402,39 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get the on-demand concurrency cap returns "OK" response
     Given new "GetOnDemandConcurrencyCap" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get version history of a test returns "API error response." response
     Given new "ListSyntheticsTestVersions" request
     And request contains "public_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Get version history of a test returns "OK" response
     Given new "ListSyntheticsTestVersions" 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/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: List Synthetics downtimes returns "Bad Request" response
     Given new "ListSyntheticsDowntimes" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: List Synthetics downtimes returns "OK" response
     Given new "ListSyntheticsDowntimes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a global variable returns "Bad Request" response
     Given new "PatchGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
@@ -442,7 +442,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a global variable returns "Not Found" response
     Given new "PatchGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
@@ -450,7 +450,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a global variable returns "OK" response
     Given new "PatchGlobalVariable" request
     And request contains "variable_id" parameter from "REPLACE.ME"
@@ -458,7 +458,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a test suite returns "API error response." response
     Given new "PatchTestSuite" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -466,7 +466,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Patch a test suite returns "OK" response
     Given new "PatchTestSuite" request
     And request contains "public_id" parameter from "REPLACE.ME"
@@ -474,21 +474,21 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Poll for test results returns "API error response." response
     Given new "PollSyntheticsTestResults" request
     And request contains "result_ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Poll for test results returns "OK" response
     Given new "PollSyntheticsTestResults" request
     And request contains "result_ids" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Remove a test from a Synthetics downtime returns "Bad Request" response
     Given new "RemoveTestFromSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -496,7 +496,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Remove a test from a Synthetics downtime returns "Not Found" response
     Given new "RemoveTestFromSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -504,7 +504,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Remove a test from a Synthetics downtime returns "OK" response
     Given new "RemoveTestFromSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -512,7 +512,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Save new value for on-demand concurrency cap returns "OK" response
     Given new "SetOnDemandConcurrencyCap" request
     And body with value {"on_demand_concurrency_cap": 20}
@@ -520,25 +520,25 @@ Feature: Synthetics
     Then the response status is 200 OK
     And the response "data.attributes.on_demand_concurrency_cap" is equal to 20
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Search Synthetics suites returns "OK" response
     Given new "SearchSuites" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Search test suites returns "API error response." response
     Given new "SearchSuites" request
     When the request is sent
     Then the response status is 400 API error response.
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Search test suites returns "OK" response
     Given new "SearchSuites" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Update a Synthetics downtime returns "Bad Request" response
     Given new "UpdateSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -546,7 +546,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Update a Synthetics downtime returns "Not Found" response
     Given new "UpdateSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
@@ -554,7 +554,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/synthetics-orchestrating-managing
+  @generated @skip @team:ddoghq/synthetics-orchestrating-managing
   Scenario: Update a Synthetics downtime returns "OK" response
     Given new "UpdateSyntheticsDowntime" request
     And request contains "downtime_id" parameter from "REPLACE.ME"
diff --git a/features/v2/tag_rules.feature b/features/v2/tag_rules.feature
index ad456e68c011..1d70a47958a2 100644
--- a/features/v2/tag_rules.feature
+++ b/features/v2/tag_rules.feature
@@ -12,7 +12,7 @@ Feature: Tag Rules
     And a valid "appKeyAuth" key in the system
     And an instance of "TagRules" API
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Create a tag rule returns "Bad Request" response
     Given operation "CreateTagRule" enabled
     And new "CreateTagRule" request
@@ -20,7 +20,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Create a tag rule returns "Conflict" response
     Given operation "CreateTagRule" enabled
     And new "CreateTagRule" request
@@ -28,7 +28,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Create a tag rule returns "Created" response
     Given operation "CreateTagRule" enabled
     And new "CreateTagRule" request
@@ -36,7 +36,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Delete a tag rule returns "Bad Request" response
     Given operation "DeleteTagRule" enabled
     And new "DeleteTagRule" request
@@ -44,7 +44,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Delete a tag rule returns "No Content" response
     Given operation "DeleteTagRule" enabled
     And new "DeleteTagRule" request
@@ -52,7 +52,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Delete a tag rule returns "Not Found" response
     Given operation "DeleteTagRule" enabled
     And new "DeleteTagRule" request
@@ -60,7 +60,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule compliance score returns "Bad Request" response
     Given operation "GetTagRuleScore" enabled
     And new "GetTagRuleScore" request
@@ -68,7 +68,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule compliance score returns "Not Found" response
     Given operation "GetTagRuleScore" enabled
     And new "GetTagRuleScore" request
@@ -76,7 +76,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule compliance score returns "OK" response
     Given operation "GetTagRuleScore" enabled
     And new "GetTagRuleScore" request
@@ -84,7 +84,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule returns "Bad Request" response
     Given operation "GetTagRule" enabled
     And new "GetTagRule" request
@@ -92,7 +92,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule returns "Not Found" response
     Given operation "GetTagRule" enabled
     And new "GetTagRule" request
@@ -100,7 +100,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Get a tag rule returns "OK" response
     Given operation "GetTagRule" enabled
     And new "GetTagRule" request
@@ -108,21 +108,21 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List tag rules returns "Bad Request" response
     Given operation "ListTagRules" enabled
     And new "ListTagRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: List tag rules returns "OK" response
     Given operation "ListTagRules" enabled
     And new "ListTagRules" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a tag rule returns "Bad Request" response
     Given operation "UpdateTagRule" enabled
     And new "UpdateTagRule" request
@@ -131,7 +131,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a tag rule returns "Not Found" response
     Given operation "UpdateTagRule" enabled
     And new "UpdateTagRule" request
@@ -140,7 +140,7 @@ Feature: Tag Rules
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/aaa-governance-console
+  @generated @skip @team:ddoghq/aaa-governance-console
   Scenario: Update a tag rule returns "OK" response
     Given operation "UpdateTagRule" enabled
     And new "UpdateTagRule" request
diff --git a/features/v2/teams.feature b/features/v2/teams.feature
index b21078ebf328..4133b1f46ebf 100644
--- a/features/v2/teams.feature
+++ b/features/v2/teams.feature
@@ -9,7 +9,7 @@ Feature: Teams
     And a valid "appKeyAuth" key in the system
     And an instance of "Teams" API
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Add a member team returns "API error response." response
     Given operation "AddMemberTeam" enabled
     And new "AddMemberTeam" request
@@ -18,7 +18,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Add a member team returns "Added" response
     Given operation "AddMemberTeam" enabled
     And new "AddMemberTeam" request
@@ -27,7 +27,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 Added
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Add a user to a team returns "API error response." response
     Given new "CreateTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -38,7 +38,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Add a user to a team returns "Represents a user's association to a team" response
     Given new "CreateTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -50,7 +50,7 @@ Feature: Teams
     And the response "data.attributes.role" is equal to "admin"
     And the response "data.relationships.user.data.id" is equal to "{{ user.data.id }}"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team hierarchy link returns "Conflict" response
     Given new "AddTeamHierarchyLink" request
     And there is a valid "dd_team" in the system
@@ -60,7 +60,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team hierarchy link returns "OK" response
     Given new "AddTeamHierarchyLink" request
     And there is a valid "dd_team" in the system
@@ -69,7 +69,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team link returns "API error response." response
     Given new "CreateTeamLink" request
     And there is a valid "dd_team" in the system
@@ -78,7 +78,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 422 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team link returns "OK" response
     Given new "CreateTeamLink" request
     And there is a valid "dd_team" in the system
@@ -90,7 +90,7 @@ Feature: Teams
     And the response "data.attributes.url" is equal to "https://example.com"
     And the response "data.attributes.position" is equal to 0
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team returns "API error response." response
     Given new "CreateTeam" request
     And there is a valid "dd_team" in the system
@@ -98,7 +98,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team returns "CREATED" response
     Given new "CreateTeam" request
     And body with value {"data": {"attributes": {"handle": "test-handle-{{ unique_hash }}", "name": "test-name-{{ unique_hash }}"}, "relationships": {"users": {"data": []}}, "type": "team"}}
@@ -108,7 +108,7 @@ Feature: Teams
     And the response "data.attributes.handle" is equal to "test-handle-{{ unique_hash }}"
     And the response "data.attributes.name" is equal to "test-name-{{ unique_hash }}"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create a team with V2 fields returns "CREATED" response
     Given new "CreateTeam" request
     And body with value {"data": {"attributes": {"handle": "test-handle-{{ unique_hash }}","name": "test-name-{{ unique_hash }}", "avatar": "🥑", "banner": 7, "visible_modules": ["m1","m2"], "hidden_modules": ["m3"]}, "type": "team"}}
@@ -125,14 +125,14 @@ Feature: Teams
     And the response "data.attributes.hidden_modules" has length 1
     And the response "data.attributes.hidden_modules" array contains value "m3"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create team connections returns "Bad Request" response
     Given new "CreateTeamConnections" request
     And body with value {"data": []}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create team connections returns "Conflict" response
     Given new "CreateTeamConnections" request
     And there is a valid "dd_team" in the system
@@ -141,7 +141,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create team connections returns "Created" response
     Given new "CreateTeamConnections" request
     And there is a valid "dd_team" in the system
@@ -154,7 +154,7 @@ Feature: Teams
     And the response "data[0].relationships.connected_team.data.id" is equal to "@MyGitHubAccount/my-team-name"
     And the response "data[0].type" is equal to "team_connection"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create team notification rule returns "API error response." response
     Given new "CreateTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -164,7 +164,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Create team notification rule returns "OK" response
     Given new "CreateTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -173,14 +173,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 201 Created
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Delete team connections returns "Bad Request" response
     Given new "DeleteTeamConnections" request
     And body with value {"data": [{"id": "", "type": "team_connection"}]}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Delete team connections returns "No Content" response
     Given new "DeleteTeamConnections" request
     And there is a valid "dd_team" in the system
@@ -189,14 +189,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @skip @team:DataDog/aaa-omg
+  @skip @team:ddoghq/aaa-omg
   Scenario: Delete team connections returns "Not Found" response
     Given new "DeleteTeamConnections" request
     And body with value {"data": [{"id": "00000000-0000-dead-beef-000000000000", "type": "team_connection"}]}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Delete team notification rule returns "API error response." response
     Given new "DeleteTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -206,7 +206,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Delete team notification rule returns "No Content" response
     Given new "DeleteTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -216,14 +216,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team hierarchy link returns "API error response." response
     Given new "GetTeamHierarchyLink" request
     And request contains "link_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team hierarchy link returns "OK" response
     Given new "GetTeamHierarchyLink" request
     And there is a valid "dd_team" in the system
@@ -238,7 +238,7 @@ Feature: Teams
     And the response "included" has item with field "id" with value "{{ dd_team.data.id }}"
     And the response "included" has item with field "id" with value "{{ dd_team_2.data.id }}"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team link returns "API error response." response
     Given new "GetTeamLink" request
     And there is a valid "dd_team" in the system
@@ -247,7 +247,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team link returns "OK" response
     Given new "GetTeamLink" request
     And there is a valid "dd_team" in the system
@@ -257,14 +257,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team returns "API error response." response
     Given new "GetTeam" request
     And request contains "team_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get a team returns "OK" response
     Given new "GetTeam" request
     And there is a valid "dd_team" in the system
@@ -272,7 +272,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Get all member teams returns "API error response." response
     Given operation "ListMemberTeams" enabled
     And new "ListMemberTeams" request
@@ -280,7 +280,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Get all member teams returns "OK" response
     Given operation "ListMemberTeams" enabled
     And new "ListMemberTeams" request
@@ -288,7 +288,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg @with-pagination
+  @generated @skip @team:ddoghq/aaa-omg @with-pagination
   Scenario: Get all member teams returns "OK" response with pagination
     Given operation "ListMemberTeams" enabled
     And new "ListMemberTeams" request
@@ -296,7 +296,7 @@ Feature: Teams
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get all teams returns "OK" response
     Given new "ListTeams" request
     And there is a valid "dd_team" in the system
@@ -304,7 +304,7 @@ Feature: Teams
     Then the response status is 200 OK
     And the response "data" has item with field "id" with value "{{ dd_team.data.id }}"
 
-  @replay-only @skip-validation @team:DataDog/aaa-omg @with-pagination
+  @replay-only @skip-validation @team:ddoghq/aaa-omg @with-pagination
   Scenario: Get all teams returns "OK" response with pagination
     Given new "ListTeams" request
     And request contains "page[size]" parameter with value 2
@@ -312,7 +312,7 @@ Feature: Teams
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get all teams with fields_team parameter returns "OK" response
     Given new "ListTeams" request
     And there is a valid "dd_team" in the system
@@ -323,14 +323,14 @@ Feature: Teams
     And the response "data[0].attributes" has field "name"
     And the response "data[0].attributes" has field "handle"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get links for a team returns "API error response." response
     Given new "GetTeamLinks" request
     And request contains "team_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get links for a team returns "OK" response
     Given new "GetTeamLinks" request
     And there is a valid "dd_team" in the system
@@ -338,14 +338,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get permission settings for a team returns "API error response." response
     Given new "GetTeamPermissionSettings" request
     And request contains "team_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get permission settings for a team returns "OK" response
     Given new "GetTeamPermissionSettings" request
     And there is a valid "dd_team" in the system
@@ -353,7 +353,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team hierarchy links returns "OK" response
     Given new "ListTeamHierarchyLinks" request
     And there is a valid "dd_team" in the system
@@ -372,20 +372,20 @@ Feature: Teams
     And the response "included" has item with field "id" with value "{{ dd_team.data.id }}"
     And the response "included" has item with field "id" with value "{{ dd_team_2.data.id }}"
 
-  @generated @skip @team:DataDog/aaa-omg @with-pagination
+  @generated @skip @team:ddoghq/aaa-omg @with-pagination
   Scenario: Get team hierarchy links returns "OK" response with pagination
     Given new "ListTeamHierarchyLinks" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team memberships returns "API error response." response
     Given new "GetTeamMemberships" request
     And request contains "team_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team memberships returns "Represents a user's association to a team" response
     Given new "GetTeamMemberships" request
     And there is a valid "dd_team" in the system
@@ -393,7 +393,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 Represents a user's association to a team
 
-  @replay-only @skip-validation @team:DataDog/aaa-omg @with-pagination
+  @replay-only @skip-validation @team:ddoghq/aaa-omg @with-pagination
   Scenario: Get team memberships returns "Represents a user's association to a team" response with pagination
     Given new "GetTeamMemberships" request
     And request contains "team_id" parameter with value "2e06bf2c-193b-41d4-b3c2-afccc080458f"
@@ -402,7 +402,7 @@ Feature: Teams
     Then the response status is 200 OK
     And the response has 3 items
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team notification rule returns "API error response." response
     Given new "GetTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -412,7 +412,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team notification rule returns "OK" response
     Given new "GetTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -422,14 +422,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Get team notification rules returns "API error response." response
     Given new "GetTeamNotificationRules" request
     And request contains "team_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team notification rules returns "OK" response
     Given new "GetTeamNotificationRules" request
     And there is a valid "dd_team" in the system
@@ -439,21 +439,21 @@ Feature: Teams
     Then the response status is 200 OK
     And the response "data" has length 1
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get team sync configurations returns "OK" response
     Given new "GetTeamSync" request
     And request contains "filter[source]" parameter with value "github"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Get user memberships returns "API error response." response
     Given new "GetUserMemberships" request
     And request contains "user_uuid" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Get user memberships returns "Represents a user's association to a team" response
     Given new "GetUserMemberships" request
     And there is a valid "user" in the system
@@ -462,27 +462,27 @@ Feature: Teams
     Then the response status is 200 Represents a user's association to a team
     And the response "data" has length 0
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Link Teams with GitHub Teams returns "No Content" response
     Given new "SyncTeams" request
     And body with value {"data": {"attributes": {"source": "github", "type": "link", "selection_state": [{"external_id": {"type": "organization", "value": "1"}}]}, "type": "team_sync_bulk"}}
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Link Teams with GitHub Teams returns "OK" response
     Given new "SyncTeams" request
     And body with value {"data": {"attributes": {"source": "github", "type": "link"}, "type": "team_sync_bulk"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: List team connections returns "Bad Request" response
     Given new "ListTeamConnections" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: List team connections returns "OK" response
     Given new "ListTeamConnections" request
     And there is a valid "dd_team" in the system
@@ -491,13 +491,13 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg @with-pagination
+  @generated @skip @team:ddoghq/aaa-omg @with-pagination
   Scenario: List team connections returns "OK" response with pagination
     Given new "ListTeamConnections" request
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: List team connections with filters returns "OK" response
     Given new "ListTeamConnections" request
     And there is a valid "dd_team" in the system
@@ -507,7 +507,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Remove a member team returns "API error response." response
     Given operation "RemoveMemberTeam" enabled
     And new "RemoveMemberTeam" request
@@ -516,7 +516,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @generated @skip @team:DataDog/aaa-omg
+  @generated @skip @team:ddoghq/aaa-omg
   Scenario: Remove a member team returns "No Content" response
     Given operation "RemoveMemberTeam" enabled
     And new "RemoveMemberTeam" request
@@ -525,14 +525,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team hierarchy link returns "API error response." response
     Given new "RemoveTeamHierarchyLink" request
     And request contains "link_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team hierarchy link returns "No Content" response
     Given new "RemoveTeamHierarchyLink" request
     And there is a valid "dd_team" in the system
@@ -542,7 +542,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team link returns "API error response." response
     Given new "DeleteTeamLink" request
     And there is a valid "dd_team" in the system
@@ -551,7 +551,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team link returns "No Content" response
     Given new "DeleteTeamLink" request
     And there is a valid "dd_team" in the system
@@ -561,14 +561,14 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team returns "API error response." response
     Given new "DeleteTeam" request
     And request contains "team_id" parameter with value "REPLACE.ME"
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a team returns "No Content" response
     Given new "DeleteTeam" request
     And there is a valid "dd_team" in the system
@@ -576,7 +576,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a user from a team returns "API error response." response
     Given new "DeleteTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -585,7 +585,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Remove a user from a team returns "No Content" response
     Given new "DeleteTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -596,7 +596,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 204 No Content
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a team link returns "API error response." response
     Given new "UpdateTeamLink" request
     And there is a valid "dd_team" in the system
@@ -606,7 +606,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a team link returns "OK" response
     Given new "UpdateTeamLink" request
     And there is a valid "dd_team" in the system
@@ -621,7 +621,7 @@ Feature: Teams
     And the response "data.attributes.label" is equal to "New Label"
     And the response "data.attributes.url" is equal to "https://example.com"
 
-  @skip @team:DataDog/aaa-omg
+  @skip @team:ddoghq/aaa-omg
   Scenario: Update a team returns "API error response." response
     Given new "UpdateTeam" request
     And there is a valid "dd_team" in the system
@@ -631,7 +631,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a team returns "OK" response
     Given new "UpdateTeam" request
     And there is a valid "dd_team" in the system
@@ -647,7 +647,7 @@ Feature: Teams
     And the response "data.attributes.hidden_modules" is equal to ["m3"]
     And the response "data.attributes.visible_modules" is equal to ["m1", "m2"]
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a team with partial update returns "OK" response
     Given new "UpdateTeam" request
     And there is a valid "dd_team" in the system
@@ -658,7 +658,7 @@ Feature: Teams
     And the response "data.attributes.name" is equal to "{{dd_team.data.attributes.name}} updated"
     And the response "data.attributes.handle" is equal to "{{dd_team.data.attributes.handle}}"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a user's membership attributes on a team returns "API error response." response
     Given new "UpdateTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -668,7 +668,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a user's membership attributes on a team returns "OK" response
     Given new "UpdateTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -682,7 +682,7 @@ Feature: Teams
     And the response "data.attributes.role" is equal to "admin"
     And the response "data.relationships.user.data.id" is equal to "{{ user.data.id }}"
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update a user's membership attributes on a team with invalid role returns "API error response." response
     Given new "UpdateTeamMembership" request
     And there is a valid "dd_team" in the system
@@ -694,7 +694,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 400 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update permission setting for team returns "API error response." response
     Given new "UpdateTeamPermissionSetting" request
     And there is a valid "dd_team" in the system
@@ -704,7 +704,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 404 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update permission setting for team returns "OK" response
     Given new "UpdateTeamPermissionSetting" request
     And there is a valid "dd_team" in the system
@@ -714,7 +714,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update team notification rule returns "API error response." response
     Given new "UpdateTeamNotificationRule" request
     And there is a valid "dd_team" in the system
@@ -725,7 +725,7 @@ Feature: Teams
     When the request is sent
     Then the response status is 409 API error response.
 
-  @team:DataDog/aaa-omg
+  @team:ddoghq/aaa-omg
   Scenario: Update team notification rule returns "OK" response
     Given new "UpdateTeamNotificationRule" request
     And there is a valid "dd_team" in the system
diff --git a/features/v2/test_optimization.feature b/features/v2/test_optimization.feature
index 342eda12e8fb..a335d207cf9a 100644
--- a/features/v2/test_optimization.feature
+++ b/features/v2/test_optimization.feature
@@ -9,49 +9,49 @@ Feature: Test Optimization
     And a valid "appKeyAuth" key in the system
     And an instance of "TestOptimization" API
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete Test Optimization service settings returns "Bad Request" response
     Given new "DeleteTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_delete_service_settings_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete Test Optimization service settings returns "No Content" response
     Given new "DeleteTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_delete_service_settings_request"}}
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Delete Test Optimization service settings returns "Not Found" response
     Given new "DeleteTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_delete_service_settings_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Flaky Tests Management policies returns "Bad Request" response
     Given new "GetFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_get_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Flaky Tests Management policies returns "Not Found" response
     Given new "GetFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_get_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Flaky Tests Management policies returns "OK" response
     Given new "GetFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_get_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get Flaky Tests Management policies with empty repository_id returns bad request
     Given operation "GetFlakyTestsManagementPolicies" enabled
     And new "GetFlakyTestsManagementPolicies" request
@@ -59,28 +59,28 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings returns "Bad Request" response
     Given new "GetTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_get_service_settings_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings returns "Not Found" response
     Given new "GetTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_get_service_settings_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings returns "OK" response
     Given new "GetTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"env": "prod", "repository_id": "github.com/datadog/shopist", "service_name": "shopist"}, "type": "test_optimization_get_service_settings_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings with empty env returns bad request
     Given operation "GetTestOptimizationServiceSettings" enabled
     And new "GetTestOptimizationServiceSettings" request
@@ -88,7 +88,7 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings with empty repository_id returns bad request
     Given operation "GetTestOptimizationServiceSettings" enabled
     And new "GetTestOptimizationServiceSettings" request
@@ -96,7 +96,7 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Get Test Optimization service settings with empty service_name returns bad request
     Given operation "GetTestOptimizationServiceSettings" enabled
     And new "GetTestOptimizationServiceSettings" request
@@ -104,14 +104,14 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Search flaky tests returns "Bad Request" response
     Given new "SearchFlakyTests" request
     And body with value {"data": {"attributes": {"filter": {"include_history": true, "query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Search flaky tests returns "Bad Request" response with invalid limit
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
@@ -119,14 +119,14 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Search flaky tests returns "OK" response
     Given new "SearchFlakyTests" request
     And body with value {"data": {"attributes": {"filter": {"include_history": true, "query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @replay-only @skip @skip-validation @team:DataDog/ci-app-backend @with-pagination
+  @replay-only @skip @skip-validation @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Search flaky tests returns "OK" response with filtered query
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
@@ -134,7 +134,7 @@ Feature: Test Optimization
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Search flaky tests returns "OK" response with history
     Given operation "SearchFlakyTests" enabled
     And new "SearchFlakyTests" request
@@ -148,35 +148,35 @@ Feature: Test Optimization
     And the response "data[0].attributes.history[0]" has field "policy_id"
     And the response "data[0].attributes.history[0]" has field "policy_meta"
 
-  @generated @skip @team:DataDog/ci-app-backend @with-pagination
+  @generated @skip @team:ddoghq/ci-app-backend @with-pagination
   Scenario: Search flaky tests returns "OK" response with pagination
     Given new "SearchFlakyTests" request
     And body with value {"data": {"attributes": {"filter": {"include_history": true, "query": "flaky_test_state:active @git.repository.id_v2:\"github.com/datadog/shopist\""}, "page": {"cursor": "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", "limit": 25}, "sort": "failure_rate"}, "type": "search_flaky_tests_request"}}
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Flaky Tests Management policies returns "Bad Request" response
     Given new "UpdateFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"attempt_to_fix": {"retries": 3}, "disabled": {"auto_disable_rule": {"enabled": false, "status": "active", "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": false, "failure_rate_rule": {"branches": [], "enabled": false, "min_runs": 10, "status": "active", "threshold": 0.5}}, "quarantined": {"auto_quarantine_rule": {"enabled": true, "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": true, "failure_rate_rule": {"branches": ["main"], "enabled": true, "min_runs": 10, "threshold": 0.5}}, "repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_update_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Flaky Tests Management policies returns "Not Found" response
     Given new "UpdateFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"attempt_to_fix": {"retries": 3}, "disabled": {"auto_disable_rule": {"enabled": false, "status": "active", "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": false, "failure_rate_rule": {"branches": [], "enabled": false, "min_runs": 10, "status": "active", "threshold": 0.5}}, "quarantined": {"auto_quarantine_rule": {"enabled": true, "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": true, "failure_rate_rule": {"branches": ["main"], "enabled": true, "min_runs": 10, "threshold": 0.5}}, "repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_update_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Flaky Tests Management policies returns "OK" response
     Given new "UpdateFlakyTestsManagementPolicies" request
     And body with value {"data": {"attributes": {"attempt_to_fix": {"retries": 3}, "disabled": {"auto_disable_rule": {"enabled": false, "status": "active", "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": false, "failure_rate_rule": {"branches": [], "enabled": false, "min_runs": 10, "status": "active", "threshold": 0.5}}, "quarantined": {"auto_quarantine_rule": {"enabled": true, "window_seconds": 3600}, "branch_rule": {"branches": ["main"], "enabled": true, "excluded_branches": [], "excluded_test_services": []}, "enabled": true, "failure_rate_rule": {"branches": ["main"], "enabled": true, "min_runs": 10, "threshold": 0.5}}, "repository_id": "github.com/datadog/shopist"}, "type": "test_optimization_update_flaky_tests_management_policies_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Update Flaky Tests Management policies with empty repository_id returns bad request
     Given operation "UpdateFlakyTestsManagementPolicies" enabled
     And new "UpdateFlakyTestsManagementPolicies" request
@@ -184,28 +184,28 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Test Optimization service settings returns "Bad Request" response
     Given new "UpdateTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"auto_test_retries_enabled": false, "auto_test_retries_enabled_inherit": false, "code_coverage_enabled": false, "code_coverage_enabled_inherit": false, "early_flake_detection_enabled": false, "early_flake_detection_enabled_inherit": false, "env": "prod", "failed_test_replay_enabled": false, "failed_test_replay_enabled_inherit": false, "pr_comments_enabled": false, "repository_id": "github.com/datadog/shopist", "service_name": "shopist", "test_impact_analysis_enabled": true, "test_impact_analysis_enabled_inherit": true}, "type": "test_optimization_update_service_settings_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Test Optimization service settings returns "Not Found" response
     Given new "UpdateTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"auto_test_retries_enabled": false, "auto_test_retries_enabled_inherit": false, "code_coverage_enabled": false, "code_coverage_enabled_inherit": false, "early_flake_detection_enabled": false, "early_flake_detection_enabled_inherit": false, "env": "prod", "failed_test_replay_enabled": false, "failed_test_replay_enabled_inherit": false, "pr_comments_enabled": false, "repository_id": "github.com/datadog/shopist", "service_name": "shopist", "test_impact_analysis_enabled": true, "test_impact_analysis_enabled_inherit": true}, "type": "test_optimization_update_service_settings_request"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update Test Optimization service settings returns "OK" response
     Given new "UpdateTestOptimizationServiceSettings" request
     And body with value {"data": {"attributes": {"auto_test_retries_enabled": false, "auto_test_retries_enabled_inherit": false, "code_coverage_enabled": false, "code_coverage_enabled_inherit": false, "early_flake_detection_enabled": false, "early_flake_detection_enabled_inherit": false, "env": "prod", "failed_test_replay_enabled": false, "failed_test_replay_enabled_inherit": false, "pr_comments_enabled": false, "repository_id": "github.com/datadog/shopist", "service_name": "shopist", "test_impact_analysis_enabled": true, "test_impact_analysis_enabled_inherit": true}, "type": "test_optimization_update_service_settings_request"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @skip @team:DataDog/ci-app-backend
+  @skip @team:ddoghq/ci-app-backend
   Scenario: Update Test Optimization service settings with empty repository_id returns bad request
     Given operation "UpdateTestOptimizationServiceSettings" enabled
     And new "UpdateTestOptimizationServiceSettings" request
@@ -213,14 +213,14 @@ Feature: Test Optimization
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update flaky test states returns "Bad Request" response
     Given new "UpdateFlakyTests" request
     And body with value {"data": {"attributes": {"tests": [{"id": "4eb1887a8adb1847", "new_state": "active"}]}, "type": "update_flaky_test_state_request"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/ci-app-backend
+  @generated @skip @team:ddoghq/ci-app-backend
   Scenario: Update flaky test states returns "OK" response
     Given new "UpdateFlakyTests" request
     And body with value {"data": {"attributes": {"tests": [{"id": "4eb1887a8adb1847", "new_state": "active"}]}, "type": "update_flaky_test_state_request"}}
diff --git a/features/v2/threat_intelligence.feature b/features/v2/threat_intelligence.feature
index 62542a9cea39..3f7744e84607 100644
--- a/features/v2/threat_intelligence.feature
+++ b/features/v2/threat_intelligence.feature
@@ -10,14 +10,14 @@ Feature: Threat Intelligence
     And operation "AddSTIXThreatIntel" enabled
     And new "AddSTIXThreatIntel" request
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Ingest STIX threat intelligence returns "Bad Request" response
     Given body with value {"id": "bundle--11111111-1111-4111-8111-111111111111", "objects": [{"created": "2026-07-22T12:00:00Z", "id": "indicator--22222222-2222-4222-8222-222222222222", "modified": "2026-07-22T12:00:00Z", "pattern": "[ipv4-addr:value = '198.51.100.42']", "pattern_type": "stix", "spec_version": "2.1", "type": "indicator", "valid_from": "2026-07-22T12:00:00Z"}], "spec_version": "2.1", "type": "bundle"}
     And request contains "ti_vendor" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip-validation @team:DataDog/cloud-siem
+  @replay-only @skip-validation @team:ddoghq/cloud-siem
   Scenario: Ingest STIX threat intelligence returns "OK" response
     Given request contains "ti_vendor" parameter with value "Acme-Inc"
     And body with value {"id": "bundle--44444444-4444-4444-8444-444444444444", "objects": [{"created": "2026-07-22T12:00:00Z", "id": "indicator--55555555-5555-4555-8555-555555555555", "modified": "2026-07-22T12:00:00Z", "pattern": "[ipv4-addr:value = '198.51.100.42']", "pattern_type": "stix", "spec_version": "2.1", "type": "indicator", "valid_from": "2026-07-22T12:00:00Z"}], "spec_version": "2.1", "type": "bundle"}
@@ -29,7 +29,7 @@ Feature: Threat Intelligence
     And the response "data.attributes.unsupported" is equal to 0
     And the response "data.attributes.invalid" is equal to 0
 
-  @generated @skip @team:DataDog/cloud-siem
+  @generated @skip @team:ddoghq/cloud-siem
   Scenario: Ingest STIX threat intelligence returns "The request body exceeds 50 MB as received or 100 MB after decompression." response
     Given body with value {"id": "bundle--11111111-1111-4111-8111-111111111111", "objects": [{"created": "2026-07-22T12:00:00Z", "id": "indicator--22222222-2222-4222-8222-222222222222", "modified": "2026-07-22T12:00:00Z", "pattern": "[ipv4-addr:value = '198.51.100.42']", "pattern_type": "stix", "spec_version": "2.1", "type": "indicator", "valid_from": "2026-07-22T12:00:00Z"}], "spec_version": "2.1", "type": "bundle"}
     And request contains "ti_vendor" parameter from "REPLACE.ME"
diff --git a/features/v2/timeseries_anomaly_investigations.feature b/features/v2/timeseries_anomaly_investigations.feature
index 1c7b75960058..baff130bce0f 100644
--- a/features/v2/timeseries_anomaly_investigations.feature
+++ b/features/v2/timeseries_anomaly_investigations.feature
@@ -11,22 +11,22 @@ Feature: Timeseries Anomaly Investigations
     And new "CreateTimeseriesAnomalyInvestigation" request
     And body with value {"data": {"attributes": {"requests": [{"formulas": [{"formula": "query1"}], "from": 1754406000000, "queries": [{"data_source": "metrics", "name": "query1", "query": "avg:system.cpu.user{env:prod} by {service}"}], "to": 1754423940000}]}, "type": "timeseries_anomaly_investigation"}}
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Investigate a timeseries anomaly returns "Bad Request" response
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Investigate a timeseries anomaly returns "OK" response
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Investigate a timeseries anomaly returns "Payload Too Large" response
     When the request is sent
     Then the response status is 413 Payload Too Large
 
-  @generated @skip @team:DataDog/dataviz-backend-maintainers
+  @generated @skip @team:ddoghq/dataviz-backend-maintainers
   Scenario: Investigate a timeseries anomaly returns "Unprocessable Entity" response
     When the request is sent
     Then the response status is 422 Unprocessable Entity
diff --git a/features/v2/twilio_integration.feature b/features/v2/twilio_integration.feature
index 09e2ad3b3199..4b9616b2c497 100644
--- a/features/v2/twilio_integration.feature
+++ b/features/v2/twilio_integration.feature
@@ -10,7 +10,7 @@ Feature: Twilio Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "TwilioIntegration" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Twilio integration account returns "Bad Request" response
     Given operation "CreateTwilioIntegrationAccount" enabled
     And new "CreateTwilioIntegrationAccount" request
@@ -18,7 +18,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Twilio integration account returns "Created" response
     Given operation "CreateTwilioIntegrationAccount" enabled
     And new "CreateTwilioIntegrationAccount" request
@@ -26,7 +26,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 201 Created
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Twilio integration account returns "Not Found" response
     Given operation "CreateTwilioIntegrationAccount" enabled
     And new "CreateTwilioIntegrationAccount" request
@@ -34,7 +34,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a Twilio integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "CreateTwilioIntegrationAccount" enabled
     And new "CreateTwilioIntegrationAccount" request
@@ -42,7 +42,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Twilio integration account returns "Bad Request" response
     Given operation "DeleteTwilioIntegrationAccount" enabled
     And new "DeleteTwilioIntegrationAccount" request
@@ -50,7 +50,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Twilio integration account returns "Not Found" response
     Given operation "DeleteTwilioIntegrationAccount" enabled
     And new "DeleteTwilioIntegrationAccount" request
@@ -58,7 +58,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a Twilio integration account returns "OK" response
     Given operation "DeleteTwilioIntegrationAccount" enabled
     And new "DeleteTwilioIntegrationAccount" request
@@ -66,7 +66,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Twilio integration account returns "Bad Request" response
     Given operation "GetTwilioIntegrationAccount" enabled
     And new "GetTwilioIntegrationAccount" request
@@ -74,7 +74,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Twilio integration account returns "Not Found" response
     Given operation "GetTwilioIntegrationAccount" enabled
     And new "GetTwilioIntegrationAccount" request
@@ -82,7 +82,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a Twilio integration account returns "OK" response
     Given operation "GetTwilioIntegrationAccount" enabled
     And new "GetTwilioIntegrationAccount" request
@@ -90,28 +90,28 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Twilio integration accounts returns "Bad Request" response
     Given operation "ListTwilioIntegrationAccounts" enabled
     And new "ListTwilioIntegrationAccounts" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Twilio integration accounts returns "Not Found" response
     Given operation "ListTwilioIntegrationAccounts" enabled
     And new "ListTwilioIntegrationAccounts" request
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List Twilio integration accounts returns "OK" response
     Given operation "ListTwilioIntegrationAccounts" enabled
     And new "ListTwilioIntegrationAccounts" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Twilio integration account returns "Bad Request" response
     Given operation "UpdateTwilioIntegrationAccount" enabled
     And new "UpdateTwilioIntegrationAccount" request
@@ -120,7 +120,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Twilio integration account returns "Not Found" response
     Given operation "UpdateTwilioIntegrationAccount" enabled
     And new "UpdateTwilioIntegrationAccount" request
@@ -129,7 +129,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Twilio integration account returns "OK" response
     Given operation "UpdateTwilioIntegrationAccount" enabled
     And new "UpdateTwilioIntegrationAccount" request
@@ -138,7 +138,7 @@ Feature: Twilio Integration
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a Twilio integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "UpdateTwilioIntegrationAccount" enabled
     And new "UpdateTwilioIntegrationAccount" request
diff --git a/features/v2/usage_metering.feature b/features/v2/usage_metering.feature
index 0dc681d2e565..cdab1476abf5 100644
--- a/features/v2/usage_metering.feature
+++ b/features/v2/usage_metering.feature
@@ -14,7 +14,7 @@ Feature: Usage Metering
     And a valid "appKeyAuth" key in the system
     And an instance of "UsageMetering" API
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Create or update usage quotas returns "Bad Request" response
     Given operation "CreateQuotas" enabled
     And new "CreateQuotas" request
@@ -23,7 +23,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Create or update usage quotas returns "OK. The response includes each item's result; see each item's `error` attribute for any that failed to write." response
     Given operation "CreateQuotas" enabled
     And new "CreateQuotas" request
@@ -32,7 +32,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK. The response includes each item's result; see each item's `error` attribute for any that failed to write.
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Delete a usage quota returns "No Content" response
     Given operation "DeleteQuota" enabled
     And new "DeleteQuota" request
@@ -41,7 +41,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Delete a usage quota returns "Not Found" response
     Given operation "DeleteQuota" enabled
     And new "DeleteQuota" request
@@ -50,7 +50,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/billing-hub
+  @replay-only @team:ddoghq/billing-hub
   Scenario: Get Monthly Cost Attribution returns "Bad Request" response
     Given new "GetMonthlyCostAttribution" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 5d') }}"
@@ -59,7 +59,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/billing-hub
+  @replay-only @team:ddoghq/billing-hub
   Scenario: Get Monthly Cost Attribution returns "OK" response
     Given new "GetMonthlyCostAttribution" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 5d') }}"
@@ -68,25 +68,25 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get active billing dimensions for cost attribution returns "Bad Request" response
     Given new "GetActiveBillingDimensions" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get active billing dimensions for cost attribution returns "OK" response
     Given new "GetActiveBillingDimensions" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get available fields for usage summary returns "Bad Request" response
     Given new "GetUsageSummaryAvailableFields" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get available fields for usage summary returns "OK" response
     Given new "GetUsageSummaryAvailableFields" request
     When the request is sent
@@ -97,58 +97,58 @@ Feature: Usage Metering
     And the response "data.attributes" has field "date_fields"
     And the response "data.attributes" has field "date_org_fields"
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get available fields for usage summary returns "OK." response
     Given new "GetUsageSummaryAvailableFields" request
     When the request is sent
     Then the response status is 200 OK.
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get billing dimension mapping for usage endpoints returns "Bad Request" response
     Given new "GetBillingDimensionMapping" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get billing dimension mapping for usage endpoints returns "OK" response
     Given new "GetBillingDimensionMapping" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get cost across multi-org account returns "Bad Request" response
     Given new "GetCostByOrg" request
     And request contains "start_month" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @skip @team:DataDog/billing-hub
+  @replay-only @skip @team:ddoghq/billing-hub
   Scenario: Get cost across multi-org account returns "OK" response
     Given new "GetCostByOrg" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 3d') }}"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get estimated cost across your account returns "Bad Request" response
     Given new "GetEstimatedCostByOrg" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get estimated cost across your account returns "OK" response
     Given new "GetEstimatedCostByOrg" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get historical cost across your account returns "Bad Request" response
     Given new "GetHistoricalCostByOrg" request
     And request contains "start_month" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/billing-hub
+  @replay-only @team:ddoghq/billing-hub
   Scenario: Get historical cost across your account returns "OK" response
     Given new "GetHistoricalCostByOrg" request
     And request contains "start_month" parameter with value "{{ timeISO('now - 2M') }}"
@@ -156,7 +156,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get hourly usage by product family returns "Bad Request" response
     Given new "GetHourlyUsage" request
     And request contains "filter[timestamp][start]" parameter with value "{{ timeISO('now - 3d') }}"
@@ -165,7 +165,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: Get hourly usage by product family returns "OK" response
     Given new "GetHourlyUsage" request
     And request contains "filter[timestamp][start]" parameter with value "{{ timeISO('now - 3d') }}"
@@ -175,7 +175,7 @@ Feature: Usage Metering
     And the response "data[0].type" is equal to "usage_timeseries"
     And the response "data[0].attributes.region" is equal to "us"
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Application Security returns "Bad Request" response
     Given new "GetUsageApplicationSecurityMonitoring" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -183,7 +183,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Lambda traced invocations returns "Bad Request" response
     Given new "GetUsageLambdaTracedInvocations" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -191,7 +191,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Lambda traced invocations returns "OK" response
     Given new "GetUsageLambdaTracedInvocations" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -201,7 +201,7 @@ Feature: Usage Metering
     And the response "data[0].type" is equal to "usage_timeseries"
     And the response "data[0].attributes.product_family" is equal to "lambda-traced-invocations"
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for Observability Pipelines returns "Bad Request" response
     Given new "GetUsageObservabilityPipelines" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
@@ -209,14 +209,14 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for application security returns "Bad Request" response
     Given new "GetUsageApplicationSecurityMonitoring" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for application security returns "OK" response
     Given new "GetUsageApplicationSecurityMonitoring" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -226,14 +226,14 @@ Feature: Usage Metering
     And the response "data[0].type" is equal to "usage_timeseries"
     And the response "data[0].attributes.product_family" is equal to "app-sec"
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for observability pipelines returns "Bad Request" response
     Given new "GetUsageObservabilityPipelines" request
     And request contains "start_hr" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip @team:DataDog/billing-hub
+  @skip @team:ddoghq/billing-hub
   Scenario: Get hourly usage for observability pipelines returns "OK" response
     Given new "GetUsageObservabilityPipelines" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
@@ -243,26 +243,26 @@ Feature: Usage Metering
     And the response "data[0].type" is equal to "usage_timeseries"
     And the response "data[0].attributes.product_family" is equal to "observability-pipelines"
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get projected cost across your account returns "Bad Request" response
     Given new "GetProjectedCost" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/billing-hub
+  @replay-only @team:ddoghq/billing-hub
   Scenario: Get projected cost across your account returns "OK" response
     Given new "GetProjectedCost" request
     And request contains "view" parameter with value "sub-org"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Get usage attribution types returns "OK" response
     Given new "GetUsageAttributionTypes" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/billing-hub
+  @team:ddoghq/billing-hub
   Scenario: GetEstimatedCostByOrg with both start_month and start_date returns "Bad Request" response
     Given new "GetEstimatedCostByOrg" request
     And request contains "view" parameter with value "sub-org"
@@ -271,7 +271,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/billing-hub
+  @replay-only @team:ddoghq/billing-hub
   Scenario: GetEstimatedCostByOrg with start_month returns "OK" response
     Given new "GetEstimatedCostByOrg" request
     And request contains "view" parameter with value "sub-org"
@@ -279,7 +279,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: List usage quotas returns "Bad Request" response
     Given operation "ListQuotas" enabled
     And new "ListQuotas" request
@@ -287,7 +287,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: List usage quotas returns "OK" response
     Given operation "ListQuotas" enabled
     And new "ListQuotas" request
@@ -295,7 +295,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub @with-pagination
+  @generated @skip @team:ddoghq/billing-hub @with-pagination
   Scenario: List usage quotas returns "OK" response with pagination
     Given operation "ListQuotas" enabled
     And new "ListQuotas" request
@@ -303,7 +303,7 @@ Feature: Usage Metering
     When the request with pagination is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Update a usage quota returns "Bad Request. Returned if the request is malformed, or if the `id` in the request body does not match the `id` in the request path." response
     Given operation "UpdateQuota" enabled
     And new "UpdateQuota" request
@@ -313,7 +313,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request. Returned if the request is malformed, or if the `id` in the request body does not match the `id` in the request path.
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Update a usage quota returns "Not Found" response
     Given operation "UpdateQuota" enabled
     And new "UpdateQuota" request
@@ -323,7 +323,7 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/billing-hub
+  @generated @skip @team:ddoghq/billing-hub
   Scenario: Update a usage quota returns "OK" response
     Given operation "UpdateQuota" enabled
     And new "UpdateQuota" request
diff --git a/features/v2/user_authorized_clients.feature b/features/v2/user_authorized_clients.feature
index 591a889cd009..7ae78f699f62 100644
--- a/features/v2/user_authorized_clients.feature
+++ b/features/v2/user_authorized_clients.feature
@@ -7,55 +7,55 @@ Feature: User Authorized Clients
     And a valid "appKeyAuth" key in the system
     And an instance of "UserAuthorizedClients" API
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user authorized client returns "No Content" response
     Given new "DeleteUserAuthorizedClient" request
     And request contains "user_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete a user authorized client returns "Not Found" response
     Given new "DeleteUserAuthorizedClient" request
     And request contains "user_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete all user authorized clients for a client returns "No Content" response
     Given new "DeleteUserAuthorizedClientsByClient" request
     And request contains "client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Delete all user authorized clients for a client returns "Not Found" response
     Given new "DeleteUserAuthorizedClientsByClient" request
     And request contains "client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get a user authorized client returns "Not Found" response
     Given new "GetUserAuthorizedClient" request
     And request contains "user_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: Get a user authorized client returns "OK" response
     Given new "GetUserAuthorizedClient" request
     And request contains "user_authorized_client_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login
+  @generated @skip @team:ddoghq/delegated-auth-login
   Scenario: List user authorized clients returns "OK" response
     Given new "ListUserAuthorizedClients" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/delegated-auth-login @with-pagination
+  @generated @skip @team:ddoghq/delegated-auth-login @with-pagination
   Scenario: List user authorized clients returns "OK" response with pagination
     Given new "ListUserAuthorizedClients" request
     When the request with pagination is sent
diff --git a/features/v2/users.feature b/features/v2/users.feature
index b3d2a2a9ea77..2a6c59fa1304 100644
--- a/features/v2/users.feature
+++ b/features/v2/users.feature
@@ -7,7 +7,7 @@ Feature: Users
     And a valid "appKeyAuth" key in the system
     And an instance of "Users" API
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Anonymize users returns "Bad Request" response
     Given operation "AnonymizeUsers" enabled
     And new "AnonymizeUsers" request
@@ -15,7 +15,7 @@ Feature: Users
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Anonymize users returns "OK" response
     Given operation "AnonymizeUsers" enabled
     And new "AnonymizeUsers" request
@@ -23,14 +23,14 @@ Feature: Users
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/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"}}}
@@ -41,28 +41,28 @@ Feature: Users
     And the response "data.attributes.disabled" is false
     And the response "data.attributes.service_account" is false
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete a pending user's invitations returns "Not found" response
     Given new "DeleteUserInvitations" 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/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Delete a pending user's invitations returns "OK" response
     Given new "DeleteUserInvitations" 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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/org-management
   Scenario: Disable a user returns "OK" response
     Given there is a valid "user" in the system
     And new "DisableUser" request
@@ -70,14 +70,14 @@ Feature: Users
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/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"
@@ -88,28 +88,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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/org-management
   Scenario: Get a user permissions returns "OK" response
     Given there is a valid "user" in the system
     And new "ListUserPermissions" request
@@ -118,34 +118,34 @@ Feature: Users
     Then the response status is 200 OK
     And the response "data" has length 0
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get current user returns "OK" response
     Given new "GetCurrentUser" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get identity provider overrides for a user returns "Not found" response
     Given new "GetUserIdentityProviders" 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/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Get identity provider overrides for a user returns "OK" response
     Given new "GetUserIdentityProviders" 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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/org-management
   Scenario: Get user details returns "OK" response
     Given there is a valid "user" in the system
     And new "GetUser" request
@@ -156,13 +156,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/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/org-management
   Scenario: List all users returns "OK" response
     Given there is a valid "user" in the system
     And new "ListUsers" request
@@ -172,7 +172,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/org-management @with-pagination
+  @replay-only @skip-validation @team:ddoghq/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
@@ -180,14 +180,14 @@ Feature: Users
     Then the response status is 200 OK
     And the response has 3 items
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/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/org-management
+  @team:ddoghq/org-management
   Scenario: Send invitation emails returns "OK" response
     Given there is a valid "user" in the system
     And new "SendInvitations" request
@@ -197,7 +197,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/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update a user returns "Bad Request" response
     Given new "UpdateUser" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -205,7 +205,7 @@ Feature: Users
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/org-management
+  @team:ddoghq/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
@@ -214,7 +214,7 @@ Feature: Users
     When the request is sent
     Then the response status is 422 Bad User ID in Request
 
-  @team:DataDog/org-management
+  @team:ddoghq/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"
@@ -222,7 +222,7 @@ Feature: Users
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/org-management
+  @team:ddoghq/org-management
   Scenario: Update a user returns "OK" response
     Given there is a valid "user" in the system
     And new "UpdateUser" request
@@ -235,7 +235,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/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update a user returns "Unprocessable Entity" response
     Given new "UpdateUser" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -243,35 +243,35 @@ Feature: Users
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update current user returns "Bad Request" response
     Given new "UpdateCurrentUser" request
     And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update current user returns "Not found" response
     Given new "UpdateCurrentUser" request
     And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
     When the request is sent
     Then the response status is 404 Not found
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update current user returns "OK" response
     Given new "UpdateCurrentUser" request
     And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update current user returns "Unprocessable Entity" response
     Given new "UpdateCurrentUser" request
     And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
     When the request is sent
     Then the response status is 422 Unprocessable Entity
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update identity provider overrides for a user returns "Bad Request" response
     Given new "UpdateUserIdentityProviders" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -279,7 +279,7 @@ Feature: Users
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update identity provider overrides for a user returns "No Content" response
     Given new "UpdateUserIdentityProviders" request
     And request contains "user_id" parameter from "REPLACE.ME"
@@ -287,7 +287,7 @@ Feature: Users
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/org-management
+  @generated @skip @team:ddoghq/org-management
   Scenario: Update identity provider overrides for a user returns "Not found" response
     Given new "UpdateUserIdentityProviders" request
     And request contains "user_id" parameter from "REPLACE.ME"
diff --git a/features/v2/web_integrations.feature b/features/v2/web_integrations.feature
index 7fb73bee4494..476ffee16192 100644
--- a/features/v2/web_integrations.feature
+++ b/features/v2/web_integrations.feature
@@ -9,7 +9,7 @@ Feature: Web Integrations
     And a valid "appKeyAuth" key in the system
     And an instance of "WebIntegrations" API
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a web integration account returns "Bad Request" response
     Given operation "CreateWebIntegrationAccount" enabled
     And new "CreateWebIntegrationAccount" request
@@ -18,7 +18,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a web integration account returns "CREATED" response
     Given operation "CreateWebIntegrationAccount" enabled
     And new "CreateWebIntegrationAccount" request
@@ -27,7 +27,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a web integration account returns "Not Found" response
     Given operation "CreateWebIntegrationAccount" enabled
     And new "CreateWebIntegrationAccount" request
@@ -36,7 +36,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Create a web integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "CreateWebIntegrationAccount" enabled
     And new "CreateWebIntegrationAccount" request
@@ -45,7 +45,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 422 The server cannot process the request because it contains invalid data.
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a web integration account returns "Bad Request" response
     Given operation "DeleteWebIntegrationAccount" enabled
     And new "DeleteWebIntegrationAccount" request
@@ -54,7 +54,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a web integration account returns "Not Found" response
     Given operation "DeleteWebIntegrationAccount" enabled
     And new "DeleteWebIntegrationAccount" request
@@ -63,7 +63,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Delete a web integration account returns "OK" response
     Given operation "DeleteWebIntegrationAccount" enabled
     And new "DeleteWebIntegrationAccount" request
@@ -72,7 +72,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a web integration account returns "Bad Request" response
     Given operation "GetWebIntegrationAccount" enabled
     And new "GetWebIntegrationAccount" request
@@ -81,7 +81,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a web integration account returns "Not Found" response
     Given operation "GetWebIntegrationAccount" enabled
     And new "GetWebIntegrationAccount" request
@@ -90,7 +90,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Get a web integration account returns "OK" response
     Given operation "GetWebIntegrationAccount" enabled
     And new "GetWebIntegrationAccount" request
@@ -99,7 +99,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List web integration accounts returns "Bad Request" response
     Given operation "ListWebIntegrationAccounts" enabled
     And new "ListWebIntegrationAccounts" request
@@ -107,7 +107,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List web integration accounts returns "Not Found" response
     Given operation "ListWebIntegrationAccounts" enabled
     And new "ListWebIntegrationAccounts" request
@@ -115,7 +115,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: List web integration accounts returns "OK" response
     Given operation "ListWebIntegrationAccounts" enabled
     And new "ListWebIntegrationAccounts" request
@@ -123,7 +123,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a web integration account returns "Bad Request" response
     Given operation "UpdateWebIntegrationAccount" enabled
     And new "UpdateWebIntegrationAccount" request
@@ -133,7 +133,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a web integration account returns "Not Found" response
     Given operation "UpdateWebIntegrationAccount" enabled
     And new "UpdateWebIntegrationAccount" request
@@ -143,7 +143,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a web integration account returns "OK" response
     Given operation "UpdateWebIntegrationAccount" enabled
     And new "UpdateWebIntegrationAccount" request
@@ -153,7 +153,7 @@ Feature: Web Integrations
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/saas-integrations
+  @generated @skip @team:ddoghq/saas-integrations
   Scenario: Update a web integration account returns "The server cannot process the request because it contains invalid data." response
     Given operation "UpdateWebIntegrationAccount" enabled
     And new "UpdateWebIntegrationAccount" request
diff --git a/features/v2/webhooks_integration.feature b/features/v2/webhooks_integration.feature
index c97a2d403753..c01ce50c74de 100644
--- a/features/v2/webhooks_integration.feature
+++ b/features/v2/webhooks_integration.feature
@@ -9,62 +9,62 @@ Feature: Webhooks Integration
     And a valid "appKeyAuth" key in the system
     And an instance of "WebhooksIntegration" API
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create an OAuth2 client credentials auth method returns "Bad Request" response
     Given new "CreateOAuth2ClientCredentials" request
     And body with value {"data": {"attributes": {"access_token_url": "https://example.com/oauth/token", "audience": "https://api.example.com", "client_id": "my-client-id", "client_secret": "my-client-secret", "name": "my-oauth2-auth", "scope": "read:webhooks write:webhooks"}, "type": "webhooks-auth-method-oauth2-client-credentials"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create an OAuth2 client credentials auth method returns "CREATED" response
     Given new "CreateOAuth2ClientCredentials" request
     And body with value {"data": {"attributes": {"access_token_url": "https://example.com/oauth/token", "audience": "https://api.example.com", "client_id": "my-client-id", "client_secret": "my-client-secret", "name": "my-oauth2-auth", "scope": "read:webhooks write:webhooks"}, "type": "webhooks-auth-method-oauth2-client-credentials"}}
     When the request is sent
     Then the response status is 201 CREATED
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Create an OAuth2 client credentials auth method returns "Conflict" response
     Given new "CreateOAuth2ClientCredentials" request
     And body with value {"data": {"attributes": {"access_token_url": "https://example.com/oauth/token", "audience": "https://api.example.com", "client_id": "my-client-id", "client_secret": "my-client-secret", "name": "my-oauth2-auth", "scope": "read:webhooks write:webhooks"}, "type": "webhooks-auth-method-oauth2-client-credentials"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete an OAuth2 client credentials auth method returns "Not Found" response
     Given new "DeleteOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Delete an OAuth2 client credentials auth method returns "OK" response
     Given new "DeleteOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get all auth methods returns "OK" response
     Given new "GetAllAuthMethods" request
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get an OAuth2 client credentials auth method returns "Not Found" response
     Given new "GetOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Get an OAuth2 client credentials auth method returns "OK" response
     Given new "GetOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an OAuth2 client credentials auth method returns "Bad Request" response
     Given new "UpdateOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
@@ -72,7 +72,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an OAuth2 client credentials auth method returns "Conflict" response
     Given new "UpdateOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
@@ -80,7 +80,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an OAuth2 client credentials auth method returns "Not Found" response
     Given new "UpdateOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
@@ -88,7 +88,7 @@ Feature: Webhooks Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:Datadog/collaboration-integrations
+  @generated @skip @team:ddoghq/collaboration-integrations
   Scenario: Update an OAuth2 client credentials auth method returns "OK" response
     Given new "UpdateOAuth2ClientCredentials" request
     And request contains "auth_method_id" parameter from "REPLACE.ME"
diff --git a/features/v2/widgets.feature b/features/v2/widgets.feature
index 54b015711565..492c4f0da2ef 100644
--- a/features/v2/widgets.feature
+++ b/features/v2/widgets.feature
@@ -9,7 +9,7 @@ Feature: Widgets
     And a valid "appKeyAuth" key in the system
     And an instance of "Widgets" API
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a widget returns "Bad Request" response
     Given new "CreateWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -17,7 +17,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Create a widget returns "OK" response
     Given new "CreateWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -25,7 +25,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a widget returns "Bad Request" response
     Given new "DeleteWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -33,7 +33,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a widget returns "No Content" response
     Given new "DeleteWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -41,7 +41,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 204 No Content
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Delete a widget returns "Not Found" response
     Given new "DeleteWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -49,7 +49,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a widget returns "Bad Request" response
     Given new "GetWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -57,7 +57,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a widget returns "Not Found" response
     Given new "GetWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -65,7 +65,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Get a widget returns "OK" response
     Given new "GetWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -73,21 +73,21 @@ Feature: Widgets
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Search widgets returns "Bad Request" response
     Given new "SearchWidgets" request
     And request contains "experience_type" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Search widgets returns "OK" response
     Given new "SearchWidgets" request
     And request contains "experience_type" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a widget returns "Bad Request" response
     Given new "UpdateWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -96,7 +96,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a widget returns "Not Found" response
     Given new "UpdateWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
@@ -105,7 +105,7 @@ Feature: Widgets
     When the request is sent
     Then the response status is 404 Not Found
 
-  @generated @skip @team:DataDog/reporting-and-sharing
+  @generated @skip @team:ddoghq/reporting-and-sharing
   Scenario: Update a widget returns "OK" response
     Given new "UpdateWidget" request
     And request contains "experience_type" parameter from "REPLACE.ME"
diff --git a/features/v2/workflow_automation.feature b/features/v2/workflow_automation.feature
index 29f8fe2d50c5..76560160369d 100644
--- a/features/v2/workflow_automation.feature
+++ b/features/v2/workflow_automation.feature
@@ -13,7 +13,7 @@ Feature: Workflow Automation
     And a valid "appKeyAuth" key in the system
     And an instance of "WorkflowAutomation" API
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Cancel a workflow instance returns "Bad Request" response
     Given new "CancelWorkflowInstance" request
     And request contains "workflow_id" parameter with value "malformed"
@@ -21,7 +21,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Cancel a workflow instance returns "Not Found" response
     Given new "CancelWorkflowInstance" request
     And request contains "workflow_id" parameter with value "0233a3b7-b7ba-425e-a8cc-375ca2020b5b"
@@ -29,7 +29,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Cancel a workflow instance returns "OK" response
     Given new "CancelWorkflowInstance" request
     And request contains "workflow_id" parameter with value "ccf73164-1998-4785-a7a3-8d06c7e5f558"
@@ -37,14 +37,14 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Create a Workflow returns "Bad request" response
     Given new "CreateWorkflow" request
     And body with value {"data": {"attributes": {"name": "Too many characters in description", "description": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "spec": {}}, "type": "workflows"}}
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Create a Workflow returns "Successfully created a workflow." response
     Given new "CreateWorkflow" request
     And body with value {"data": {"attributes": {"description": "A sample workflow.", "name": "Example Workflow", "published": true, "runAs": {"type": "owner"}, "sensitivePrivileges": true, "spec": {"connectionEnvs": [{"connections": [{"connectionId": "e1e64943-c7c5-4487-aece-25aaec7d3aad", "label": "INTEGRATION_DATADOG"}], "env": "default"}], "inputSchema": {"parameters": [{"defaultValue": "default", "name": "input", "type": "STRING"}]}, "outputSchema": {"parameters": [{"name": "output", "type": "ARRAY_OBJECT", "value": "outputValue"}]}, "steps": [{"actionId": "com.datadoghq.dd.monitor.listMonitors", "connectionLabel": "INTEGRATION_DATADOG", "name": "Step1", "outboundEdges": [{"branchName": "main", "nextStepName": "Step2"}], "parameters": [{"name": "tags", "value": "service:monitoring"}]}, {"actionId": "com.datadoghq.core.noop", "name": "Step2"}], "triggers": [{"monitorTrigger": {"rateLimit": {"count": 1, "interval": "3600s"}}, "startStepNames": ["Step1"]}, {"startStepNames": ["Step1"], "githubWebhookTrigger": {}}]}, "tags": ["team:infra", "service:monitoring", "foo:bar"]}, "type": "workflows"}}
@@ -53,14 +53,14 @@ Feature: Workflow Automation
     And the response "data.attributes.runAsUserMode" is equal to "owner"
     And the response "data.attributes.sensitivePrivileges" is equal to true
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Delete an existing Workflow returns "Not found" response
     Given new "DeleteWorkflow" request
     And request contains "workflow_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Delete an existing Workflow returns "Successfully deleted a workflow." response
     Given there is a valid "workflow" in the system
     And new "DeleteWorkflow" request
@@ -68,7 +68,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 204 Successfully deleted a workflow.
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Execute a workflow returns "Bad Request" response
     Given new "CreateWorkflowInstance" request
     And request contains "workflow_id" parameter with value "malformed"
@@ -76,7 +76,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Execute a workflow returns "Created" response
     Given new "CreateWorkflowInstance" request
     And request contains "workflow_id" parameter with value "ccf73164-1998-4785-a7a3-8d06c7e5f558"
@@ -84,7 +84,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 200 Created
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Get a workflow instance returns "Bad Request" response
     Given new "GetWorkflowInstance" request
     And request contains "workflow_id" parameter with value "malformed"
@@ -92,7 +92,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Get a workflow instance returns "Not Found" response
     Given new "GetWorkflowInstance" request
     And request contains "workflow_id" parameter with value "0233a3b7-b7ba-425e-a8cc-375ca2020b5b"
@@ -100,7 +100,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 404 Not Found
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: Get a workflow instance returns "OK" response
     Given new "GetWorkflowInstance" request
     And request contains "workflow_id" parameter with value "ccf73164-1998-4785-a7a3-8d06c7e5f558"
@@ -108,21 +108,21 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Workflow returns "Bad request" response
     Given new "GetWorkflow" request
     And request contains "workflow_id" parameter with value "bad-format"
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Workflow returns "Not found" response
     Given new "GetWorkflow" request
     And request contains "workflow_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Get an existing Workflow returns "Successfully got a workflow." response
     Given there is a valid "workflow" in the system
     And new "GetWorkflow" request
@@ -131,27 +131,27 @@ Feature: Workflow Automation
     Then the response status is 200 Successfully got a workflow.
     And the response "data.attributes.runAsUserMode" is equal to "owner"
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: List workflow instances returns "Bad Request" response
     Given new "ListWorkflowInstances" request
     And request contains "workflow_id" parameter with value "malformed"
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @replay-only @team:DataDog/workflow-automation-dev
+  @replay-only @team:ddoghq/workflow-automation-dev
   Scenario: List workflow instances returns "OK" response
     Given new "ListWorkflowInstances" request
     And request contains "workflow_id" parameter with value "ccf73164-1998-4785-a7a3-8d06c7e5f558"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/workflow-automation-dev
+  @generated @skip @team:ddoghq/workflow-automation-dev
   Scenario: List workflows returns "Bad Request" response
     Given new "ListWorkflows" request
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: List workflows returns "OK" response
     Given there is a valid "workflow" in the system
     And new "ListWorkflows" request
@@ -159,7 +159,7 @@ Feature: Workflow Automation
     Then the response status is 200 OK
     And the response "data" has item with field "attributes.runAsUserMode" with value "owner"
 
-  @replay-only @skip-validation @team:DataDog/workflow-automation-dev @with-pagination
+  @replay-only @skip-validation @team:ddoghq/workflow-automation-dev @with-pagination
   Scenario: List workflows returns "OK" response with pagination
     Given new "ListWorkflows" request
     And request contains "filter[query]" parameter with value "{{ unique }}"
@@ -168,7 +168,7 @@ Feature: Workflow Automation
     Then the response status is 200 OK
     And the response has 0 items
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Workflow returns "Bad request" response
     Given there is a valid "workflow" in the system
     And new "UpdateWorkflow" request
@@ -177,7 +177,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 400 Bad request
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Workflow returns "Not found" response
     Given new "UpdateWorkflow" request
     And request contains "workflow_id" parameter with value "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
@@ -185,7 +185,7 @@ Feature: Workflow Automation
     When the request is sent
     Then the response status is 404 Not found
 
-  @team:DataDog/workflow-automation-dev
+  @team:ddoghq/workflow-automation-dev
   Scenario: Update an existing Workflow returns "Successfully updated a workflow." response
     Given there is a valid "workflow" in the system
     And new "UpdateWorkflow" request