diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..bf2ce2f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,32 +7,22 @@ assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+### Expected Behaviour
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+Please provide a description of the expected behaviour.
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Actual Behavior
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+Please provide a description of the actual behaviour.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+### Steps To Reproduce
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+Please provide the steps to reproduce the issue.
 
-**Additional context**
-Add any other context about the problem here.
+### Environment
+
+Please provide relevant details of your environment:
+
+* keycloak version
+* java version
+* platform (O/S, etc.)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..f59669e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,18 @@ 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 [...]
+### Desired Behaviour
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+Please provide a description of the desired behaviour.
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+### Actual Behavior
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+Please provide a description of the actual behaviour.
+
+### Environment
+
+Please provide relevant details of your environment:
+
+* keycloak version
+* java version
+* platform (O/S, etc.)
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
deleted file mode 100644
index 9e54471..0000000
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
-### Expected Behaviour
-
-Please provide a description of the expected behaviour.
-
-### Actual Behavior
-
-Please provide a description of the actual behaviour.
-
-### Steps To Reproduce
-
-Please provide the steps to reproduce the issue.
-
-### Environment
-
-Please provide relevant details of your environment:
-
-* keycloak version
-* java version
-* platform (O/S, etc.)