diff --git a/.ci/magic-modules/generate-terraform.sh b/.ci/magic-modules/generate-terraform.sh
index 948d338c9694..f569b95c0460 100755
--- a/.ci/magic-modules/generate-terraform.sh
+++ b/.ci/magic-modules/generate-terraform.sh
@@ -32,7 +32,7 @@ if [ "$GITHUB_ORG" = "terraform-providers" ]; then
     # "-wholename": entire relative path - including directory names - matches following wildcard.
     # "-name": filename alone matches following string.  e.g. -name README.md matches ./README.md *and* ./foo/bar/README.md
     # "-exec": for each file found, execute the command following until the literal ';'
-    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl" -not -name "tools.go"  -exec git rm {} \;
+    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "docscheck.sh" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl" -not -name "tools.go"  -exec git rm {} \;
 fi
 
 popd
diff --git a/build/inspec b/build/inspec
index 04c0f74013da..1447ad33e6a9 160000
--- a/build/inspec
+++ b/build/inspec
@@ -1 +1 @@
-Subproject commit 04c0f74013da5df26f1c014091c61348a8bfe1b4
+Subproject commit 1447ad33e6a9999263b427df215cc28325bda000
diff --git a/build/terraform b/build/terraform
index 2f94bb7e553b..7a712d0270a8 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 2f94bb7e553b146012359099df9e8a87d7ff8464
+Subproject commit 7a712d0270a8c0a3d090daf2cf944b9708de5175
diff --git a/build/terraform-beta b/build/terraform-beta
index e8bcc3344c53..fe087e922b33 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit e8bcc3344c538654c4d37c48fb382b7798f5e3ee
+Subproject commit fe087e922b33f3584a602836a6e83bd7ccc48e02
diff --git a/templates/terraform/resource.html.markdown.erb b/templates/terraform/resource.html.markdown.erb
index 1e57b1c71af6..549f3ec95671 100644
--- a/templates/terraform/resource.html.markdown.erb
+++ b/templates/terraform/resource.html.markdown.erb
@@ -35,8 +35,9 @@
     is generated from a ruby function, but skip it on anything that is
     directly inserted from YAML.
 -%>
-<% 
+<%
   tf_product = (@config.legacy_name || product_ns).underscore
+  tf_subcategory = (object.__product.display_name)
   terraform_name = object.legacy_name || "google_#{tf_product}_#{object.name.underscore}"
   properties = object.all_user_properties
   # In order of preference, use TF override,
@@ -47,6 +48,7 @@
 -%>
 ---
 <%= lines(autogen_notice :yaml) -%>
+subcategory: "<%= tf_subcategory -%>"
 layout: "google"
 page_title: "Google: <%= terraform_name -%>"
 sidebar_current: "docs-<%= terraform_name.gsub("_", "-") -%>"
diff --git a/templates/terraform/resource_iam.html.markdown.erb b/templates/terraform/resource_iam.html.markdown.erb
index fc448721b1f2..896b7df6a3af 100644
--- a/templates/terraform/resource_iam.html.markdown.erb
+++ b/templates/terraform/resource_iam.html.markdown.erb
@@ -37,6 +37,7 @@
 -%>
 <%
   tf_product = (@config.legacy_name || product_ns).underscore
+  tf_subcategory = (object.__product.display_name)
   resource_ns = object.legacy_name || "google_#{tf_product}_#{object.name.underscore}"
   resource_ns_iam = "#{resource_ns}_iam"
   properties = object.all_user_properties
@@ -49,6 +50,7 @@
 -%>
 ---
 <%= lines(autogen_notice :yaml) -%>
+subcategory: "<%= tf_subcategory -%>"
 layout: "google"
 page_title: "Google: <%= resource_ns_iam -%>"
 sidebar_current: "docs-<%= resource_ns_iam.gsub("_", "-") -%>"
diff --git a/third_party/terraform/website/docs/d/datasource_client_config.html.markdown b/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
index 4b888c8ce03e..2627a0f86807 100644
--- a/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_config"
 sidebar_current: "docs-google-datasource-client-config"
diff --git a/third_party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown b/third_party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown
index a7f8767c1053..2de510d61b34 100644
--- a/third_party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function"
 sidebar_current: "docs-google-datasource-cloudfunctions-function"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
index 62e2cdf5d9cc..91eec27df68d 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_address"
 sidebar_current: "docs-google-datasource-compute-address"
@@ -55,4 +56,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
\ No newline at end of file
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown
index f532ed364d3b..d73b2ed026aa 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_forwarding_rule"
 sidebar_current: "docs-google-datasource-compute-forwarding-rule"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
index 236048bbbf6d..d985e2fe9cb7 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_global_address"
 sidebar_current: "docs-google-datasource-compute-global-address"
@@ -52,4 +53,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
\ No newline at end of file
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
index 0a3a5056d6ac..53597c27c49b 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_image"
 sidebar_current: "docs-google-datasource-compute-image"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
index 6fad0aedd942..40ae8bd983fe 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance"
 sidebar_current: "docs-google-datasource-compute-instance-x"
@@ -203,4 +204,4 @@ The `shielded_instance_config` block supports:
 
 * `enable_vtpm` -- Whether the instance uses vTPM.
 
-* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
\ No newline at end of file
+* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
index 94f1b481c840..cce7318e0207 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_lb_ip_ranges"
 sidebar_current: "docs-google-datasource-compute-lb-ip-ranges"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown
index 0d975e8f510f..0a134ed4f386 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network"
 sidebar_current: "docs-google-datasource-compute-network"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
index 0d4f54a40879..592c220da5c7 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_instance_group"
 sidebar_current: "docs-google-datasource-compute-region-instance-group"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown
index 8c197a095e5b..5ec2208b2b79 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Compute Engine"
 page_title: "Google: google_compute_router"
 sidebar_current: "docs-google-datasource-compute-router"
 description: |-
@@ -27,7 +28,7 @@ The following arguments are supported:
 
 * `network` - (Required) The VPC network on which this router lives.
 
-* `project` - (Optional) The ID of the project in which the resource 
+* `project` - (Optional) The ID of the project in which the resource
     belongs. If it is not provided, the provider project is used.
 
 * `region` - (Optional) The region this router has been created in. If
@@ -36,4 +37,4 @@ The following arguments are supported:
 
 ## Attributes Reference
 
-See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
\ No newline at end of file
+See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
index 6e3872fa41be..deddd521f72e 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_certificate"
 sidebar_current: "docs-google-datasource-compute-ssl-certificate"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown
index d7c7e5a24677..8b4f6a0855c8 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_policy"
 sidebar_current: "docs-google-datasource-compute-ssl-policy"
@@ -48,4 +49,4 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `fingerprint` - Fingerprint of this resource.
 
-* `self_link` - The URI of the created resource.
\ No newline at end of file
+* `self_link` - The URI of the created resource.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown
index 19493e348ace..f39649411b37 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork"
 sidebar_current: "docs-google-datasource-compute-subnetwork"
