diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e643696f57..8367d26be7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,8 @@
 ### Problem description
 
-<!-- Briefly describe the problem that you found. Only documentation issues should be filed here. 
-     For general questions, go to https://forums.docker.com/. -->
+<!--Briefly describe the problem that you found.
+    Only DOCUMENTATION issues should be filed here.
+    For general questions, go to https://forums.docker.com/. -->
 
 ### Problem location
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ae767832e8..878c8994e0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,29 +1,25 @@
 <!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
-    for this project's contribution guidelines. -->
+    for this project's contribution guidelines. Remove these comments
+    as you go.
 
-<!--DO NOT edit files and directories listed in .NOT_EDITED_HERE.yaml.
-    These are maintained in upstream repos and changes here will be lost.-->
+    DO NOT edit files and directories listed in _data/not_edited_here.yaml.
+    These are maintained in upstream repos and changes here will be lost.
 
-### Describe the proposed changes
+    Help us merge your changes more quickly by adding details and setting metadata
+    (such as labels, milestones, and reviewers) over at the left-hand side.-->
 
-<!-- Tell us what you did and why.-->
+### Proposed changes
 
-### Unreleased project version
+<!--Tell us what you did and why-->
 
-<!-- If this change only applies to an unreleased version of a project, note
-     that here and base your work on the `vnext-` branch for your project. -->
+### Unreleased project version (optional)
 
-### Related issue
+<!--If this change only applies to an unreleased version of a project, note
+    that here and base your work on the `vnext-` branch for your project. If
+    this doesn't apply to this PR, you can remove this whole section.
+    Set a milestone if appropriate. -->
 
-<!-- Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'. -->
+### Related issues (optinoal)
 
-### Related issue or PR in another project
-
-<!-- Full URLs to issues or pull requests in other Github projects -->
-
-### Please take a look
-
-<!-- At-mention specific individuals or groups, like @exampleuser123 -->
-
-
-<!-- To improve this template, edit .github/PULL_REQUEST_TEMPLATE.md. -->
+<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.
+    Or link to full URLs to issues or pull requests in other Github projects -->