diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..c6b229539
--- /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.
+
+#### Steps 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
+If applicable, add screenshots to help explain your problem.
+
+#### Contextual information:
+<!-- You can find your device information under Settings -> General -> About -->
+ - Device: <!-- e.g. iPhone6, under "model name"-->
+ - OS: <!-- e.g. iOS8.1, under "software version" -->
+<!-- The app version should be displayed in the side-panel of the home screen -->
+ - App Version: <!-- e.g. 1.4.5 -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 000000000..b30282798
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Element iOS Community Support
+    url: "https://matrix.to/#/#element-ios:matrix.org"
+    about: General Element iOS support questions can be asked here.
+  - name: Matrix Security Policy
+    url: https://www.matrix.org/security-disclosure-policy/
+    about: Learn more about our security disclosure policy.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..5a372c146
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature'
+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.
+
+#### Additional context.
+Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/CHANGES.rst b/CHANGES.rst
index 4061b342e..cc03673bf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -45,7 +45,7 @@ Changes in 1.4.7 (2021-07-22)
  * 
 
 Others
- * 
+ * Updated issue templates.
 
 Improvements:
  * Upgrade MatrixKit version ([v0.15.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.5)).