diff --git a/docs/resources/dw_aws_cluster.md b/docs/resources/dw_aws_cluster.md
index 719740f5..a678f4fc 100644
--- a/docs/resources/dw_aws_cluster.md
+++ b/docs/resources/dw_aws_cluster.md
@@ -1,7 +1,6 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "cdp_dw_aws_cluster Resource - terraform-provider-cdp"
-subcategory: ""
+subcategory: "Data Warehouse"
 description: |-
   Creates an AWS Data Warehouse cluster.
 ---
@@ -134,5 +133,3 @@ Optional:
 - `async` (Boolean) Boolean value that specifies if Terraform should wait for resource creation/deletion.
 - `call_failure_threshold` (Number) Threshold value that specifies how many times should a single call failure happen before giving up the polling.
 - `polling_timeout` (Number) Timeout value in minutes that specifies for how long should the polling go for resource creation/deletion.
-
-
diff --git a/docs/resources/dw_database_catalog.md b/docs/resources/dw_database_catalog.md
index 3a2c8eb1..31c7c0e3 100644
--- a/docs/resources/dw_database_catalog.md
+++ b/docs/resources/dw_database_catalog.md
@@ -1,7 +1,6 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "cdp_dw_database_catalog Resource - terraform-provider-cdp"
-subcategory: ""
+subcategory: "Data Warehouse"
 description: |-
   Creates an AWS Data Warehouse database catalog.
 ---
@@ -38,5 +37,3 @@ Optional:
 - `async` (Boolean) Boolean value that specifies if Terraform should wait for resource creation/deletion.
 - `call_failure_threshold` (Number) Threshold value that specifies how many times should a single call failure happen before giving up the polling.
 - `polling_timeout` (Number) Timeout value in minutes that specifies for how long should the polling go for resource creation/deletion.
-
-
diff --git a/docs/resources/dw_vw_hive.md b/docs/resources/dw_vw_hive.md
new file mode 100644
index 00000000..596cb2ad
--- /dev/null
+++ b/docs/resources/dw_vw_hive.md
@@ -0,0 +1,4 @@
+---
+page_title: "<no value> <no value> - <no value>"
+subcategory: "Data Warehouse"
+description: |-
diff --git a/examples/resources/cdp_dw_hive/resource.tf b/examples/resources/cdp_dw_vw_hive/resource.tf
similarity index 94%
rename from examples/resources/cdp_dw_hive/resource.tf
rename to examples/resources/cdp_dw_vw_hive/resource.tf
index f14a1df1..c4094659 100644
--- a/examples/resources/cdp_dw_hive/resource.tf
+++ b/examples/resources/cdp_dw_vw_hive/resource.tf
@@ -8,7 +8,7 @@
 # OF ANY KIND, either express or implied. Refer to the License for the specific
 # permissions and limitations governing your use of the file.
 
