diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f3b52c295b..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of-->
-
-**Is this a request for help?**:
-
----
-
-**Is this an ISSUE or FEATURE REQUEST?** (choose one):
-
----
-
-**Which release version?**:
-
----
-
-**Which component (CNI/IPAM/CNM/CNS)**:
-
----
-
-**Which Operating System (Linux/Windows)**:
-
----
-
-**For Linux: Include Distro and kernel version using "uname -a"**
-
----
-
-**For windows: provide output of "$(Get-ItemProperty -Path "C:\windows\system32\hal.dll").VersionInfo.FileVersion"**
-
----
-
-<!--
-If this is a ISSUE, please:
-  - Fill in as much of the template below as you can.  If you leave out
-    information, we can't help you as well.
-
-If this is a FEATURE REQUEST, please:
-  - Describe *in detail* the feature/behavior/change you'd like to see.
-
-In both cases, be ready for followup questions, and please respond in a timely
-manner.  If we can't reproduce a bug or think a feature already exists, we
-might close your issue.  If we're wrong, PLEASE feel free to reopen it and
-explain why.
--->
-
-**Which Orchestrator and version (e.g. Kubernetes, Docker)**
-
----
-
-**What happened**:
-
----
-
-**What you expected to happen**:
-
----
-
-**How to reproduce it** (as minimally and precisely as possible):
-
----
-
-**Anything else we need to know**:
-
----
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..c2048fc9f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: 'Bug Report'
+about: Create a report to help us improve
+
+---
+
+**What happened:**
+
+
+**What you expected to happen:**
+
+
+**How to reproduce it:**
+
+
+**Anything else we need to know?:**
+[Miscellaneous information that will assist in solving the issue.]
+
+
+**Environment:**
+- orchestrator and version (e.g. Kubernetes, Docker):
+- component and version (CNI/IPAM/CNM/CNS):
+- operation system (Linux/Windows):
+- Kernel (e.g. `uanme -a` for Linux or `$(Get-ItemProperty -Path "C:\windows\system32\hal.dll").VersionInfo.FileVersion` for Windows):
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..1d7a15e2af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: 'Feature request'
+about: Suggest an idea for this project.
+
+---
+
+**Describe in detail the feature/behavior/change you'd like to see:**
+
+
+**Anything else you would like to add:**
+[Miscellaneous information that will assist in solving the issue.]
+
+
+**Environment:**
+- orchestrator and version (e.g. Kubernetes, Docker):
+- component and version (CNI/IPAM/CNM/CNS):
+- operation system (Linux/Windows):