diff --git a/mmv1/products/compute/ServiceAttachment.yaml b/mmv1/products/compute/ServiceAttachment.yaml
index 1859a69b04c3..6444336b6d0c 100644
--- a/mmv1/products/compute/ServiceAttachment.yaml
+++ b/mmv1/products/compute/ServiceAttachment.yaml
@@ -35,6 +35,7 @@ async:
     base_url: '{{op_id}}'
   result:
     resource_inside_response: false
+include_in_tgc_next: true
 custom_code:
   constants: 'templates/terraform/constants/compute_service_attachment.go.tmpl'
   update_encoder: 'templates/terraform/update_encoder/compute_service_attachment.go.tmpl'
diff --git a/mmv1/products/compute/SslPolicy.yaml b/mmv1/products/compute/SslPolicy.yaml
index c9dc34f365d9..64954449e8c1 100644
--- a/mmv1/products/compute/SslPolicy.yaml
+++ b/mmv1/products/compute/SslPolicy.yaml
@@ -37,6 +37,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
   constants: 'templates/terraform/constants/ssl_policy.tmpl'
   update_encoder: 'templates/terraform/update_encoder/ssl_policy.tmpl'
diff --git a/mmv1/products/compute/StoragePool.yaml b/mmv1/products/compute/StoragePool.yaml
index d582860d3565..71353ca799db 100644
--- a/mmv1/products/compute/StoragePool.yaml
+++ b/mmv1/products/compute/StoragePool.yaml
@@ -288,6 +288,6 @@ virtual_fields:
       When the field is set to true or unset in Terraform state, a `terraform apply`
       or `terraform destroy` that would delete the StoragePool will fail.
       When the field is set to false, deleting the StoragePool is allowed.
+include_in_tgc_next: true
 custom_code:
   pre_delete: templates/terraform/pre_delete/compute_storage_pool.go.tmpl
-include_in_tgc_next: true
diff --git a/mmv1/products/compute/TargetGrpcProxy.yaml b/mmv1/products/compute/TargetGrpcProxy.yaml
index b3ad09fa674f..74900cb88adc 100644
--- a/mmv1/products/compute/TargetGrpcProxy.yaml
+++ b/mmv1/products/compute/TargetGrpcProxy.yaml
@@ -39,6 +39,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
 examples:
   - name: 'target_grpc_proxy_basic'
diff --git a/mmv1/products/compute/TargetHttpProxy.yaml b/mmv1/products/compute/TargetHttpProxy.yaml
index d221a310f271..95af4014ab83 100644
--- a/mmv1/products/compute/TargetHttpProxy.yaml
+++ b/mmv1/products/compute/TargetHttpProxy.yaml
@@ -37,6 +37,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
 examples:
   - name: 'target_http_proxy_basic'
diff --git a/mmv1/products/compute/TargetHttpsProxy.yaml b/mmv1/products/compute/TargetHttpsProxy.yaml
index f0eed46422ae..f5f48b5a06fa 100644
--- a/mmv1/products/compute/TargetHttpsProxy.yaml
+++ b/mmv1/products/compute/TargetHttpsProxy.yaml
@@ -37,6 +37,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
   encoder: 'templates/terraform/encoders/compute_target_https_proxy.go.tmpl'
   # update_encoder is usually the same as encoder by default. This resource is an uncommon case where the whole resource
diff --git a/mmv1/products/compute/TargetInstance.yaml b/mmv1/products/compute/TargetInstance.yaml
index 686d7298db73..25c25d9ca581 100644
--- a/mmv1/products/compute/TargetInstance.yaml
+++ b/mmv1/products/compute/TargetInstance.yaml
@@ -41,11 +41,12 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
-custom_code:
-  post_create: 'templates/terraform/post_create/compute_target_instance_security_policy.go.tmpl'
 sweeper:
   url_substitutions:
     - zone: "southamerica-west1-a"
+include_in_tgc_next: true
+custom_code:
+  post_create: 'templates/terraform/post_create/compute_target_instance_security_policy.go.tmpl'
 examples:
   - name: 'target_instance_basic'
     primary_resource_id: 'default'
diff --git a/mmv1/products/compute/TargetSslProxy.yaml b/mmv1/products/compute/TargetSslProxy.yaml
index 44bd284b8b04..d1aed453dec5 100644
--- a/mmv1/products/compute/TargetSslProxy.yaml
+++ b/mmv1/products/compute/TargetSslProxy.yaml
@@ -38,6 +38,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
 examples:
   - name: 'target_ssl_proxy_basic'
diff --git a/mmv1/products/compute/TargetTcpProxy.yaml b/mmv1/products/compute/TargetTcpProxy.yaml
index 5f9d26969739..671c60ca567e 100644
--- a/mmv1/products/compute/TargetTcpProxy.yaml
+++ b/mmv1/products/compute/TargetTcpProxy.yaml
@@ -38,6 +38,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next: true
 custom_code:
 examples:
   - name: 'target_tcp_proxy_basic'