diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 7a8982d..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,37 +0,0 @@
-### OS / Environment (where do you run Algo on)
-<!--- 
-Run the command `uname -a` and put the output below  
--->
-
-```
-PUT THE OUTPUT HERE
-```
-
-### Cloud Provider (where do you deploy Algo to)
-<!--- 
-If you deploy to existing Ubuntu server, run the command `uname -a` on the server and put the output below
-If you deploy to a cloud provider specify the provider here
---->
-
-```
-PUT THE OUTPUT HERE
-```
-
-### Summary of the problem
-<!--- Describe the problem -->
-
-
-
-### Steps to reproduce the behavior
-<!--- Describe the steps how to reproduce the problem. -->
-
-1. Do this..
-2. Do that..
-3. 
-
-### Full log
-<!--- Put here the FULL LOG after you run the ./algo script below -->
-
-```
-PUT THE OUTPUT HERE
-```
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..cd9b4c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Do this..
+2. Do that..
+3. ..
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+
+Add any other context about the problem here.
+
+**Full log**
+
+<!--- Put here the FULL LOG after you run the ./algo script below -->
+
+```
+PUT THE OUTPUT HERE
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..066b2d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**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.