diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index abb6be5a..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-
-Make sure to checkout [CONTRIBUTING.md](https://github.com/bpmn-io/bpmn-js/blob/master/.github/CONTRIBUTING.md#creating-an-issue) before filing a bug or feature request.
-
-If possible, reproduce bugs through a [JSFiddle snippet](https://jsfiddle.net/kxqy09gf) or in a separate project on GitHub.
-
--->
-
-
-__Expected Behavior__
-
-
-__Actual Behavior__
-
-
-__Steps to Reproduce__
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 00000000..3d40651e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us fix a library error
+---
+
+<!--
+
+Thanks for filing this bug report!
+
+Please take your time to provide the relevant context to your bug report. This helps us to process it and get it fixed, eventually.
+
+-->
+
+
+__Describe the Bug__
+
+A clear and concise description of what the bug is.
+
+
+__Steps to Reproduce__
+
+Steps to reproduce the behavior:
+
+1. do this
+2. do that
+
+If you report a modeling related issue, ensure you can reproduce it on [demo.bpmn.io](https://demo.bpmn.io/new)
+
+When reporting a library error, try to build an example that reproduces your problem. You can use our playgrounds for [viewer](https://jsfiddle.net/kxqy09gf/) or [modeler](https://jsfiddle.net/08p147e9/) as a starting point or put a demo up on [GitHub](https://github.com/) for inspection.
+
+
+__Expected Behavior__
+
+A clear and concise description of what you expected to happen.
+
+
+__Environment__
+
+Please complete the following information:
+
+ - Browser: [e.g. IE 11, Chrome 69]
+ - OS: [e.g. Windows 7]
+ - Library version: [e.g. 2.0.0]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 00000000..974d97b5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest an idea or general improvement
+---
+
+<!--
+
+Thanks for filing this feature request!
+
+Please take your time to provide the relevant context
+that allows us to understand your proposal.
+
+-->
+
+
+__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 [...]
+
+
+__Describe the solution you'd like__
+
+A clear and concise description of what you want to happen.
+
+__Describe alternatives you've considered__
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+
+__Additional context__
+
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 727d4023..b173c997 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,11 @@
 <!--
 
-Thanks for filing a pull request!
+Thanks for creating this pull request!
 
-Make sure you've read through [our contributing guide](https://github.com/bpmn-io/bpmn-js/blob/master/.github/CONTRIBUTING.md#creating-an-issue). This will help you to get your contribution merged.
+Please make sure you provide the relevant context.
 
 -->
 
+__Which issue does this PR address?_
 
 Closes #
\ No newline at end of file