diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 57923904db..92fd1f14f6 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -22,7 +22,7 @@ work on an issue, comment on it first and tell us the approach you want to take.
 * Implement a requested [enhancement](https://github.com/hashicorp/consul/labels/enhancement).
 * Improve our guides and documentation. Consul's [Guides](https://www.consul.io/docs/guides/index.html), [Docs](https://www.consul.io/docs/index.html), and [api godoc](https://godoc.org/github.com/hashicorp/consul/api)
 are deployed from this repo.
-* Respond to questions about usage on the issue tracker or mailing list.
+* Respond to questions about usage on the issue tracker or the Consul section of the [HashiCorp forum]: (https://discuss.hashicorp.com/c/consul)
 
 ### Reporting an Issue:
 >Note: Issues on GitHub for Consul are intended to be related to bugs or feature requests. 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 26929b0e29..f12dd2df7c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -8,6 +8,4 @@ Issues on GitHub are intended to be related to bugs or feature requests, so we r
 
 - Frequently asked questions: https://www.consul.io/docs/faq.html
 - Consul Guides: https://www.consul.io/docs/guides/index.html
-
-
-Any other questions can be sent to the Consul mailing list: https://www.consul.io/community.html
+- Any other questions can be sent to the Consul section of the [HashiCorp forum]: (https://discuss.hashicorp.com/c/consul)