diff --git a/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown
index a8a2ffd5a097..f90e29c3383a 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_vpn_gateway"
 sidebar_current: "docs-google-datasource-compute-vpn-gateway"
diff --git a/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown b/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
index 6b2d9d0d1b12..ad33f675d40d 100644
--- a/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_openid_userinfo"
 sidebar_current: "docs-google-datasource-client-openid-userinfo"
diff --git a/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown b/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
index fc3efb17b42a..a1bfec475b06 100644
--- a/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Composer"
 layout: "google"
 page_title: "Google: google_composer_image_versions"
 sidebar_current: "docs-google-datasource-composer-image-versions"
@@ -43,4 +44,4 @@ The following attributes are exported:
 
 * `image_versions` - A list of composer image versions available in the given project and location. Each `image_version` contains:
   * `image_version_id` - The string identifier of the image version, in the form: "composer-x.y.z-airflow-a.b(.c)"
-  * `supported_python_versions` - Supported python versions for this image version
\ No newline at end of file
+  * `supported_python_versions` - Supported python versions for this image version
diff --git a/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown b/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
index 91f4d75ceddd..1bb0f3d8d582 100644
--- a/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_service"
 sidebar_current: "docs-google-datasource-compute-backend-service"
diff --git a/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown b/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
index 4622ee702ffd..f9e89e12691a 100644
--- a/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_endpoint_group"
 sidebar_current: "docs-google-datasource-compute-network-endpoint-group"
diff --git a/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
index b01253b1201d..e1e18b801b44 100644
--- a/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_organization_policy"
 sidebar_current: "docs-google-datasource-folder-organization-policy"
diff --git a/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown b/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
index 77aebf4b89e4..a438b8eef362 100644
--- a/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_role"
 sidebar_current: "docs-google-datasource-iam-role"
diff --git a/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown b/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
index f6e97ca9a2ec..95d0b1874076 100644
--- a/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_netblock_ip_ranges"
 sidebar_current: "docs-google-datasource-netblock-ip-ranges"
diff --git a/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
index cf1024bc5a13..0e4a697c0fe5 100644
--- a/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_organization_policy"
 sidebar_current: "docs-google-datasource-project-organization-policy"
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
index ec60f87cb277..cc38459c2a38 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account"
 sidebar_current: "docs-google-datasource-service-account"
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
index 25027cf255f3..476c14ffc265 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_access_token"
 sidebar_current: "docs-google-service-account-access-token"
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
index c5fa00603347..69c194152d61 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_key"
 sidebar_current: "docs-google-datasource-service-account-key"
diff --git a/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown b/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
index 1ba803ebf155..7d809c68ada0 100644
--- a/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_tpu_tensorflow_versions"
 sidebar_current: "docs-google-datasource-tpu-tensorflow-versions"
diff --git a/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown b/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
index 73cb8c7aa24b..8cef82a1f6b3 100644
--- a/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
+++ b/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_managed_zone"
 sidebar_current: "docs-google-datasource-dns-managed-zone"
diff --git a/third_party/terraform/website/docs/d/google_active_folder.html.markdown b/third_party/terraform/website/docs/d/google_active_folder.html.markdown
index 8211c26ea56d..1caca3e4257a 100644
--- a/third_party/terraform/website/docs/d/google_active_folder.html.markdown
+++ b/third_party/terraform/website/docs/d/google_active_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_active_folder"
 sidebar_current: "docs-google-datasource-active-folder"
diff --git a/third_party/terraform/website/docs/d/google_billing_account.html.markdown b/third_party/terraform/website/docs/d/google_billing_account.html.markdown
index edb41c5ff451..a03e0df8ed90 100644
--- a/third_party/terraform/website/docs/d/google_billing_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_billing_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account"
 sidebar_current: "docs-google-datasource-billing-account"
diff --git a/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown b/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
index 7c84e7413d39..7e50711381d5 100644
--- a/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_default_service_account"
 sidebar_current: "docs-google-datasource-compute-default-service-account"
diff --git a/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown b/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown
index 5cb34a714a17..303df9716666 100644
--- a/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group"
 sidebar_current: "docs-google-datasource-compute-instance-group"
diff --git a/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown b/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
index f8ab883f6681..0ddde6457343 100644
--- a/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_node_types"
 sidebar_current: "docs-google-datasource-compute-node-types"
diff --git a/third_party/terraform/website/docs/d/google_compute_regions.html.markdown b/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
index 85d7b9155ed2..1df2c2bd8c6d 100644
--- a/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_regions"
 sidebar_current: "docs-google-datasource-compute-regions"
diff --git a/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown b/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
index 8789f81aab90..efaf97160418 100644
--- a/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Cloud Platform"
 page_title: "Google: google_compute_resource_policy"
 sidebar_current: "docs-google-datasource-compute-resource-policy"
 description: |-
diff --git a/third_party/terraform/website/docs/d/google_compute_zones.html.markdown b/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
index df1c139697dc..604377b6aca9 100644
--- a/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_zones"
 sidebar_current: "docs-google-datasource-compute-zones"
diff --git a/third_party/terraform/website/docs/d/google_container_cluster.html.markdown b/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
index 44a3a433d36c..67aba024ce49 100644
--- a/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_cluster"
 sidebar_current: "docs-google-datasource-container-cluster"
diff --git a/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown b/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
index a7eae609ac00..49ff7cf47c47 100644
--- a/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_engine_versions"
 sidebar_current: "docs-google-datasource-container-versions"
diff --git a/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown b/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
index 6bac718dbebc..8d7ae054a822 100644
--- a/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_image"
 sidebar_current: "docs-google-datasource-container-image"
diff --git a/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown b/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
index e0344ea6efeb..9880cc4b1b9a 100644
--- a/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_repository"
 sidebar_current: "docs-google-datasource-container-repo"
diff --git a/third_party/terraform/website/docs/d/google_folder.html.markdown b/third_party/terraform/website/docs/d/google_folder.html.markdown
index 869d674dbdac..c35afb99a248 100644
--- a/third_party/terraform/website/docs/d/google_folder.html.markdown
+++ b/third_party/terraform/website/docs/d/google_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder"
 sidebar_current: "docs-google-datasource-folder"
diff --git a/third_party/terraform/website/docs/d/google_iam_policy.html.markdown b/third_party/terraform/website/docs/d/google_iam_policy.html.markdown
index b795d20fa34e..9c42472a613a 100644
--- a/third_party/terraform/website/docs/d/google_iam_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/google_iam_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_policy"
 sidebar_current: "docs-google-datasource-iam-policy"
diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
index fbe1061907c5..82a861692efc 100644
--- a/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key"
 sidebar_current: "docs-google-datasource-kms-crypto-key"
diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
index 5108aa8c0dee..93cc08b1ed4e 100644
--- a/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_version"
 sidebar_current: "docs-google-datasource-kms-crypto-key-version"
