diff --git a/.apigentools-info b/.apigentools-info
index 1d43faf3dd3..f6196ebeb0f 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-18 21:00:54.900557",
-            "spec_repo_commit": "37070fd4"
+            "regenerated": "2024-10-21 20:59:46.944958",
+            "spec_repo_commit": "9ac9609b"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-18 21:00:54.918688",
-            "spec_repo_commit": "37070fd4"
+            "regenerated": "2024-10-21 20:59:46.962979",
+            "spec_repo_commit": "9ac9609b"
         }
     }
 }
\ No newline at end of file
diff --git a/features/v1/gcp_integration.feature b/features/v1/gcp_integration.feature
index 33a06d39fe9..c41a57f8a3b 100644
--- a/features/v1/gcp_integration.feature
+++ b/features/v1/gcp_integration.feature
@@ -17,7 +17,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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"}
@@ -31,7 +31,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/gcp-integrations
   Scenario: Delete a GCP integration returns "OK" response
     Given there is a valid "gcp_account" in the system
     And new "DeleteGCPIntegration" request
@@ -45,13 +45,13 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @skip-terraform-config @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
+  @replay-only @team:DataDog/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
@@ -66,7 +66,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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/v2/gcp_integration.feature b/features/v2/gcp_integration.feature
index 7ab3ec0b0eb..b795a8840cd 100644
--- a/features/v2/gcp_integration.feature
+++ b/features/v2/gcp_integration.feature
@@ -45,7 +45,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
+  @replay-only @team:DataDog/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
+  @replay-only @team:DataDog/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
+  @replay-only @team:DataDog/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,14 +84,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_cspm_enabled" is equal to true
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
+  @replay-only @team:DataDog/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"}}
@@ -101,7 +101,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
+  @replay-only @team:DataDog/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"}}
@@ -132,7 +132,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @skip-terraform-config @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
@@ -140,7 +140,7 @@ 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
+  @replay-only @team:DataDog/gcp-integrations
   Scenario: List delegate account returns "OK" response
     Given new "GetGCPSTSDelegate" request
     When the request is sent
@@ -163,7 +163,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
@@ -172,7 +172,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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
@@ -181,7 +181,7 @@ Feature: GCP Integration
     When the request is sent
     Then the response status is 201 OK
 
-  @team:DataDog/gcp-integrations
+  @replay-only @team:DataDog/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