diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug-report--community-product--.md
similarity index 65%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug-report--community-product--.md
index 875144098..bc99b552c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report--community-product--.md
@@ -1,8 +1,8 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: Bug report (Community Product).
+about: Create a report to help us improve our community Product
 title: ''
-labels: Customer reported Bug
+labels: Customer reported Bug, Open Source
 assignees: bhanu2217, RafficMohammed
 
 ---
@@ -13,11 +13,6 @@ assignees: bhanu2217, RafficMohammed
 - Database Driver & Version :
 - Server specification :
 
-#### Product Type
-- [ ] Open Source
-
-- [ ] Paid
-
 
 #### Description:
 
@@ -32,5 +27,3 @@ assignees: bhanu2217, RafficMohammed
 - [ ] development-branch
 
 - [ ] release-tag
-      
-- [ ] Billing
diff --git a/.github/ISSUE_TEMPLATE/bug-report--paid-product-.md b/.github/ISSUE_TEMPLATE/bug-report--paid-product-.md
new file mode 100644
index 000000000..52d444597
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report--paid-product-.md
@@ -0,0 +1,18 @@
+---
+name: Bug report (Paid Product)
+about: Create a report to help us improve
+title: ''
+labels: Customer reported Bug, Paid
+assignees: bhanu2217, RafficMohammed
+
+---
+
+- Faveo Version : #.#.#
+- Product Name :
+- Server specification :
+
+
+#### Description:
+
+
+#### Steps To Reproduce: