diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7659a2011d..378a1ef16d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,10 +4,9 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-<!-- Before submitting an issue, please consult our docs (https://beta.ionicframework.com/docs/) and API reference (https://beta.ionicframework.com/docs/api/) -->
+<!-- Before submitting an issue, please consult our docs (https://ionicframework.com/docs/). -->
 
 <!-- Please make sure you are posting an issue pertaining to the Ionic Framework. If you are having an issue with the Ionic Appflow services (Ionic View, Ionic Deploy, etc.) please consult the Ionic Appflow support portal (https://ionic.zendesk.com/hc/en-us) -->
 
@@ -50,7 +49,7 @@ insert short code snippets here
 **Other information:**
 <!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
 
-**Ionic info:** 
+**Ionic info:**
 <!-- (run `ionic info` from a terminal/cmd prompt and paste output below): -->
 
 ```
diff --git a/.github/ISSUE_TEMPLATE/cli.md b/.github/ISSUE_TEMPLATE/cli.md
new file mode 100644
index 0000000000..213bc40092
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cli.md
@@ -0,0 +1,11 @@
+---
+name: CLI
+about: Suggest an improvement for the CLI
+title: ''
+labels: 'ionitron: cli'
+assignees: ''
+---
+
+# CLI
+
+Please do not submit bug reports or feature requests related to the Ionic CLI. Instead, please submit an issue to the [Ionic CLI Repository](https://github.com/ionic-team/ionic-cli/issues/new/choose).
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 0000000000..255df15c4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,11 @@
+---
+name: Documentation
+about: Suggest an improvement for the documentation of this project
+title: ''
+labels: 'ionitron: docs'
+assignees: ''
+---
+
+# Documentation
+
+Please do not submit issues on how to improve or fix the documentation. Instead, please submit an issue to the [Ionic Docs Repository](https://github.com/ionic-team/ionic-docs/issues/new/choose).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0767288fc1..7727398efd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,12 +4,9 @@ about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-<!-- Please make sure you are posting an feature request pertaining to the Ionic Framework. -->
-
-<!-- Before submitting an issue, please consult our docs (https://beta.ionicframework.com/docs/) and API reference (https://beta.ionicframework.com/docs/api/) -->
+<!-- Before submitting an issue, please consult our docs (https://ionicframework.com/docs/). -->
 
 <!-- Please make sure you are posting an issue pertaining to the Ionic Framework. If you are having an issue with the Ionic Appflow services (Ionic View, Ionic Deploy, etc.) please consult the Ionic Appflow support portal (https://ionic.zendesk.com/hc/en-us) -->
 
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/support_question.md
similarity index 99%
rename from .github/ISSUE_TEMPLATE/Custom.md
rename to .github/ISSUE_TEMPLATE/support_question.md
index ac697a1246..af836eacfe 100644
--- a/.github/ISSUE_TEMPLATE/Custom.md
+++ b/.github/ISSUE_TEMPLATE/support_question.md
@@ -4,7 +4,6 @@ about: Question on how to use this project
 title: ''
 labels: 'ionitron: support'
 assignees: ''
-
 ---
 
 # Support Question