diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_REPORT_TEMPLATE.md
deleted file mode 100644
index 2550f3cdd9..0000000000
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT_TEMPLATE.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-name: Full Bug Report
-about: Full bug report.
----
-
-[comment]: # (Please replace ... with your information. Remove < and >)
-
-### User Story
-
-As a <user|developer|...>, I want to <task> so that <goal>.
-
-### Description
-
-[comment]: # (Feature or Bug? i.e Type: Bug)
-*Type*: <Bug|Feature>
-
-[comment]: # (Describe the feature you would like, or briefly summarise the bug and what you did, what you expected to happen, and what actually happens. Sections below)
-*Summary*: ...
-
-#### Expected behavior
-
-[comment]: # (Describe what you expected to happen.)
-
-#### Actual behavior
-
-[comment]: # (Describe what actually happened.)
-
-### Reproduction
-
-[comment]: # (Describe how we can replicate the bug step by step.)
-
-- Open Status
-- ...
-- Step 3, etc.
-
-### Solution
-
-[comment]: # (Please summarise the solution and provide a task list on what needs to be fixed.)
-*Summary*:
-
-- [ ] ...
-- [ ] ...
-
-### Additional Information
-
-[comment]: # (Please do your best to fill this out.)
-- Status version: ...
-[comment]: # (Android or iOS.)
-- Operating System: <Android|iOS>
-
-#### Logs
-
-[comment]: # (if on Android please replicate bug whilst running adb logcat)
-
-```
-...
-```
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000000..4e31b68db9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,54 @@
+---
+name: Bug Report
+about: Bug Report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+# Bug Report
+
+## Problem
+
+An overview of the background required to understand the problem.
+A problem description.
+
+#### Expected behavior
+
+[comment]: # (Describe what you expected to happen. Please include designs if possible.)
+
+#### Actual behavior
+
+[comment]: # (Describe what actually happened. Please include screenshots if possible.)
+
+#### Notes
+
+For the developer who will be investigating. Is it related to another PR? Tips on where to start? 
+
+#### Acceptance Criteria
+
+Rules for the future PR to be accepted.
+
+### Reproduction
+
+[comment]: # (Describe how we can replicate the bug step by step.)
+
+- Open Status
+- ...
+- Step 3, etc.
+
+### Additional Information
+
+[comment]: # (Please do your best to fill this out.)
+- Status version: ...
+[comment]: # (Android or iOS.)
+- Operating System: <Android|iOS>
+
+#### Logs
+
+[comment]: # (if on Android please replicate bug whilst running adb logcat)
+
+```
+...
+```
diff --git a/.github/ISSUE_TEMPLATE/feature-issue.md b/.github/ISSUE_TEMPLATE/feature-issue.md
new file mode 100644
index 0000000000..198b1a0645
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-issue.md
@@ -0,0 +1,30 @@
+---
+name: Feature Issue
+about: Feature Issue
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+# Feature Issue
+
+[comment]: # (Please replace ... with your information. Remove < and >)
+
+### User Story
+
+As a <user|developer|...>, I want to <task> **so that** <goal>. 
+
+### Description
+
+[comment]: # (Describe the feature you would like and include designs and Figma links if available.)
+[comment]: # (Describe the use cases the implementation should cover. E.g. New users, existing users, public chat, group chat, etc)
+*Summary*: ...
+
+### Acceptance Criteria
+
+[comment]: # (Rules for the future PR to be accepted.)
+
+### Notes
+
+[comment]: # (For the developer who will implement. Include planning poker estimates, guidance, etc.)
diff --git a/.github/ISSUE_TEMPLATE/SIMPLE_ISSUE.md b/.github/ISSUE_TEMPLATE/simple-issue.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/SIMPLE_ISSUE.md
rename to .github/ISSUE_TEMPLATE/simple-issue.md