diff --git a/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown b/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown
index 62818cb26bcb..3f788a0fc007 100644
--- a/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_key_ring"
 sidebar_current: "docs-google-datasource-kms-key-ring"
diff --git a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
index 24ab5a3ca1a4..47014bda0583 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_secret"
 sidebar_current: "docs-google-kms-secret"
diff --git a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
index 6e91f12b9b4d..a83e27f602c5 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_secret_ciphertext"
 sidebar_current: "docs-google-kms-secret-ciphertext"
@@ -61,7 +62,7 @@ resource "google_compute_instance" "instance" {
     access_config {
     }
   }
-  
+
   metadata = {
     password = "${data.google_kms_secret_ciphertext.my_password.ciphertext}"
   }
diff --git a/third_party/terraform/website/docs/d/google_organization.html.markdown b/third_party/terraform/website/docs/d/google_organization.html.markdown
index 3f9d63721b79..4168109714e6 100644
--- a/third_party/terraform/website/docs/d/google_organization.html.markdown
+++ b/third_party/terraform/website/docs/d/google_organization.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization"
 sidebar_current: "docs-google-datasource-organization"
diff --git a/third_party/terraform/website/docs/d/google_project.html.markdown b/third_party/terraform/website/docs/d/google_project.html.markdown
index b654a12f6f6c..069939a89aa8 100644
--- a/third_party/terraform/website/docs/d/google_project.html.markdown
+++ b/third_party/terraform/website/docs/d/google_project.html.markdown
@@ -1,15 +1,16 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project"
 sidebar_current: "docs-google-datasource-project"
 description: |-
-  Retrieve project details   
+  Retrieve project details
 ---
 
 # google\_project
 
 Use this data source to get project details.
