diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3d971314ec..b07ede6eff 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,39 +1,27 @@
 ### Problem description
 
-<!-- Provide a brief description of the problem with
-the documentation.
-
-If this is an issue with Docker itself, rather than
-the Docker documentation, this may not be the right
-place to file the issue. Consider filing it in the
-specific project's repository or asking a question
-on forums.docker.com.
-
-You can delete these comments as you are filling out
-the template. -->
+<!-- Provide a brief description of the problem you found. only documentation
+     issues should be filed here. For general questions, go to
+     https://forums.docker.com/. -->
 
 ### Problem location
 
-<!-- Help us find the problem quickly by choosing one
-     of these. Put an x between the brackets of your
-     choice, like [x]. -->
+<!-- Help us find the problem quickly by choosing one of these. -->
 
-- [ ] I saw the problem on the following URL:
+- I saw the problem on the following URL: <URL>
 
-- [ ] I couldn't find the information I wanted. I expected to find it near the following URL:
+- I couldn't find the information I wanted. I expected to find it near the following URL: <URL>
 
-- [ ] Other:
+- Other: <DETAILS>
 
 ### Project version(s) affected
 
-<!-- If this problem only affects specific versions of a
-project (like Docker Engine 1.13), mention it here. The fix
-may need to take that into account. -->
+<!-- If this problem only affects specific versions of a project (like Docker
+     Engine 1.13), mention it here. The fix may need to take that into account. -->
 
 ### Suggestions for a fix
 
-<!--If you have specific ideas for how the problem
-can be addressed, let us know.-->
+<!--If you have specific ideas for how the problem can be addressed, let us know. -->
 
 
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d2813f381f..403812517b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,52 +1,33 @@
-<!--Thanks for your contribution. Please use the following
-guidelines to help us review it. You can remove these comments
-as you fill out this template. -->
+<!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
+    for this project's contribution guidelines. -->
 
-<!--DO NOT edit files and directories listed in .NOT_EDITED_HERE.txt
-as these are maintained in upstream repos and added to the central
-docs repo periodically. Your PR will fail automated checks if it
-includes changes to these files or directories.-->
-
-<!-- **Squash your commits**: Please use an
-interactive rebase (https://help.github.com/articles/about-git-rebase/)
-to squash (combine) multiple commits into a single commit, to keep the
-commit history clean. The exception is when commits from multiple
-contributors exist in the same pull request. In that case, one commit
-per contributor is preferred, to keep the history clean but also give
-credit for the work to all contributors. -->
+<!--DO NOT edit files and directories listed in .NOT_EDITED_HERE.txt.
+    These are maintained in upstream repos and changes here will be lost.-->
 
 ### Describe the proposed changes
 
-<!-- Tell us what you did and why. You can leave this off if
-the PR title is descriptive. -->
+<!-- Tell us what you did and why. You can leave this off if the PR title
+     is descriptive. The commit message will be added to the end of this form.-->
 
 ### Project version
 
-<!-- If this change only applies to a certain version of a project
-(like Docker Engine 1.13), note that here. Also, consider adding
-that info to the docs in your change, such as by adding
-"In Docker 1.13 and higher..." or similar. -->
-
-<!-- Also, DO NOT base your work on master if your change is only
-relevant to an unreleased version of a project. Instead, base
-your work on the `vnext-<PROJECT>` branch, which will be merged
-into master when that project has a new release.-->
+<!-- If this change only applies to a future version of a project (like
+     Docker Engine 1.13), note that here and base your work on the `vnext-`
+     branch for your project. -->
 
 ### Related issue
 
-<!-- If this relates to an issue or PR in this repo, refer to it
-like #1234 -->
+<!-- If this relates to an issue or PR in this repo, refer to it like
+     #1234, or 'Fixes #1234' or 'Closes #1234'. -->
 
 ### Related issue or PR in another project
 
-<!-- Provide one or more links to issues or pull requests in
-other repositories. For instance, a link to the PR that
-introduces a code change that this PR is documenting. -->
+<!-- Links to issues or pull requests in other repositories if applicable. -->
 
 ### Please take a look
 
-<!-- Use this section to at-mention specific individuals who should take a
-look at this PR. For instance, @exampleuser123-->
+<!-- At-mention specific individuals or groups who should take a
+     look at this PR. For instance, @exampleuser123 -->
 
 
 <!-- To improve this template, edit .github/PULL_REQUEST_TEMPLATE.md. -->