diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..feb687200ed
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,52 @@
+<!--- Verify first that your issue/request is not already reported in GitHub -->
+
+##### ISSUE TYPE
+<!--- Pick one below and delete the rest: -->
+ - Bug Report
+ - Feature Idea
+ - Documentation Report
+
+##### COMPONENT NAME
+<!--- Name of the plugin/module/task -->
+
+##### ANSIBLE VERSION
+```
+<!--- Paste verbatim output from “ansible --version” between quotes -->
+```
+
+##### CONFIGURATION
+<!---
+Mention any settings you have changed/added/removed in ansible.cfg
+(or using the ANSIBLE_* environment variables).
+-->
+
+##### OS / ENVIRONMENT
+<!---
+Mention the OS you are running Ansible from, and the OS you are
+managing, or say “N/A” for anything that is not platform-specific.
+-->
+
+##### SUMMARY
+<!--- Explain the problem briefly -->
+
+##### STEPS TO REPRODUCE
+<!---
+For bugs, show exactly how to reproduce the problem.
+For new features, show how the feature would be used.
+-->
+
+```
+<!--- Paste example playbooks or commands between quotes -->
+```
+
+<!--- You can also paste gist.github.com links for larger files -->
+
+##### EXPECTED RESULTS
+<!--- What did you expect to happen when running the steps above? -->
+
+##### ACTUAL RESULTS
+<!--- What actually happened? If possible run with high verbosity (-vvvv) -->
+
+```
+<!--- Paste verbatim command output between quotes -->
+```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..d8b8e17cbd5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,27 @@
+##### ISSUE TYPE
+<!--- Pick one below and delete the rest: -->
+ - Feature Pull Request
+ - New Module Pull Request
+ - Bugfix Pull Request
+ - Docs Pull Request
+
+##### COMPONENT NAME
+<!--- Name of the plugin/module/task  -->
+
+##### ANSIBLE VERSION
+```
+<!--- Paste verbatim output from “ansible --version” between quotes -->
+```
+
+##### SUMMARY
+<!--- Describe the change, including rationale and design decisions -->
+
+<!---
+If you are fixing an existing issue, please include "Fixes #nnn" in your
+commit message and your description; but you should still explain what
+the change does.
+-->
+
+```
+<!--- Paste verbatim command output here, e.g. before and after your change -->
+```
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 5870836fcc6..00000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,53 +0,0 @@
-##### Issue Type:
-
-<!-- Please pick one and delete the rest: -->
- - Bug Report
- - Feature Idea
- - Documentation Report
-
-##### Plugin Name:
-
-<!-- Name of the plugin/module/task -->
-
-##### Ansible Version:
-
-```
-<!-- (Paste verbatim output from “ansible --version” here) -->
-```
-
-##### Ansible Configuration:
-
-<!-- Please mention any settings you've changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables). -->
-
-##### Environment:
-
-<!-- Please mention the OS you are running Ansible from, and the OS you are managing,
-or say “N/A” for anything that isn't platform-specific. -->
-
-##### Summary:
-
-<!-- Please explain the problem briefly.  -->
-
-##### Steps To Reproduce:
-
-<!-- For bugs, please show exactly how to reproduce the problem.
-For new features, show how the feature would be used.  -->
-
-```
-<!-- (Paste example playbooks or commands here)  -->
-```
-
-<!-- You can also paste gist.github.com links for larger files.  -->
-
-##### Expected Results:
-
-<!-- What did you expect to happen when running the steps above?  -->
-
-##### Actual Results:
-
-<!-- What actually happened? If possible run with high verbosity (-vvvv) -->
-
-```
-<!-- (Paste verbatim command output here)  -->
-```
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index f821123acd4..00000000000
--- a/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,25 +0,0 @@
-##### Issue Type:
-
-<!-- Please pick one and delete the rest: -->
- - Feature Pull Request
- - New Module Pull Request
- - Bugfix Pull Request
- - Docs Pull Request
-
-##### Plugin Name:
-
-<!-- Name of the plugin/module/task  -->
-
-##### Summary:
-
-<!-- Please describe the change and the reason for it. -->
-
-<!-- If you're fixing an existing issue, please include "Fixes #nnn" in your
-commit message and your description; but you should still explain what
-the change does. -->
-
-##### Example:
-
-```
-<!-- (Paste example execution or output here if necessary) -->
-```