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/cni_bug_report.md b/.github/ISSUE_TEMPLATE/cni_bug_report.md
new file mode 100644
index 0000000000..9820b6baa0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cni_bug_report.md
@@ -0,0 +1,25 @@
+---
+name: 'CNI Bug Report'
+about: Create a report to help us improve
+---
+
+**What happened:** 
+
+
+**What you expected to happen:**  
+
+
+**How to reproduce it:**  
+
+
+**Orchestrator and Version (e.g. Kubernetes, Docker):**  
+
+
+**Operating System (Linux/Windows):**  
+
+
+**Kernel (e.g. `uanme -a` for Linux or `$(Get-ItemProperty -Path "C:\windows\system32\hal.dll").VersionInfo.FileVersion` for Windows):**
+
+
+**Anything else we need to know?:**
+[Miscellaneous information that will assist in solving the issue.]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..8b1f29bf37
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: 'Feature Request'
+about: Suggest an idea for this project.
+
+---
+**Component (Azure NPM or Azure CNI):**
+
+
+**Describe in detail the feature/behavior/change you'd like to see:**  
+
+
+**Orchestrator(e.g. Kubernetes, Docker):**  
+
+
+**Operating System (Linux/Windows):**  
+
+
+**Anything else you would like to add:**  
+[Miscellaneous information that will assist in solving the issue.]
+
diff --git a/.github/ISSUE_TEMPLATE/npm_bug_report.md b/.github/ISSUE_TEMPLATE/npm_bug_report.md
new file mode 100644
index 0000000000..a79766860d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/npm_bug_report.md
@@ -0,0 +1,22 @@
+---
+name: 'NPM Bug Report'
+about: Create a report to help us improve
+---
+
+**What happened:**  
+
+
+**What you expected to happen:**  
+
+
+**How to reproduce it:**  
+
+
+**Kubernetes Version:**  
+
+
+**Kernel (e.g. `uname -a`):**  
+
+
+**Anything else we need to know?:**
+[Miscellaneous information that will assist in solving the issue.]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9e17cd7ef9..883e1d2186 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,38 @@
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-1. If you want *faster* PR reviews, read how: https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#best-practices-for-faster-reviews
--->
+<!-- Thank you for helping Azure Container Networking with a pull request!
+Use conventional commit messages, such as
+  feat: add a knob to the frobnitz
+or
+  fix: repair hole in wumpus
+And read this for faster PR reviews: https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews -->
 
-**What this PR does / why we need it**:
+**Reason for Change**:
+<!-- What does this PR improve or fix in Azure Container Networking? -->
 
-**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
 
-**Special notes for your reviewer**:
+**Issue Fixed**:
+<!-- If this PR fixes GitHub issue 1234, add "Fixes #1234" to the next line. -->
 
-**Release note**:
-<!--  Steps to write your release note:
-1. Use the release-note-* labels to set the release note state (if you have access)
-2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`.
--->
-```release-note
-```
\ No newline at end of file
+
+**Requirements**:
+<!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR. -->
+
+
+- [ ] uses [conventional commit messages](https://www.conventionalcommits.org/)
+  <!-- Common commit types:
+        build: Build 🏭
+        chore: Maintenance 🔧
+        ci: Continuous Integration 💜
+        docs: Documentation 📘
+        feat: Features 🌈
+        fix: Bug Fixes 🐞
+        perf: Performance Improvements 🚀
+        refactor: Code Refactoring 💎
+        revert: Revert Change ◀️
+        style: Code Style 🎶
+        security: Security Fix 🛡️
+        test: Testing 💚 -->
+- [ ] includes documentation
+- [ ] adds unit tests
+
+
+**Notes**: