diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..87c3a80
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots or pictures**
+If applicable, add screenshots to help explain your problem.
+
+**Firmware version:**
+
+**Place of deployment**: [Outdoors or Indoors]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..0cd2c1d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+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 [...]
+
+**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.
+
+**Defend your solution**
+ If the feature changes current behavior, list reasons why your solution is better.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 1b4e2c4..a6034e2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # “Klimerko” Air Quality Monitoring Station
 
+Join the development discussion on our Matrix room: [#klimerko:matrix.org](https://matrix.to/#/!cIYLKLHZVnvAgFaZrg:matrix.org?via=matrix.org)
+
+![Matrix](https://img.shields.io/matrix/klimerko:matrix.org?server_fqdn=matrix.org&style=social)
+
 <img align="right" width="300" height="200" src="extras/klimerko-tile.png">
 
 "Klimerko" is the continuation of the [Winning Project from Descon 4.0 2018](https://descon.me/2018/winning-product/).