diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..6fb6ae18a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,22 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+
+---
+
+## Description
+Provide a brief overview of the enhancement or issue.
+
+## Steps to Reproduce
+Please add as much detail as possible to reproduce the error/issue.
+Don't assume the reader knows anything about the Mifos X Web App.
+
+## Expected Behaviour
+
+## Actual Behaviour
+
+## Settings
+- Mifos X version: 
+- Browser used: 
+
+## Screenshots, if any
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d920..817c80c1f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: Feature Request
 about: Suggest an idea for this project
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/user-story-template.md b/.github/ISSUE_TEMPLATE/user-story-template.md
index 661f1499e..fbeb12784 100644
--- a/.github/ISSUE_TEMPLATE/user-story-template.md
+++ b/.github/ISSUE_TEMPLATE/user-story-template.md
@@ -4,20 +4,25 @@ about: Template for basic user story
 
 ---
 
-*Goal:*
+**Goal:**
+
 As a <USER PERSONA> I want <FEATURE> so that I can <PURPOSE of FEATURE>  
 i.e. 
 
 As DevOps I want Health liveness Probe on the microservice so that the health of the service can be monitored.
 
-*Tasks:* 
 
-Add negative use-cases to Unit tests
-  Add Integration tests
-*Acceptance Criteria:*
+**Tasks:**    
+  i.e.
+  1.  Add negative use-cases to Unit tests
+  2.  Add Integration tests
+  3.  
 
-  Negative use-cases for Unit Tests in the "common streaming library"
-  Integration tests in the "common streaming library"
-*Dependencies:*
+ 
+**Acceptance Criteria:**
 
-  #148
+  - [ ] [LIST ITEMS]  
+  i.e.
+
+  - [ ] Negative use-cases for Unit Tests in the "common streaming library"
+  - [ ] Integration tests in the "common streaming library"