diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b004c8b8..f818020b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+IMPROVEMENTS:
+* docs: updates banner on index page to warn of upcoming breaking changes (#134)
+* resource/hcp_consul_cluster_snapshot_test: add Consul cluster snapshot acceptance test (#126)
+
 ## 0.6.0 (May 10, 2021)
 
 FEATURES:
diff --git a/docs/index.md b/docs/index.md
index 4d2d6cbc3..1818b7b59 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,8 +9,8 @@ description: |-
 
 The HCP provider provides resources to manage [HashiCorp Cloud Platform](https://cloud.hashicorp.com/) (HCP) resources.
 
-~> **Known Issue:** There is a known issue with v0.4.0 of the HCP Provider in which Terraform will incorrectly recommend a rebuild of a Consul cluster, which could result in data loss. 
-See the Release Notes on Github for more detail. Please upgrade to the patch v0.4.1 or beyond to avoid this issue.
+~> **Upcoming Migration:** The upcoming release of HVN Routes will include breaking changes that affect `hcp_aws_network_peering` and `hcp_aws_transit_gateway_attachment`. [This PR](https://github.com/hashicorp/terraform-provider-hcp/pull/128) contains a migration guide.
+Please pin to the current version to avoid disruption until you are ready to migrate.
 
 -> **Note:** Please refer to the provider's [Release Notes](https://github.com/hashicorp/terraform-provider-hcp/releases) for critical fixes.
 
diff --git a/templates/index.md.tmpl b/templates/index.md.tmpl
index 812646536..83804f8aa 100644
--- a/templates/index.md.tmpl
+++ b/templates/index.md.tmpl
@@ -9,8 +9,8 @@ description: |-
 
 The HCP provider provides resources to manage [HashiCorp Cloud Platform](https://cloud.hashicorp.com/) (HCP) resources.
 
-~> **Known Issue:** There is a known issue with v0.4.0 of the HCP Provider in which Terraform will incorrectly recommend a rebuild of a Consul cluster, which could result in data loss. 
-See the Release Notes on Github for more detail. Please upgrade to the patch v0.4.1 or beyond to avoid this issue.
+~> **Upcoming Migration:** The upcoming release of HVN Routes will include breaking changes that affect `hcp_aws_network_peering` and `hcp_aws_transit_gateway_attachment`. [This PR](https://github.com/hashicorp/terraform-provider-hcp/pull/128) contains a migration guide.
+Please pin to the current version to avoid disruption until you are ready to migrate.
 
 -> **Note:** Please refer to the provider's [Release Notes](https://github.com/hashicorp/terraform-provider-hcp/releases) for critical fixes.