diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 8d1bd2e..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Describe the Bug
-
-Please provide a description of the bug.
-
-### Steps To Reproduce
-
-Please provide the steps to reproduce the bug.
-
-### Expected Behavior
-
-Please provide a description of the expected behaviour.
-
-### Environment
-
-Please provide details of your environment (e.g.: keycloak version, java version. operating system
-and version, etc.).
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
new file mode 100644
index 0000000..9e54471
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -0,0 +1,19 @@
+### 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.)
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..95c24f1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,7 @@
+### Description
+
+Please provide a description that details the content of the pull request.
+
+Please also indicate whether any issues are fixed.
+
+Fixes # (issue)