diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
new file mode 100644
index 0000000000..d0a24e13bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,40 @@
+---
+name: "\U0001F41E Bug report"
+about: Create a bug report to help us improve Appsmith
+title: ''
+labels: bug
+assignees: Nikhil-Nandagopal
+
+---
+
+## Description
+
+[What happened]
+
+### Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+Good items to include here include:
+- Console / network logs from your browser
+
+### What you expected to happen
+A clear and concise description of what you expected to happen.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+### Important Details
+
+How are you running appsmith?
+<!-- Please pick one of the following -->
+On-Premise w/ Docker, version x.y.z
+<!-- --------------- -->
+SaaS (appsmith.com)
+<!-- --------------- -->
+
+Which browser / OS are you using?
+ - OS: [e.g.MacOSX]
+ - Browser [e.g. chrome, safari]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..3759655d80
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a bug report to help us improve Appsmith
+title: ''
+labels: bug
+assignees: Nikhil-Nandagopal
+
+---
+
+## Description
+
+[What happened]
+
+### Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+Good items to include here include:
+- Console / network logs from your browser
+
+### What you expected to happen
+A clear and concise description of what you expected to happen.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+### Important Details
+
+How are you running appsmith?
+<!-- Please pick one of the following -->
+On-Premise w/ Docker, version x.y.z
+<!-- --------------- -->
+SaaS (appsmith.com)
+<!-- --------------- -->
+
+Which browser / OS are you using?
+ - OS: [e.g.MacOSX]
+ - Browser [e.g. chrome, safari]