diff --git a/docs/data-sources/waypoint_add_on.md b/docs/data-sources/waypoint_add_on.md
index c2f015cee..e238cf7e2 100644
--- a/docs/data-sources/waypoint_add_on.md
+++ b/docs/data-sources/waypoint_add_on.md
@@ -1,16 +1,15 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "hcp_waypoint_add_on Data Source - terraform-provider-hcp"
-subcategory: ""
+subcategory: "HCP Waypoint"
 description: |-
   The Waypoint Add-on data source retrieves information on a given Add-on.
 ---
 
-# hcp_waypoint_add_on (Data Source)
-
-The Waypoint Add-on data source retrieves information on a given Add-on.
+# hcp_waypoint_add_on `Data Source`
 
+-> **Note:** HCP Waypoint is currently in public beta.
 
+The Waypoint Add-on data source retrieves information on a given Add-on.
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -41,4 +40,4 @@ The Waypoint Add-on data source retrieves information on a given Add-on.
 Read-Only:
 
 - `source` (String) Terraform Cloud no-code Module Source
-- `version` (String) Terraform Cloud no-code Module Version
+- `version` (String) Terraform Cloud no-code Module Version
\ No newline at end of file
diff --git a/docs/data-sources/waypoint_add_on_definition.md b/docs/data-sources/waypoint_add_on_definition.md
index dca4c679b..8b10955ec 100644
--- a/docs/data-sources/waypoint_add_on_definition.md
+++ b/docs/data-sources/waypoint_add_on_definition.md
@@ -1,16 +1,15 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "hcp_waypoint_add_on_definition Data Source - terraform-provider-hcp"
-subcategory: ""
+subcategory: "HCP Waypoint"
 description: |-
   The Waypoint Add-on Definition data source retrieves information on a given Add-on Definition.
 ---
 
-# hcp_waypoint_add_on_definition (Data Source)
-
-The Waypoint Add-on Definition data source retrieves information on a given Add-on Definition.
+# hcp_waypoint_add_on_definition `Data Source`
 
+-> **Note:** HCP Waypoint is currently in public beta.
 
+The Waypoint Add-on Definition data source retrieves information on a given Add-on Definition.
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
diff --git a/docs/data-sources/waypoint_application.md b/docs/data-sources/waypoint_application.md
index 740c3ab89..a1aba69a1 100644
--- a/docs/data-sources/waypoint_application.md
+++ b/docs/data-sources/waypoint_application.md
@@ -1,16 +1,15 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "hcp_waypoint_application Data Source - terraform-provider-hcp"
-subcategory: ""
+subcategory: "HCP Waypoint"
 description: |-
   The Waypoint Application data source retrieves information on a given Application.
 ---
 
-# hcp_waypoint_application (Data Source)
-
-The Waypoint Application data source retrieves information on a given Application.
+# hcp_waypoint_application `Data Source`
 
+-> **Note:** HCP Waypoint is currently in public beta.
 
+The Waypoint Application data source retrieves information on a given Application.
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
diff --git a/docs/data-sources/waypoint_application_template.md b/docs/data-sources/waypoint_application_template.md
index d62163613..0f45e889e 100644
--- a/docs/data-sources/waypoint_application_template.md
+++ b/docs/data-sources/waypoint_application_template.md
@@ -1,16 +1,15 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "hcp_waypoint_application_template Data Source - terraform-provider-hcp"
-subcategory: ""
+subcategory: "HCP Waypoint"
 description: |-
   The Waypoint Template data source retrieves information on a given Application Template.
 ---
 
-# hcp_waypoint_application_template (Data Source)
-
-The Waypoint Template data source retrieves information on a given Application Template.
+# hcp_waypoint_application_template `Data Source`
 
+-> **Note:** HCP Waypoint is currently in public beta.
 
+The Waypoint Template data source retrieves information on a given Application Template.
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
diff --git a/templates/data-sources/waypoint_add_on.md.tmpl b/templates/data-sources/waypoint_add_on.md.tmpl
new file mode 100644
index 000000000..8da38ebea
--- /dev/null
+++ b/templates/data-sources/waypoint_add_on.md.tmpl
@@ -0,0 +1,14 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "HCP Waypoint"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} `{{.Type}}`
+
+-> **Note:** HCP Waypoint is currently in public beta.
+
+{{ .Description | trimspace }}
+
+{{ .SchemaMarkdown | trimspace }}
\ No newline at end of file
diff --git a/templates/data-sources/waypoint_add_on_definition.md.tmpl b/templates/data-sources/waypoint_add_on_definition.md.tmpl
new file mode 100644
index 000000000..3e8a6f99e
--- /dev/null
+++ b/templates/data-sources/waypoint_add_on_definition.md.tmpl
@@ -0,0 +1,14 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "HCP Waypoint"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} `{{.Type}}`
+
+-> **Note:** HCP Waypoint is currently in public beta.
+
+{{ .Description | trimspace }}
+
+{{ .SchemaMarkdown | trimspace }}
diff --git a/templates/data-sources/waypoint_application.md.tmpl b/templates/data-sources/waypoint_application.md.tmpl
new file mode 100644
index 000000000..3e8a6f99e
--- /dev/null
+++ b/templates/data-sources/waypoint_application.md.tmpl
@@ -0,0 +1,14 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "HCP Waypoint"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} `{{.Type}}`
+
+-> **Note:** HCP Waypoint is currently in public beta.
+
+{{ .Description | trimspace }}
+
+{{ .SchemaMarkdown | trimspace }}
diff --git a/templates/data-sources/waypoint_application_template.md.tmpl b/templates/data-sources/waypoint_application_template.md.tmpl
new file mode 100644
index 000000000..3e8a6f99e
--- /dev/null
+++ b/templates/data-sources/waypoint_application_template.md.tmpl
@@ -0,0 +1,14 @@
+---
+page_title: "{{.Name}} {{.Type}} - {{.ProviderName}}"
+subcategory: "HCP Waypoint"
+description: |-
+{{ .Description | plainmarkdown | trimspace | prefixlines "  " }}
+---
+
+# {{.Name}} `{{.Type}}`
+
+-> **Note:** HCP Waypoint is currently in public beta.
+
+{{ .Description | trimspace }}
+
+{{ .SchemaMarkdown | trimspace }}