diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..01260d75e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
+<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
+<!-- Please search for existing issues to avoid creating duplicates. -->
+<!-- Incomplete reports will lead to closing the issue. -->
+<!-- Also, please test using the latest master make sure your issue has not already been fixed -->
+
+## Bug report 
+<!-- If any section does not apply, replace its contents with "N/A". -->
+- AirSim Version/#commit:
+- UE/Unity version:
+- autopilot version:
+- OS Version:
+
+### What's the issue you encountered?
+<!--  Describe the issue in detail and what you were doing beforehand. -->
+<!-- Attach screenshot if applicable. -->
+
+### Settings
+<!-- If not the default, include the settings.json file you are using -->
+<!-- If it's too large, you can create a [gist](https://gist.github.com/) and past the link here.  -->
+
+### How can the issue be reproduced?
+<!--  Include a detailed step by step process for recreating your issue. -->
+<!-- If your issue includes code, create a [gist](https://gist.github.com/) and past the link here. -->
+
+1.
+2.
+
+### Include full error message in text form
+
+
+
+**What's better than filing an issue? Filing a pull request :).**
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..6607d50e90
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: User Support and General Questions
+    url: https://github.com/microsoft/AirSim/discussions
+    about: Please ask on https://github.com/microsoft/AirSim/discussions
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..1db2cb5004
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!-- ⚠️⚠️ Do Not Delete This! feature_request_template ⚠️⚠️ -->
+<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
+<!-- Please search existing issues to avoid creating duplicates. -->
+
+## What feature are you suggesting?
+### Overview:
+<!-- Describe the feature you'd like. -->
+
+### Smaller Details: 
+<!-- These may include specific methods of implementation etc. -->
+
+### Nature of Request:  
+<!-- Remove all that do not apply to your request.  -->
+- Addition
+- Change
+- Removal
+  - <!--  Removal of certain features or implementation due to a specific issue/bug or because of low quality code, etc.  -->
+
+## Why would this feature be useful?
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..90727dd46d
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+<!-- Thank you for submitting a pull request! -->
+<!-- ⚠️⚠️ Do Not Delete This! pull_request_template ⚠️⚠️ -->
+<!-- Please read our contribution guidelines: https://microsoft.github.io/AirSim/CONTRIBUTING/ -->
+
+Fixes: #    <!-- add this line for each issue your PR solves. -->
+<!-- Fixes: # -->
+<!-- Fixes: # -->
+
+## About
+<!-- Describe what your PR is about. -->
+
+## How Has This Been Tested?
+<!-- Please, describe how you have tested your changes to help us incorporate them. -->
+
+## Screenshots (if appropriate):
\ No newline at end of file
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 63c43c7208..0000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Read This First
-
-## If you are reporting a bug
-* Make sure to write **all reproduction steps**
-* Include full error message in text form
-* Search issues for error message before filing issue
-* Attach screenshot if applicable
-* Include code to run if applicable
-
-## If you have question
-* Add clear and concise title
-* Add OS, AirSim version, Python version, Unreal version if applicable
-* Include context on what you are trying to achieve
-* Include details of what you already did to find answers
-
-**What's better than filing issue? Filing a pull request :).**
-
------------------------------------- (Remove above before filing the issue) ------------------------------------