-For more information see 
+For more information see
 [API](https://cloud.google.com/resource-manager/reference/rest/v1/projects#Project)
 
 ## Example Usage
@@ -19,7 +20,7 @@ data "google_project" "project" {}
 
 output "project_number" {
   value = "${data.google_project.project.number}"
-} 
+}
 ```
 
 ## Argument Reference
diff --git a/third_party/terraform/website/docs/d/google_project_services.html.markdown b/third_party/terraform/website/docs/d/google_project_services.html.markdown
index 654db29a6e42..6b0e1765c237 100644
--- a/third_party/terraform/website/docs/d/google_project_services.html.markdown
+++ b/third_party/terraform/website/docs/d/google_project_services.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_services"
 sidebar_current: "docs-google-datasource-project-services"
diff --git a/third_party/terraform/website/docs/d/google_projects.html.markdown b/third_party/terraform/website/docs/d/google_projects.html.markdown
index 00515567d213..f71a4cf4c69c 100644
--- a/third_party/terraform/website/docs/d/google_projects.html.markdown
+++ b/third_party/terraform/website/docs/d/google_projects.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_projects"
 sidebar_current: "docs-google-datasource-projects"
diff --git a/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown b/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
index 6c9bf86d20fd..8ab1e5a98af9 100644
--- a/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_storage_project_service_account"
 sidebar_current: "docs-google-datasource-storage-project-service-account"
diff --git a/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown b/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
index 124c9935dde8..06daf3ae0110 100644
--- a/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_storage_transfer_project_service_account"
 sidebar_current: "docs-google-datasource-storage-transfer-project-service-account"
diff --git a/third_party/terraform/website/docs/d/signed_url.html.markdown b/third_party/terraform/website/docs/d/signed_url.html.markdown
index e5a43d37b2c0..fee03ac2b55e 100644
--- a/third_party/terraform/website/docs/d/signed_url.html.markdown
+++ b/third_party/terraform/website/docs/d/signed_url.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_object_signed_url"
 sidebar_current: "docs-google-datasource-signed_url"
@@ -22,7 +23,7 @@ data "google_storage_object_signed_url" "artifact" {
 
 resource "google_compute_instance" "vm" {
     name = "vm"
-    
+
     provisioner "remote-exec" {
         inline = [
                 "wget '${data.google_storage_object_signed_url.artifact.signed_url}' -O install_file.bin",
@@ -43,7 +44,7 @@ data "google_storage_object_signed_url" "get_url" {
   content_type = "text/plain"
   duration     = "2d"
   credentials  = "${file("path/to/credentials.json")}"
-  
+
   extension_headers = {
     x-goog-if-generation-match = 1
   }
@@ -57,20 +58,20 @@ The following arguments are supported:
 * `bucket` - (Required) The name of the bucket to read the object from
 * `path` - (Required) The full path to the object inside the bucket
 * `http_method` - (Optional) What HTTP Method will the signed URL allow (defaults to `GET`)
-* `duration` - (Optional) For how long shall the signed URL be valid (defaults to 1 hour - i.e. `1h`). 
+* `duration` - (Optional) For how long shall the signed URL be valid (defaults to 1 hour - i.e. `1h`).
      See [here](https://golang.org/pkg/time/#ParseDuration) for info on valid duration formats.
-* `credentials` - (Optional) What Google service account credentials json should be used to sign the URL. 
+* `credentials` - (Optional) What Google service account credentials json should be used to sign the URL.
      This data source checks the following locations for credentials, in order of preference: data source `credentials` attribute, provider `credentials` attribute and finally the GOOGLE_APPLICATION_CREDENTIALS environment variable.
-     
-    > **NOTE** the default google credentials configured by `gcloud` sdk or the service account associated with a compute instance cannot be used, because these do not include the private key required to sign the URL. A valid `json` service account credentials key file must be used, as generated via Google cloud console. 
-     
+
+    > **NOTE** the default google credentials configured by `gcloud` sdk or the service account associated with a compute instance cannot be used, because these do not include the private key required to sign the URL. A valid `json` service account credentials key file must be used, as generated via Google cloud console.
+
 * `content_type` - (Optional) If you specify this in the datasource, the client must provide the `Content-Type` HTTP header with the same value in its request.
 * `content_md5` - (Optional) The [MD5 digest](https://cloud.google.com/storage/docs/hashes-etags#_MD5) value in Base64.
      Typically retrieved from `google_storage_bucket_object.object.md5hash` attribute.
      If you provide this in the datasource, the client (e.g. browser, curl) must provide the `Content-MD5` HTTP header with this same value in its request.
-* `extension_headers` - (Optional) As needed. The server checks to make sure that the client provides matching values in requests using the signed URL. 
+* `extension_headers` - (Optional) As needed. The server checks to make sure that the client provides matching values in requests using the signed URL.
      Any header starting with `x-goog-` is accepted but see the [Google Docs](https://cloud.google.com/storage/docs/xml-api/reference-headers) for list of headers that are supported by Google.
-    
+
 
 ## Attributes Reference
 
diff --git a/third_party/terraform/website/docs/d/storage_bucket_object.html.markdown b/third_party/terraform/website/docs/d/storage_bucket_object.html.markdown
index b18a74e1893a..c948b127dfa5 100644
--- a/third_party/terraform/website/docs/d/storage_bucket_object.html.markdown
+++ b/third_party/terraform/website/docs/d/storage_bucket_object.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_object"
 sidebar_current: "docs-google-datasource-storage-bucket-object"
diff --git a/third_party/terraform/website/docs/r/app_engine_application.html.markdown b/third_party/terraform/website/docs/r/app_engine_application.html.markdown
index 43a843422737..99a4773d6da5 100755
--- a/third_party/terraform/website/docs/r/app_engine_application.html.markdown
+++ b/third_party/terraform/website/docs/r/app_engine_application.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_application"
 sidebar_current: "docs-google-app-engine-application"
diff --git a/third_party/terraform/website/docs/r/bigquery_table.html.markdown b/third_party/terraform/website/docs/r/bigquery_table.html.markdown
index 9fdc39e476a1..abfe5f9c6a98 100644
--- a/third_party/terraform/website/docs/r/bigquery_table.html.markdown
+++ b/third_party/terraform/website/docs/r/bigquery_table.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "BigQuery"
 layout: "google"
 page_title: "Google: google_bigquery_table"
 sidebar_current: "docs-google-bigquery-table"
diff --git a/third_party/terraform/website/docs/r/bigtable_gc_policy.html.markdown b/third_party/terraform/website/docs/r/bigtable_gc_policy.html.markdown
index 342cef571248..0e4f4edf92d2 100644
--- a/third_party/terraform/website/docs/r/bigtable_gc_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/bigtable_gc_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_gc_policy"
 sidebar_current: "docs-google-bigtable-gc-policy"
diff --git a/third_party/terraform/website/docs/r/bigtable_instance.html.markdown b/third_party/terraform/website/docs/r/bigtable_instance.html.markdown
index ceeff0f1b187..e54ab9d79e54 100644
--- a/third_party/terraform/website/docs/r/bigtable_instance.html.markdown
+++ b/third_party/terraform/website/docs/r/bigtable_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_instance"
 sidebar_current: "docs-google-bigtable-instance"
diff --git a/third_party/terraform/website/docs/r/bigtable_instance_iam.html.markdown b/third_party/terraform/website/docs/r/bigtable_instance_iam.html.markdown
index 5babedad7101..c05293c5283e 100644
--- a/third_party/terraform/website/docs/r/bigtable_instance_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/bigtable_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_instance_iam"
 sidebar_current: "docs-google-bigtable-instance-iam"
diff --git a/third_party/terraform/website/docs/r/bigtable_table.html.markdown b/third_party/terraform/website/docs/r/bigtable_table.html.markdown
index 176d715d3cee..ad391a59c37f 100644
--- a/third_party/terraform/website/docs/r/bigtable_table.html.markdown
+++ b/third_party/terraform/website/docs/r/bigtable_table.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_table"
 sidebar_current: "docs-google-bigtable-table"
diff --git a/third_party/terraform/website/docs/r/cloudfunctions_function.html.markdown b/third_party/terraform/website/docs/r/cloudfunctions_function.html.markdown
index 4a87b69f6b98..ffec17d642b0 100644
--- a/third_party/terraform/website/docs/r/cloudfunctions_function.html.markdown
+++ b/third_party/terraform/website/docs/r/cloudfunctions_function.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function"
 sidebar_current: "docs-google-cloudfunctions-function"
diff --git a/third_party/terraform/website/docs/r/cloudiot_registry.html.markdown b/third_party/terraform/website/docs/r/cloudiot_registry.html.markdown
index 624ac64a19e6..ec2188850d4c 100644
--- a/third_party/terraform/website/docs/r/cloudiot_registry.html.markdown
+++ b/third_party/terraform/website/docs/r/cloudiot_registry.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud IoT Core"
 layout: "google"
 page_title: "Google: google_cloudiot_registry"
 sidebar_current: "docs-google-cloudiot-registry-x"
diff --git a/third_party/terraform/website/docs/r/composer_environment.html.markdown b/third_party/terraform/website/docs/r/composer_environment.html.markdown
index cd1f46624e5c..77a9feacefef 100644
--- a/third_party/terraform/website/docs/r/composer_environment.html.markdown
+++ b/third_party/terraform/website/docs/r/composer_environment.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Composer"
 layout: "google"
 page_title: "Google: google_composer_environment"
 sidebar_current: "docs-google-composer-environment"
diff --git a/third_party/terraform/website/docs/r/compute_attached_disk.html.markdown b/third_party/terraform/website/docs/r/compute_attached_disk.html.markdown
index e8ea40375c4a..cf2747939305 100644
--- a/third_party/terraform/website/docs/r/compute_attached_disk.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_attached_disk.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_attached_disk"
 sidebar_current: "docs-google-compute-attached-disk"
diff --git a/third_party/terraform/website/docs/r/compute_instance.html.markdown b/third_party/terraform/website/docs/r/compute_instance.html.markdown
index 9ab8a516ff21..ae70bdff002b 100644
--- a/third_party/terraform/website/docs/r/compute_instance.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance"
 sidebar_current: "docs-google-compute-instance-x"
diff --git a/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown b/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown
index 4c11b090b325..99491ad5458d 100644
--- a/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_from_template"
 sidebar_current: "docs-google-compute-instance-from-template"
diff --git a/third_party/terraform/website/docs/r/compute_instance_group.html.markdown b/third_party/terraform/website/docs/r/compute_instance_group.html.markdown
index 96627ba56df6..5009ac062ad6 100644
--- a/third_party/terraform/website/docs/r/compute_instance_group.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group"
 sidebar_current: "docs-google-compute-instance-group-x"
diff --git a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown
index 6d4dcb1b3b07..5ae5e2b51836 100644
--- a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group_manager"
 sidebar_current: "docs-google-compute-instance-group-manager"
diff --git a/third_party/terraform/website/docs/r/compute_instance_iam.html.markdown b/third_party/terraform/website/docs/r/compute_instance_iam.html.markdown
index eaef8b2a69bf..9e30d21f7856 100644
--- a/third_party/terraform/website/docs/r/compute_instance_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_iam"
 sidebar_current: "docs-google-compute-instance-iam"
diff --git a/third_party/terraform/website/docs/r/compute_instance_template.html.markdown b/third_party/terraform/website/docs/r/compute_instance_template.html.markdown
index 8bf69fd79710..c43762726883 100644
--- a/third_party/terraform/website/docs/r/compute_instance_template.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_instance_template.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_template"
 sidebar_current: "docs-google-compute-instance-template"
diff --git a/third_party/terraform/website/docs/r/compute_network_peering.html.markdown b/third_party/terraform/website/docs/r/compute_network_peering.html.markdown
index e649c0ee2acf..c8d0fdb20a3b 100644
--- a/third_party/terraform/website/docs/r/compute_network_peering.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_network_peering.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_peering"
 sidebar_current: "docs-google-compute-network-peering"
diff --git a/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown b/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown
index 20dd54ad837a..ce67afa6ea90 100644
--- a/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_default_network_tier"
 sidebar_current: "docs-google-compute-project-default-network-tier"
diff --git a/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown b/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown
index 77b74b131dfe..e975ec2a5ef3 100644
--- a/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_metadata"
 sidebar_current: "docs-google-compute-project-metadata"
diff --git a/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown b/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown
index 83c207045468..d3f92a6a9971 100644
--- a/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_metadata_item"
 sidebar_current: "docs-google-compute-project-metadata-item"
@@ -54,4 +55,4 @@ This resource provides the following
 
 - `create` - Default is 5 minutes.
 - `update` - Default is 5 minutes.
-- `delete` - Default is 5 minutes.
\ No newline at end of file
+- `delete` - Default is 5 minutes.
diff --git a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown
index 0b54c0c3dfe8..16e1d4ecdab9 100644
--- a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_instance_group_manager"
 sidebar_current: "docs-google-compute-region_instance-group-manager"
diff --git a/third_party/terraform/website/docs/r/compute_router_interface.html.markdown b/third_party/terraform/website/docs/r/compute_router_interface.html.markdown
index 01f1df92507a..8fe20838d4b3 100644
--- a/third_party/terraform/website/docs/r/compute_router_interface.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_router_interface.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router_interface"
 sidebar_current: "docs-google-compute-router-interface"
diff --git a/third_party/terraform/website/docs/r/compute_router_peer.html.markdown b/third_party/terraform/website/docs/r/compute_router_peer.html.markdown
index 7ffb41178732..3964503d2eb8 100644
--- a/third_party/terraform/website/docs/r/compute_router_peer.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_router_peer.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router_peer"
 sidebar_current: "docs-google-compute-router-peer"
diff --git a/third_party/terraform/website/docs/r/compute_security_policy.html.markdown b/third_party/terraform/website/docs/r/compute_security_policy.html.markdown
index 1f921b80cf3f..778bd199eda8 100644
--- a/third_party/terraform/website/docs/r/compute_security_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_security_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_security_policy"
 sidebar_current: "docs-google-compute-security-policy"
diff --git a/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown b/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown
index cdec57c2cb58..cbefbe3e9b8b 100644
--- a/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_shared_vpc_host_project"
 sidebar_current: "docs-google-compute-shared-vpc-host-project"
diff --git a/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown b/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown
index 6744f3dd9b0f..7db964db4031 100644
--- a/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_shared_vpc_service_project"
 sidebar_current: "docs-google-compute-shared-vpc-service-project"
diff --git a/third_party/terraform/website/docs/r/compute_subnetwork_iam.html.markdown b/third_party/terraform/website/docs/r/compute_subnetwork_iam.html.markdown
index 313a757823cd..0964035c6c5a 100644
--- a/third_party/terraform/website/docs/r/compute_subnetwork_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_subnetwork_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork_iam"
 sidebar_current: "docs-google-compute-subnetwork-iam"
diff --git a/third_party/terraform/website/docs/r/compute_target_pool.html.markdown b/third_party/terraform/website/docs/r/compute_target_pool.html.markdown
index 6b41f0029f93..4d7a7453385f 100644
--- a/third_party/terraform/website/docs/r/compute_target_pool.html.markdown
+++ b/third_party/terraform/website/docs/r/compute_target_pool.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_pool"
 sidebar_current: "docs-google-compute-target-pool"
diff --git a/third_party/terraform/website/docs/r/container_cluster.html.markdown b/third_party/terraform/website/docs/r/container_cluster.html.markdown
index 8104fe065326..6caf0d7b66e8 100644
--- a/third_party/terraform/website/docs/r/container_cluster.html.markdown
+++ b/third_party/terraform/website/docs/r/container_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_cluster"
 sidebar_current: "docs-google-container-cluster"
diff --git a/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
index c2411f0f9ee6..cce77db73f71 100644
--- a/third_party/terraform/website/docs/r/container_node_pool.html.markdown
+++ b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_node_pool"
 sidebar_current: "docs-google-container-node-pool"
diff --git a/third_party/terraform/website/docs/r/dataflow_job.html.markdown b/third_party/terraform/website/docs/r/dataflow_job.html.markdown
index 8b3901b4cf85..a93ab643ef85 100644
--- a/third_party/terraform/website/docs/r/dataflow_job.html.markdown
+++ b/third_party/terraform/website/docs/r/dataflow_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataflow"
 layout: "google"
 page_title: "Google: google_dataflow_job"
 sidebar_current: "docs-google-dataflow-job"
diff --git a/third_party/terraform/website/docs/r/dataproc_cluster.html.markdown b/third_party/terraform/website/docs/r/dataproc_cluster.html.markdown
index f53814e7be7f..384554d54a38 100644
--- a/third_party/terraform/website/docs/r/dataproc_cluster.html.markdown
+++ b/third_party/terraform/website/docs/r/dataproc_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_cluster"
 sidebar_current: "docs-google-dataproc-cluster"
diff --git a/third_party/terraform/website/docs/r/dataproc_cluster_iam.html.markdown b/third_party/terraform/website/docs/r/dataproc_cluster_iam.html.markdown
index e88bd67e1fce..0668b4b1a6bb 100644
--- a/third_party/terraform/website/docs/r/dataproc_cluster_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/dataproc_cluster_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_cluster_iam"
 sidebar_current: "docs-google-dataproc-cluster-iam"
@@ -109,4 +110,4 @@ $ terraform import google_dataproc_cluster_iam_policy.editor "projects/{project}
 $ terraform import google_dataproc_cluster_iam_binding.editor "projects/{project}/regions/{region}/clusters/{cluster} roles/editor"
 
 $ terraform import google_dataproc_cluster_iam_member.editor "projects/{project}/regions/{region}/clusters/{cluster} roles/editor user:jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/third_party/terraform/website/docs/r/dataproc_job.html.markdown b/third_party/terraform/website/docs/r/dataproc_job.html.markdown
index 5768d63bda16..0fa795e14784 100644
--- a/third_party/terraform/website/docs/r/dataproc_job.html.markdown
+++ b/third_party/terraform/website/docs/r/dataproc_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_job"
 sidebar_current: "docs-google-dataproc-job"
diff --git a/third_party/terraform/website/docs/r/dataproc_job_iam.html.markdown b/third_party/terraform/website/docs/r/dataproc_job_iam.html.markdown
index 0f91d61b8f56..694d3126d7f6 100644
--- a/third_party/terraform/website/docs/r/dataproc_job_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/dataproc_job_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_job_iam"
 sidebar_current: "docs-google-dataproc-job-iam"
@@ -109,4 +110,4 @@ $ terraform import google_dataproc_job_iam_policy.editor "projects/{project}/reg
 $ terraform import google_dataproc_job_iam_binding.editor "projects/{project}/regions/{region}/jobs/{job_id} roles/editor"
 
 $ terraform import google_dataproc_job_iam_member.editor "projects/{project}/regions/{region}/jobs/{job_id} roles/editor user:jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/third_party/terraform/website/docs/r/dns_record_set.markdown b/third_party/terraform/website/docs/r/dns_record_set.markdown
index 38a85a9e7cd0..1c48f640a0ab 100644
--- a/third_party/terraform/website/docs/r/dns_record_set.markdown
+++ b/third_party/terraform/website/docs/r/dns_record_set.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_record_set"
 sidebar_current: "docs-google-dns-record-set"
diff --git a/third_party/terraform/website/docs/r/endpoints_service.html.markdown b/third_party/terraform/website/docs/r/endpoints_service.html.markdown
index f3e9c1cdfc9d..c4ee63714ce2 100644
--- a/third_party/terraform/website/docs/r/endpoints_service.html.markdown
+++ b/third_party/terraform/website/docs/r/endpoints_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Endpoints"
 layout: "google"
 page_title: "Google: google_endpoints_service"
 sidebar_current: "docs-google-endpoints-service"
diff --git a/third_party/terraform/website/docs/r/google_billing_account_iam_binding.md b/third_party/terraform/website/docs/r/google_billing_account_iam_binding.md
index eac0bd93663f..7eff97c289d9 100644
--- a/third_party/terraform/website/docs/r/google_billing_account_iam_binding.md
+++ b/third_party/terraform/website/docs/r/google_billing_account_iam_binding.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_binding"
 sidebar_current: "docs-google-billing-account-iam-binding"
diff --git a/third_party/terraform/website/docs/r/google_billing_account_iam_member.md b/third_party/terraform/website/docs/r/google_billing_account_iam_member.md
index d4cc499d9a4a..68e27a0e81dd 100644
--- a/third_party/terraform/website/docs/r/google_billing_account_iam_member.md
+++ b/third_party/terraform/website/docs/r/google_billing_account_iam_member.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_member"
 sidebar_current: "docs-google-billing-account-iam-member"
diff --git a/third_party/terraform/website/docs/r/google_billing_account_iam_policy.md b/third_party/terraform/website/docs/r/google_billing_account_iam_policy.md
index 5b0f26e64dc2..5f571bab400d 100644
--- a/third_party/terraform/website/docs/r/google_billing_account_iam_policy.md
+++ b/third_party/terraform/website/docs/r/google_billing_account_iam_policy.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_policy"
 sidebar_current: "docs-google-billing-account-iam-policy"
diff --git a/third_party/terraform/website/docs/r/google_folder.html.markdown b/third_party/terraform/website/docs/r/google_folder.html.markdown
index 8f595f25f972..fb476f3b3a49 100644
--- a/third_party/terraform/website/docs/r/google_folder.html.markdown
+++ b/third_party/terraform/website/docs/r/google_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder"
 sidebar_current: "docs-google-folder-x"
diff --git a/third_party/terraform/website/docs/r/google_folder_iam_binding.html.markdown b/third_party/terraform/website/docs/r/google_folder_iam_binding.html.markdown
index dfa6d37013e3..a5201dde4573 100644
--- a/third_party/terraform/website/docs/r/google_folder_iam_binding.html.markdown
+++ b/third_party/terraform/website/docs/r/google_folder_iam_binding.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_binding"
 sidebar_current: "docs-google-folder-iam-binding"
diff --git a/third_party/terraform/website/docs/r/google_folder_iam_member.html.markdown b/third_party/terraform/website/docs/r/google_folder_iam_member.html.markdown
index c3f09742803f..e8e4b9634951 100644
--- a/third_party/terraform/website/docs/r/google_folder_iam_member.html.markdown
+++ b/third_party/terraform/website/docs/r/google_folder_iam_member.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_member"
 sidebar_current: "docs-google-folder-iam-member"
diff --git a/third_party/terraform/website/docs/r/google_folder_iam_policy.html.markdown b/third_party/terraform/website/docs/r/google_folder_iam_policy.html.markdown
index 5268e3e1337c..f709a2aa80d7 100644
--- a/third_party/terraform/website/docs/r/google_folder_iam_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/google_folder_iam_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_policy"
 sidebar_current: "docs-google-folders-iam-policy"
diff --git a/third_party/terraform/website/docs/r/google_folder_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_folder_organization_policy.html.markdown
index feefc19f4453..d6687932a4a3 100644
--- a/third_party/terraform/website/docs/r/google_folder_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/google_folder_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_organization_policy"
 sidebar_current: "docs-google-folder-organization-policy"
diff --git a/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown b/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
index f0782cceb231..5d5ebf463572 100644
--- a/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
+++ b/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_iam_binding"
 sidebar_current: "docs-google-kms-crypto-key-iam-binding"
diff --git a/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_member.html.markdown b/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
index fa3111df38a7..70889afd9ec3 100644
--- a/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
+++ b/third_party/terraform/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_iam_member"
 sidebar_current: "docs-google-kms-crypto-key-iam-member"
diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown
index 654f9e98a970..4e16455d9bef 100644
--- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_key_ring_iam"
 sidebar_current: "docs-google-kms-key-ring-iam"
diff --git a/third_party/terraform/website/docs/r/google_organization_iam_binding.md b/third_party/terraform/website/docs/r/google_organization_iam_binding.md
index be14a12ab808..b387c18c2311 100644
--- a/third_party/terraform/website/docs/r/google_organization_iam_binding.md
+++ b/third_party/terraform/website/docs/r/google_organization_iam_binding.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_binding"
 sidebar_current: "docs-google-organization-iam-binding"
diff --git a/third_party/terraform/website/docs/r/google_organization_iam_custom_role.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_custom_role.html.markdown
index 2593e0481f7a..69a007ad5f6a 100644
--- a/third_party/terraform/website/docs/r/google_organization_iam_custom_role.html.markdown
+++ b/third_party/terraform/website/docs/r/google_organization_iam_custom_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_custom_role"
 sidebar_current: "docs-google-organization-iam-custom-role"
diff --git a/third_party/terraform/website/docs/r/google_organization_iam_member.md b/third_party/terraform/website/docs/r/google_organization_iam_member.md
index a16d2cfbcd7b..ca03fe63628a 100644
--- a/third_party/terraform/website/docs/r/google_organization_iam_member.md
+++ b/third_party/terraform/website/docs/r/google_organization_iam_member.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_member"
 sidebar_current: "docs-google-organization-iam-member"
diff --git a/third_party/terraform/website/docs/r/google_organization_iam_policy.md b/third_party/terraform/website/docs/r/google_organization_iam_policy.md
index d4859dd11924..84962b74c2a6 100644
--- a/third_party/terraform/website/docs/r/google_organization_iam_policy.md
+++ b/third_party/terraform/website/docs/r/google_organization_iam_policy.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_policy"
 sidebar_current: "docs-google-organization-iam-policy"
diff --git a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown
index c582040d3f78..cafeb8dd6d71 100644
--- a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_policy"
 sidebar_current: "docs-google-organization-policy"
diff --git a/third_party/terraform/website/docs/r/google_project.html.markdown b/third_party/terraform/website/docs/r/google_project.html.markdown
index 09bc903e035b..33b93e0827b7 100755
--- a/third_party/terraform/website/docs/r/google_project.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project"
 sidebar_current: "docs-google-project-x"
diff --git a/third_party/terraform/website/docs/r/google_project_iam.html.markdown b/third_party/terraform/website/docs/r/google_project_iam.html.markdown
index 0a12b1e19877..b224fd4e4458 100644
--- a/third_party/terraform/website/docs/r/google_project_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_iam"
 sidebar_current: "docs-google-project-iam-x"
@@ -158,4 +159,4 @@ IAM audit config imports use the identifier of the resource in question and the
 
 ```
 terraform import google_project_iam_audit_config.my_project "your-project-id foo.googleapis.com"
