diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 36717b4858e..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-!!! For Security Vulnerabilities, please go to https://spring.io/security-policy !!!
--->
-**Affects:** \<Spring Framework version>
-
----
-<!--
-Thanks for taking the time to create an issue. Please read the following:
-
-- Questions should be asked on Stack Overflow.
-- For bugs, specify affected versions and explain what you are trying to do.
-- For enhancements, provide context and describe the problem.
-
-Issue or Pull Request? Create only one, not both. GitHub treats them as the same.
-If unsure, start with an issue, and if you submit a pull request later, the
-issue will be closed as superseded.
--->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..f425a806d4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Security issue
+    url: https://github.com/spring-projects/security-advisories/security/advisories/new
+    about: Security issues must be disclosed and discussed in private. See https://spring.io/security-policy
+  - name: Asking for help
+    url: https://stackoverflow.com/tags/spring
+    about: The Spring team is using StackOverflow for questions.
+
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 00000000000..7abf75db4de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,23 @@
+---
+name: Issue
+about: Bugs, enhancements, documentation, tasks.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you considered asking for help on stackoverflow.com?
+
+** Bug Reports **
+Please submit issues against OSS supported versions, see https://spring.io/projects/spring-framework#support
+Please provide a minimal sample application that reproduces the problem for faster issue triage.
+
+** Enhancements requests **
+Before explaining how you would like things to work,
+please describe a concrete use case for this feature and how you have tried to solve this so far.
+
+-->
+