diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000000..f9eb924dcb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Report a problem with Racket or Racket's tools
+title: ''
+labels: 
+assignees: ''
+
+---
+
+**What version of Racket are you using?**
+e.g. 7.7 [cs]
+
+**What program did you run?**
+Please include a short example that triggers the bug
+
+**What should have happened?**
+
+
+**If you got an error message, please include it here.**
+
+
+**Please include any other revelant details**
+e.g. the Operating system used or how you are running the code.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..5c35ead4b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea to discuss
+title: "[Feature Request]"
+labels: feature-request
+assignees: ''
+
+---
+
+
+**Is your feature request related to a problem? Please describe.**
+A description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A description of what you want to happen.
+
+**Describe alternatives you've considered**
+A description of any alternative solutions or features you've considered.
+
+***Do you want to contribute to this feature***
+If you're interested in working on the development of this feature, say so here. 
+
+**[Optional]Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE_DRAFT/bug_report.md b/.github/ISSUE_TEMPLATE_DRAFT/bug_report.md
deleted file mode 100644
index 4bcd83dc3b..0000000000
--- a/.github/ISSUE_TEMPLATE_DRAFT/bug_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-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. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-If this bug is particular to running in DrRacket, please note that here.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Racket version**
-Such as 6.12, 7.1, or a snapshot
-
-**Operating System**
-Such as Linux, Mac, or Windows, including the version.
-
-**Additional context**
-Add any other context about the problem here.