diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..8c53396a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,19 @@
+### Issue Description
+
+***Do you want to request a `feature` or report a `bug`?***
+
+
+
+***What is the current behavior?***
+
+
+
+***What is the expected behavior?***
+
+
+
+***Context / What is the motivation / use case for changing the behavior?***
+
+
+
+***Other information*** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context.)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8fdacfc7..0f29ed91 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,19 @@
-* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+### PR Description
 
+***What kind of change does this PR introduce?*** (Bug fix, feature, docs update, ...)
 
 
-* **What is the current behavior?** (You can also link to an open issue here)
 
+***What is the current behavior?*** (You can also link to an open issue here)
 
 
-* **What is the new behavior (if this is a feature change)?**
 
+***What is the new behavior?*** (if this is a feature change))
 
 
-* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
 
+***Does this PR introduce a breaking change?*** (What changes might users need to make in their application due to this PR?)
 
 
-* **Other information**:
+
+***Other information***: