diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 000000000000..10628334e5fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,15 @@
+---
+name: "\U0001F4D5 Documentation Issue"
+about: Report an issue in the API Reference documentation or Developer Guide
+labels: documentation, needs-triage
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Describe the issue
+<!--- A clear and concise description of the issue -->
+
+## Links
+<!-- Include links to documentation page -->
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 43530d2152da..18e51f27d15d 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -30,7 +30,7 @@ labels: feature-request, needs-triage
 
 
 ## Your Environment
-<!--- Include as many relevant details about the environment where the bug was discovered -->
+<!--- Include as many relevant details about your environment -->
 * AWS Java SDK version used:
 * JDK version used:
 * Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
index aad931388a4c..8c6b4fc2bad4 100644
--- a/.github/ISSUE_TEMPLATE/general-issue.md
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -22,7 +22,7 @@ labels: guidance, needs-triage
 <!--- If service responses are relevant, please include wirelogs -->
 
 ## Your Environment
-<!--- Include as many relevant details about the environment where the bug was discovered -->
+<!--- Include as many relevant details about your environment -->
 * AWS Java SDK version used:
 * JDK version used:
 * Operating System and version: