diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d6..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/avoid-raising-an-issue--not-an-issue-.md b/.github/ISSUE_TEMPLATE/new-issue.md
similarity index 58%
rename from .github/ISSUE_TEMPLATE/avoid-raising-an-issue--not-an-issue-.md
rename to .github/ISSUE_TEMPLATE/new-issue.md
index 8b8e5a43e..1e981f352 100644
--- a/.github/ISSUE_TEMPLATE/avoid-raising-an-issue--not-an-issue-.md
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -1,12 +1,15 @@
 ---
-name: Avoid raising an issue (NOT an issue)
-about: Cases for not raising an issue
+name: New Issue
+about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
+Thanks for considering raising a Spring Cloud Stream issue. Please take the time to review the following categories as some of them do not apply here.
+
+🙅 "Please DO NOT Raise an Issue" Cases
 - Question
 STOP!! Please ask questions about how to use something, or to understand why something isn't
 working as you expect it to, on Stack Overflow using the spring-boot tag.
@@ -16,3 +19,22 @@ STOP!! Please don't raise security vulnerabilities here. Head over to https://pi
 You DO NOT need to raise an issue for a managed dependency version upgrade as there's a semi-automatic process for checking managed dependencies for new versions before a release. BUT pull requests for upgrades that are more involved than just a version property change are still most welcome.
 - With an Immediate Pull Request
 An issue will be closed as a duplicate of the immediate pull request, so you don't have to raise an issue if you plan to create a pull request immediately.
+
+If your case does not match any of he above categories. . .
+
+**Describe the issue**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Version of the framework**
+**Expected behavior**
+**Screenshots**
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/please-do-not-raise-an-issue.md b/.github/ISSUE_TEMPLATE/please-do-not-raise-an-issue.md
deleted file mode 100644
index ae2a888fc..000000000
--- a/.github/ISSUE_TEMPLATE/please-do-not-raise-an-issue.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Please do NOT raise an issue
-about: Cases for not raising an issue
-title: ''
-labels: ''
-assignees: ''
-
----
-
-- Question
-STOP!! Please ask questions about how to use something, or to understand why something isn't
-working as you expect it to, on Stack Overflow using the spring-boot tag.
-- Security Vulnerability
-STOP!! Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.
-- Managed Dependency Upgrade
-You DO NOT need to raise an issue for a managed dependency version upgrade as there's a semi-automatic process for checking managed dependencies for new versions before a release. BUT pull requests for upgrades that are more involved than just a version property change are still most welcome.
-- With an Immediate Pull Request
-An issue will be closed as a duplicate of the immediate pull request, so you don't have to raise an issue if you plan to create a pull request immediately.