-```
\ No newline at end of file
+```
diff --git a/third_party/terraform/website/docs/r/google_project_iam_custom_role.html.markdown b/third_party/terraform/website/docs/r/google_project_iam_custom_role.html.markdown
index 8dbf60cd605c..8bd0db91e454 100644
--- a/third_party/terraform/website/docs/r/google_project_iam_custom_role.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project_iam_custom_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_iam_custom_role"
 sidebar_current: "docs-google-project-iam-custom-role"
diff --git a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown
index 370c6e571339..503fdb382d42 100644
--- a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_organization_policy"
 sidebar_current: "docs-google-project-organization-policy"
diff --git a/third_party/terraform/website/docs/r/google_project_service.html.markdown b/third_party/terraform/website/docs/r/google_project_service.html.markdown
index 5a18f9bbe3d0..c4f22cc4fa3f 100644
--- a/third_party/terraform/website/docs/r/google_project_service.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_service"
 sidebar_current: "docs-google-project-service-x"
diff --git a/third_party/terraform/website/docs/r/google_project_services.html.markdown b/third_party/terraform/website/docs/r/google_project_services.html.markdown
index 0347006221ec..f685b10dfccc 100644
--- a/third_party/terraform/website/docs/r/google_project_services.html.markdown
+++ b/third_party/terraform/website/docs/r/google_project_services.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_services"
 sidebar_current: "docs-google-project-services"
