diff --git a/.github/ISSUE_TEMPLATE/issue-name.md b/.github/ISSUE_TEMPLATE/issue-name.md
deleted file mode 100644
index f536dd4d..00000000
--- a/.github/ISSUE_TEMPLATE/issue-name.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Issue Name
-about: Suggest an edit or addition to the Bitwarden Help Center.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Suggest an edit, addition, or any other comment specific to the Bitwarden Help Center (i.e. Documentation).
-
-To submit a **Feature Request** for Bitwarden apps: [click here](https://community.bitwarden.com/t/about-the-feature-requests-category/12/2).
-To submit **bug reports** for Bitwarden apps, create an Issue in the appropriate repository (e.g. bitwarden/mobile, bitwarden/desktop)
diff --git a/_articles/faqs/billing-faqs.md b/_articles/faqs/billing-faqs.md
index a2cefcbf..92657ad2 100644
--- a/_articles/faqs/billing-faqs.md
+++ b/_articles/faqs/billing-faqs.md
@@ -11,7 +11,7 @@ order: 09
 
 This article contains Frequently Asked Questions (FAQs) regarding **Plans and Pricing**.
 
-For help selecting the right Bitwarden plan for you, refer to [What Plan is Right for Me?](https://bitwarden.com/help/article/what-plan-is-right-for-me/)
+For help selecting the right Bitwarden plan for you, refer to [What Plan is Right for Me?]({% link _articles/plans-and-pricing/what-plan-is-right-for-me.md %}) and [About Bitwarden Plans]({% link _articles/plans-and-pricing/about-bitwarden-plans.md %}).
 
 ## Account Management
 
diff --git a/_articles/hosting/licensing-on-premise.md b/_articles/hosting/licensing-on-premise.md
index f3553047..8bbbe18a 100644
--- a/_articles/hosting/licensing-on-premise.md
+++ b/_articles/hosting/licensing-on-premise.md
@@ -11,7 +11,7 @@ order: 08
 Self-hosting Bitwarden is free, however some features must be unlocked in your self-hosted instance with a registered license file. A license file can be obtained from the Bitwarden-hosted [Web Vault](https://vault.bitwarden.com){:target="\_blank"} by either an account with a Premium Individual subscription or by the Owner of a Families or Enterprise Organization.
 
 {% callout info %}
-The procedures in this article assume that you have already started a paid subscription to Bitwarden. If you haven't, see [What Plan is Right for Me?]({% link _articles/plans-and-pricing/what-plan-is-right-for-me.md %}).
+The procedures in this article assume that you have already started a paid subscription to Bitwarden. If you haven't, refer to [About Bitwarden Plans]({% link _articles/plans-and-pricing/about-bitwarden-plans.md %}) and [What Plan is Right for Me?]({% link _articles/plans-and-pricing/what-plan-is-right-for-me.md %}).
 {% endcallout %}
 
 ## Individual License
diff --git a/_includes/contact.html b/_includes/contact.html
index 589be281..37c07b76 100644
--- a/_includes/contact.html
+++ b/_includes/contact.html
@@ -3,7 +3,7 @@
     <div class="card-body">
         <p class="card-text"><i class="fa fa-download"></i> <a href="https://bitwarden.com/download" target="_blank">Download Bitwarden</a></p>
         <p class="card-text"><i class="fa fa-wrench"></i><a href="https://community.bitwarden.com/t/about-the-feature-requests-category" target="_blank"> Make a Feature Request</a></p>
-        <p class="card-text"><i class="fa fa-edit"></i> <a href="https://github.com/bitwarden/help/issues/new?body=Suggestion or Edit for: bitwarden.com/help{{ page.url }}" target="_blank">Suggest an Edit</a></p>
+        <p class="card-text"><i class="fa fa-edit"></i> <a href="https://github.com/bitwarden/help/issues/new?assignees=&labels=&template=help-center-edit-suggestion.md&title=" target="_blank">Suggest an Edit</a></p>
         <p class="card-text"><i class="fa fa-comments"></i> <a href="https://community.bitwarden.com/c/support/" target="_blank">Ask the Community</a></p>
         <p class="card-text"><i class="fa fa-envelope"></i> <a href="https://bitwarden.com/contact" target="_blank">Contact Us</a></p>
     </div>