diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d1da9b05..a09b42ae 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,6 @@
-### IMPORTANT
+<!--
+
+!!! IMPORTANT !!!
 
 Before creating your issue:
 
@@ -9,3 +11,5 @@ Before creating your issue:
 * **Improvements to documentation?** Head over to [asyncapi/website](https://www.github.com/asyncapi/website).
 
 * **Feature request?** First read [asyncapi/spec/blob/master/CONTRIBUTING.md](https://www.github.com/asyncapi/spec/blob/master/CONTRIBUTING.md) and prefer creating a Pull Request!
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..70a7ade3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: '🐞 Bug'
+assignees: ''
+---
+
+<!--
+
+!!! IMPORTANT !!!
+
+Before creating your issue:
+
+* **Have a question?** Find community resources at [asyncapi/community](https://www.github.com/asyncapi/community).
+
+* **Found an editing mistake?** Create a Pull Request with the edited fix. The Github UI allows you to edit files directly, find the source files at [asyncapi/spec/tree/master/spec](https://www.github.com/asyncapi/spec/tree/master/spec).
+
+* **Improvements to documentation?** Head over to [asyncapi/website](https://www.github.com/asyncapi/website).
+
+* **Feature request?** First read [asyncapi/spec/blob/master/CONTRIBUTING.md](https://www.github.com/asyncapi/spec/blob/master/CONTRIBUTING.md) and prefer creating a Pull Request!
+
+-->
+
+### Describe the bug
+A clear and concise description of what the bug is.
+
+### To Reproduce
+Steps to reproduce the behavior:
+1. Create a document with '...'
+2. Try to change to '....'
+3. Try to validate the document doing '....'
+4. See error
+
+### Expected behavior
+A clear and concise description of what you expected to happen.
+
+### Sample document
+If applicable, add an AsyncAPI document illustrating the problem.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+### Additional context
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md
new file mode 100644
index 00000000..d28e2c0c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/proposal.md
@@ -0,0 +1,23 @@
+---
+name: 💡 Proposal (RFC 1)
+about: See CONTRIBUTING.md
+title: ""
+labels: '💡 Proposal (RFC 1)'
+assignees: ''
+---
+
+<!--
+
+!!! IMPORTANT !!!
+
+Before creating your issue:
+
+* **Have a question?** Find community resources at [asyncapi/community](https://www.github.com/asyncapi/community).
+
+* **Found an editing mistake?** Create a Pull Request with the edited fix. The Github UI allows you to edit files directly, find the source files at [asyncapi/spec/tree/master/spec](https://www.github.com/asyncapi/spec/tree/master/spec).
+
+* **Improvements to documentation?** Head over to [asyncapi/website](https://www.github.com/asyncapi/website).
+
+* **Feature request?** First read [asyncapi/spec/blob/master/CONTRIBUTING.md](https://www.github.com/asyncapi/spec/blob/master/CONTRIBUTING.md) and prefer creating a Pull Request!
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..bdb4f792
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,23 @@
+---
+name: Question
+about: A question about the spec or processes 
+title: ""
+labels: '❔ Question'
+assignees: ''
+---
+
+<!--
+
+!!! IMPORTANT !!!
+
+Before creating your issue:
+
+* **Have a question?** Find community resources at [asyncapi/community](https://www.github.com/asyncapi/community).
+
+* **Found an editing mistake?** Create a Pull Request with the edited fix. The Github UI allows you to edit files directly, find the source files at [asyncapi/spec/tree/master/spec](https://www.github.com/asyncapi/spec/tree/master/spec).
+
+* **Improvements to documentation?** Head over to [asyncapi/website](https://www.github.com/asyncapi/website).
+
+* **Feature request?** First read [asyncapi/spec/blob/master/CONTRIBUTING.md](https://www.github.com/asyncapi/spec/blob/master/CONTRIBUTING.md) and prefer creating a Pull Request!
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/strawman.md b/.github/ISSUE_TEMPLATE/strawman.md
new file mode 100644
index 00000000..00c9e7f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/strawman.md
@@ -0,0 +1,23 @@
+---
+name: 💭 Strawman (RFC 0)
+about: See CONTRIBUTING.md
+title: ""
+labels: '💭 Strawman (RFC 0)'
+assignees: ''
+---
+
+<!--
+
+!!! IMPORTANT !!!
+
+Before creating your issue:
+
+* **Have a question?** Find community resources at [asyncapi/community](https://www.github.com/asyncapi/community).
+
+* **Found an editing mistake?** Create a Pull Request with the edited fix. The Github UI allows you to edit files directly, find the source files at [asyncapi/spec/tree/master/spec](https://www.github.com/asyncapi/spec/tree/master/spec).
+
+* **Improvements to documentation?** Head over to [asyncapi/website](https://www.github.com/asyncapi/website).
+
+* **Feature request?** First read [asyncapi/spec/blob/master/CONTRIBUTING.md](https://www.github.com/asyncapi/spec/blob/master/CONTRIBUTING.md) and prefer creating a Pull Request!
+
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 7bfa3bb8..00000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### IMPORTANT
-
-Please Read https://github.com/asyncapi/spec/blob/master/CONTRIBUTING.md before creating a Pull Request.
diff --git a/.github/PULL_REQUEST_TEMPLATE/editorial.md b/.github/PULL_REQUEST_TEMPLATE/editorial.md
new file mode 100644
index 00000000..b33b3968
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/editorial.md
@@ -0,0 +1,19 @@
+---
+name: ✏️ Editorial
+about: See CONTRIBUTING.md
+title: ""
+labels: '✏️ Editorial'
+assignees: ''
+---
+
+---
+
+**Related issue(s):**
+
+---
+
+<!--
+
+Make sure you craft a good description!
+
+-->
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE/proposal.md b/.github/PULL_REQUEST_TEMPLATE/proposal.md
new file mode 100644
index 00000000..99bdc2f5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/proposal.md
@@ -0,0 +1,19 @@
+---
+name: 💡 Proposal (RFC 1)
+about: See CONTRIBUTING.md
+title: ""
+labels: '💡 Proposal (RFC 1)'
+assignees: ''
+---
+
+---
+
+**Related issue(s):**
+
+---
+
+<!--
+
+Make sure you craft a good description!
+
+-->
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE/strawman.md b/.github/PULL_REQUEST_TEMPLATE/strawman.md
new file mode 100644
index 00000000..99bdc2f5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/strawman.md
@@ -0,0 +1,19 @@
+---
+name: 💡 Proposal (RFC 1)
+about: See CONTRIBUTING.md
+title: ""
+labels: '💡 Proposal (RFC 1)'
+assignees: ''
+---
+
+---
+
+**Related issue(s):**
+
+---
+
+<!--
+
+Make sure you craft a good description!
+
+-->
\ No newline at end of file