diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..268aab9998c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,15 @@
+Thanks for raising an issue. Please read (and discard) the below:
+
+**Security Issue?** Please report responsibly via https://pivotal.io/security  
+_(Do not diclose here. It will be deleted!!)._
+
+**Questions:** Please use Stack Overflow.  
+
+**Issue vs Pull Request** Do not create both.  
+_(You can start with an issue, and submit a pull request later, superseding the issue)_
+
+**Bug Reports:** Specify affected versions and explain what your goal is.  
+_(A test case or isolated sample makes it easier for us to help)_
+
+**Enhancements:** Please describe the problem.  
+_(There may already be a solution, or a way to solve it you had not considered.)_
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index f5f61723a1b..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'status: waiting-for-triage'
-assignees: ''
-
----
-
-<!--
-Thanks for providing feedback. Please, review the following:
-
-**Security Vulnerability?**
-STOP and go to https://pivotal.io/security to disclose security issues responsibly.
-
-**Question?**
-This is the place to report issues and request enhancements. If you have a question about why something is not or how to do something, please use Stack Overflow.
-
-**Issue vs Pull Request**
-Do not create both. You can however start with an issue, and later decide to submit a pull request, in which case the issue will be closed as superseded by the pull request.
-
-**Bug report (do not copy/paste)**
-Please provide details of the problem, including the Spring Framework version. If possible, please provide a test case or sample application that reproduce the problem. This makes it much easier for us to diagnose the problem and to verify that we have fixed it.
-
-**Enhancement (do not copy/paste)**
-Please start by describing the problem that you are trying to solve. There may already
-be a solution, or there may be a way to solve it that you hadn't considered.
--->