-resource "cdp_vw_hive" "example" {
+resource "cdp_dw_vw_hive" "example" {
   cluster_id          = var.cluster_id
   database_catalog_id = var.database_catalog_id
   name                = var.name
diff --git a/examples/resources/cdp_environments_aws_credential/resource.tf b/examples/resources/cdp_environments_aws_credential/resource.tf
index ab185c47..30007fb2 100644
--- a/examples/resources/cdp_environments_aws_credential/resource.tf
+++ b/examples/resources/cdp_environments_aws_credential/resource.tf
@@ -9,11 +9,11 @@
 # permissions and limitations governing your use of the file.
 
 resource "cdp_environments_aws_credential" "example" {
-  credential_name = "example-cdp-aws-credential"
-  role_arn        = "arn:aws:iam::11111111111:role/example-cross-account-role"
-  description     = "Example AWS Credentials"
+  credential_name           = "example-cdp-aws-credential"
+  role_arn                  = "arn:aws:iam::11111111111:role/example-cross-account-role"
+  description               = "Example AWS Credentials"
   skip_org_policy_decisions = false
-  verify_permissions = false
+  verify_permissions        = false
 }
 
 output "credential_name" {
diff --git a/resources/dw/virtualwarehouse/hive/resource_hive_vw_test.go b/resources/dw/virtualwarehouse/hive/resource_hive_vw_test.go
index a6f7d4fe..37af97c1 100644
--- a/resources/dw/virtualwarehouse/hive/resource_hive_vw_test.go
+++ b/resources/dw/virtualwarehouse/hive/resource_hive_vw_test.go
@@ -36,6 +36,7 @@ import (
 )
 
 var testHiveSchema = schema.Schema{
+	MarkdownDescription: "A Hive Virtual Warehouse is service which is able to run big SQL queries.",
 	Attributes: map[string]schema.Attribute{
 		"id": schema.StringAttribute{
 			Computed: true,
diff --git a/resources/dw/virtualwarehouse/hive/schema_hive_vw.go b/resources/dw/virtualwarehouse/hive/schema_hive_vw.go
index db865a75..54babd09 100644
--- a/resources/dw/virtualwarehouse/hive/schema_hive_vw.go
+++ b/resources/dw/virtualwarehouse/hive/schema_hive_vw.go
@@ -20,6 +20,7 @@ import (
 )
 
 var hiveSchema = schema.Schema{
+	MarkdownDescription: "A Hive Virtual Warehouse is service which is able to run big SQL queries.",
 	Attributes: map[string]schema.Attribute{
 		"id": schema.StringAttribute{
 			Computed: true,
diff --git a/templates/resources/dw_aws_cluster.md.tmpl b/templates/resources/dw_aws_cluster.md.tmpl
new file mode 100644
index 00000000..48bbee41
--- /dev/null
+++ b/templates/resources/dw_aws_cluster.md.tmpl
@@ -0,0 +1,26 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "Data Warehouse"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} ({{.Type}})
+
+{{ .Description | trimspace }}
+
+{{ if .HasExample -}}
+## Example Usage
+
+{{ tffile .ExampleFile }}
+{{- end }}
+
+{{ .SchemaMarkdown | trimspace }}
+
+{{- if .HasImport }}
+## Import
+
+Import is supported using the following syntax:
+
+{{codefile "shell" .ImportFile }}
+{{- end }}
diff --git a/templates/resources/dw_database_catalog.md.tmpl b/templates/resources/dw_database_catalog.md.tmpl
new file mode 100644
index 00000000..48bbee41
--- /dev/null
+++ b/templates/resources/dw_database_catalog.md.tmpl
@@ -0,0 +1,26 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "Data Warehouse"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} ({{.Type}})
+
+{{ .Description | trimspace }}
+
+{{ if .HasExample -}}
+## Example Usage
+
+{{ tffile .ExampleFile }}
+{{- end }}
+
+{{ .SchemaMarkdown | trimspace }}
+
+{{- if .HasImport }}
+## Import
+
+Import is supported using the following syntax:
+
+{{codefile "shell" .ImportFile }}
+{{- end }}
diff --git a/templates/resources/dw_vw_hive.md.tmpl b/templates/resources/dw_vw_hive.md.tmpl
new file mode 100644
index 00000000..48bbee41
--- /dev/null
+++ b/templates/resources/dw_vw_hive.md.tmpl
@@ -0,0 +1,26 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "Data Warehouse"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} ({{.Type}})
+
+{{ .Description | trimspace }}
+
+{{ if .HasExample -}}
+## Example Usage
+
+{{ tffile .ExampleFile }}
+{{- end }}
+
+{{ .SchemaMarkdown | trimspace }}
+
+{{- if .HasImport }}
+## Import
+
+Import is supported using the following syntax:
+
+{{codefile "shell" .ImportFile }}
+{{- end }}
diff --git a/templates/resources/iam_group.md.tmpl b/templates/resources/iam_group.md.tmpl
index c971996d..a7b36e87 100644
--- a/templates/resources/iam_group.md.tmpl
+++ b/templates/resources/iam_group.md.tmpl
@@ -23,4 +23,4 @@ description: |-
 Import is supported using the following syntax:
 
 {{codefile "shell" .ImportFile }}
-{{- end }}
\ No newline at end of file
+{{- end }}