diff --git a/third_party/terraform/website/docs/r/google_service_account.html.markdown b/third_party/terraform/website/docs/r/google_service_account.html.markdown
index 0a35288b907c..ef96e34dbab7 100644
--- a/third_party/terraform/website/docs/r/google_service_account.html.markdown
+++ b/third_party/terraform/website/docs/r/google_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account"
 sidebar_current: "docs-google-service-account-x"
diff --git a/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown
index 5b40c2e37926..1b2ff1a490fe 100644
--- a/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_iam"
 sidebar_current: "docs-google-service-account-iam"
@@ -193,3 +194,4 @@ With conditions:
 $ terraform import -provider=google-beta google_service_account_iam_binding.admin-account-iam "projects/{your-project-id}/serviceAccounts/{your-service-account-email} iam.serviceAccountUser expires_after_2019_12_31"
 
 $ terraform import -provider=google-beta google_service_account_iam_member.admin-account-iam "projects/{your-project-id}/serviceAccounts/{your-service-account-email} iam.serviceAccountUser user:foo@example.com expires_after_2019_12_31"
+```
diff --git a/third_party/terraform/website/docs/r/google_service_account_key.html.markdown b/third_party/terraform/website/docs/r/google_service_account_key.html.markdown
index ad0e2d6e07b9..87f80b2e9cc1 100644
--- a/third_party/terraform/website/docs/r/google_service_account_key.html.markdown
+++ b/third_party/terraform/website/docs/r/google_service_account_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_key"
 sidebar_current: "docs-google-service-account-key"
diff --git a/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown b/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown
index f33337609a46..0bf107148196 100644
--- a/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_billing_account_exclusion"
 sidebar_current: "docs-google-logging-billing_account-exclusion"
diff --git a/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown b/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown
index 9247e44194f1..b4b005c56d98 100644
--- a/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_billing_account_sink"
 sidebar_current: "docs-google-logging-billing-account-sink"
diff --git a/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown b/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown
index 7f4784bd0f68..107dc42c6c8c 100644
--- a/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_folder_exclusion"
 sidebar_current: "docs-google-logging-folder-exclusion"
diff --git a/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown b/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown
index 5a7bdfeea3b7..ab0763768383 100644
--- a/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_folder_sink"
 sidebar_current: "docs-google-logging-folder-sink"
diff --git a/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown b/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown
index 252f44e2127d..e0bca87533e9 100644
--- a/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_organization_exclusion"
 sidebar_current: "docs-google-logging-organization-exclusion"
diff --git a/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown b/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown
index 92a224460465..74b9326ea0f7 100644
--- a/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_organization_sink"
 sidebar_current: "docs-google-logging-organization-sink"
diff --git a/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown b/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown
index 0fc718664843..74d4ea2ab94a 100644
--- a/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_project_exclusion"
 sidebar_current: "docs-google-logging-project-exclusion"
diff --git a/third_party/terraform/website/docs/r/logging_project_sink.html.markdown b/third_party/terraform/website/docs/r/logging_project_sink.html.markdown
index 4319128a4633..e0eacea8d50d 100644
--- a/third_party/terraform/website/docs/r/logging_project_sink.html.markdown
+++ b/third_party/terraform/website/docs/r/logging_project_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_project_sink"
 sidebar_current: "docs-google-logging-project-sink"
diff --git a/third_party/terraform/website/docs/r/pubsub_subscription_iam.html.markdown b/third_party/terraform/website/docs/r/pubsub_subscription_iam.html.markdown
index 4555ecc8cd21..12e5181706d7 100644
--- a/third_party/terraform/website/docs/r/pubsub_subscription_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/pubsub_subscription_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Pub/Sub"
 layout: "google"
 page_title: "Google: google_pubsub_subscription_iam"
 sidebar_current: "docs-google-pubsub-subscription-iam"
@@ -102,4 +103,4 @@ $ terraform import google_pubsub_subscription_iam_policy.editor projects/{your-p
 $ terraform import google_pubsub_subscription_iam_binding.editor "projects/{your-project-id}/subscriptions/{your-subscription-name} roles/editor"
 
 $ terraform import google_pubsub_subscription_iam_member.editor "projects/{your-project-id}/subscriptions/{your-subscription-name} roles/editor jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/third_party/terraform/website/docs/r/runtimeconfig_config.html.markdown b/third_party/terraform/website/docs/r/runtimeconfig_config.html.markdown
index df7db89b596d..713dee1a9424 100644
--- a/third_party/terraform/website/docs/r/runtimeconfig_config.html.markdown
+++ b/third_party/terraform/website/docs/r/runtimeconfig_config.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Runtime Configuration"
 layout: "google"
 page_title: "Google: google_runtimeconfig_config"
 sidebar_current: "docs-google-runtimeconfig-config"
diff --git a/third_party/terraform/website/docs/r/runtimeconfig_variable.html.markdown b/third_party/terraform/website/docs/r/runtimeconfig_variable.html.markdown
index 3de5392a6f38..3618b1ffbdc3 100644
--- a/third_party/terraform/website/docs/r/runtimeconfig_variable.html.markdown
+++ b/third_party/terraform/website/docs/r/runtimeconfig_variable.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Runtime Configuration"
 layout: "google"
 page_title: "Google: google_runtimeconfig_variable"
 sidebar_current: "docs-google-runtimeconfig-variable"
diff --git a/third_party/terraform/website/docs/r/service_networking_connection.html.markdown b/third_party/terraform/website/docs/r/service_networking_connection.html.markdown
index 9e433886bbdb..1e377834bd7c 100644
--- a/third_party/terraform/website/docs/r/service_networking_connection.html.markdown
+++ b/third_party/terraform/website/docs/r/service_networking_connection.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Service Networking"
 layout: "google"
 page_title: "Google: google_service_networking_connection"
 sidebar_current: "docs-google-service-networking-connection"
diff --git a/third_party/terraform/website/docs/r/spanner_database_iam.html.markdown b/third_party/terraform/website/docs/r/spanner_database_iam.html.markdown
index f9f528b517a9..006e3ed75528 100644
--- a/third_party/terraform/website/docs/r/spanner_database_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/spanner_database_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Spanner"
 layout: "google"
 page_title: "Google: google_spanner_database_iam"
 sidebar_current: "docs-google-spanner-database-iam"
diff --git a/third_party/terraform/website/docs/r/spanner_instance_iam.html.markdown b/third_party/terraform/website/docs/r/spanner_instance_iam.html.markdown
index cda901cd7338..969a13a326bf 100644
--- a/third_party/terraform/website/docs/r/spanner_instance_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/spanner_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Spanner"
 layout: "google"
 page_title: "Google: google_spanner_instance_iam"
 sidebar_current: "docs-google-spanner-instance-iam"
diff --git a/third_party/terraform/website/docs/r/sql_database_instance.html.markdown b/third_party/terraform/website/docs/r/sql_database_instance.html.markdown
index 07fa3f306883..f7c787ac9903 100644
--- a/third_party/terraform/website/docs/r/sql_database_instance.html.markdown
+++ b/third_party/terraform/website/docs/r/sql_database_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud SQL"
 layout: "google"
 page_title: "Google: google_sql_database_instance"
 sidebar_current: "docs-google-sql-database-instance"
diff --git a/third_party/terraform/website/docs/r/sql_ssl_cert.html.markdown b/third_party/terraform/website/docs/r/sql_ssl_cert.html.markdown
index 547507fc99d0..76b4efc1cee3 100644
--- a/third_party/terraform/website/docs/r/sql_ssl_cert.html.markdown
+++ b/third_party/terraform/website/docs/r/sql_ssl_cert.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud SQL"
 layout: "google"
 page_title: "Google: google_sql_ssl_cert"
 sidebar_current: "docs-google-sql-ssl-cert"
diff --git a/third_party/terraform/website/docs/r/sql_user.html.markdown b/third_party/terraform/website/docs/r/sql_user.html.markdown
index 8ed3d280a56d..a282e6100f34 100644
--- a/third_party/terraform/website/docs/r/sql_user.html.markdown
+++ b/third_party/terraform/website/docs/r/sql_user.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud SQL"
 layout: "google"
 page_title: "Google: google_sql_user"
 sidebar_current: "docs-google-sql-user"
diff --git a/third_party/terraform/website/docs/r/storage_bucket.html.markdown b/third_party/terraform/website/docs/r/storage_bucket.html.markdown
index 955e7926583b..b96fd891bc8f 100644
--- a/third_party/terraform/website/docs/r/storage_bucket.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_bucket.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket"
 sidebar_current: "docs-google-storage-bucket-x"
diff --git a/third_party/terraform/website/docs/r/storage_bucket_acl.html.markdown b/third_party/terraform/website/docs/r/storage_bucket_acl.html.markdown
index 93b51a1f92c1..13422ab52267 100644
--- a/third_party/terraform/website/docs/r/storage_bucket_acl.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_bucket_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_acl"
 sidebar_current: "docs-google-storage-bucket-acl"
diff --git a/third_party/terraform/website/docs/r/storage_bucket_iam.html.markdown b/third_party/terraform/website/docs/r/storage_bucket_iam.html.markdown
index 85920247e0ea..feb2c22b9e6c 100644
--- a/third_party/terraform/website/docs/r/storage_bucket_iam.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_bucket_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_iam"
 sidebar_current: "docs-google-storage-bucket-iam"
diff --git a/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown b/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown
index 0d8b80d17f87..679d44091169 100644
--- a/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_object"
 sidebar_current: "docs-google-storage-bucket-object"
diff --git a/third_party/terraform/website/docs/r/storage_default_object_acl.html.markdown b/third_party/terraform/website/docs/r/storage_default_object_acl.html.markdown
index 413715d37307..596832b3cfda 100644
--- a/third_party/terraform/website/docs/r/storage_default_object_acl.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_default_object_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_default_object_acl"
 sidebar_current: "docs-google-storage-default-object-acl"
diff --git a/third_party/terraform/website/docs/r/storage_notification.html.markdown b/third_party/terraform/website/docs/r/storage_notification.html.markdown
index aa6debba9cd7..f78dc51af6b8 100644
--- a/third_party/terraform/website/docs/r/storage_notification.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_notification.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_notification"
 sidebar_current: "docs-google-storage-notification"
diff --git a/third_party/terraform/website/docs/r/storage_object_acl.html.markdown b/third_party/terraform/website/docs/r/storage_object_acl.html.markdown
index ce729ae43ac2..e8eb1d674736 100644
--- a/third_party/terraform/website/docs/r/storage_object_acl.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_object_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_object_acl"
 sidebar_current: "docs-google-storage-object-acl"
diff --git a/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown b/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown
index 0b64ccd080af..be2bc0172f91 100644
--- a/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown
+++ b/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_transfer_job"
 sidebar_current: "docs-google-storage-transfer-job-x"
diff --git a/third_party/terraform/website/docs/r/usage_export_bucket.html.markdown b/third_party/terraform/website/docs/r/usage_export_bucket.html.markdown
index 8f187ef61c4e..d7bb95c66d49 100644
--- a/third_party/terraform/website/docs/r/usage_export_bucket.html.markdown
+++ b/third_party/terraform/website/docs/r/usage_export_bucket.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_usage_export_bucket"
 sidebar_current: "docs-google-project-usage-export-bucket"