diff --git a/.github/ISSUE_TEMPLATE/----feature-request.md b/.github/ISSUE_TEMPLATE/----feature-request.md
new file mode 100644
index 0000000000..fc7c635c9d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----feature-request.md
@@ -0,0 +1,22 @@
+---
+name: "\U0001F6E0️ Feature request"
+about: Suggest an idea to improve appsmith
+title: "[FEATURE]"
+labels: enhancement
+assignees: Nikhil-Nandagopal
+
+---
+
+## Summary
+
+One paragraph description of the feature.
+
+## Motivation
+
+Why should this be worked on? What problems or use cases does it solve or
+improve?
+
+## Additional Context
+
+Any other context or screenshots or API request payload/responses that you
+pertain to the feature.
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
new file mode 100644
index 0000000000..e84fbaca6a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,40 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a bug report to help us improve appsmith
+title: "[BUG]"
+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/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..0d881dee31
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🤔 Questions and Help
+    url: https://discord.com/invite/rBTTVJp
+    about: Reach out to us on discord or our github discussions page.
+  - name: 📞 Dedicated Support
+    url: https://mail.google.com/mail/u/0/?view=cm&fs=1&to=support@appsmith.com&tf=1
+    about: Write to us if you'd like dedicated support using appsmith
diff --git a/app/client/src/api/ActionAPI.tsx b/app/client/src/api/ActionAPI.tsx
index e8974f2668..b5b392326d 100644
--- a/app/client/src/api/ActionAPI.tsx
+++ b/app/client/src/api/ActionAPI.tsx
@@ -87,6 +87,7 @@ export interface ActionResponse {
   statusCode: string;
   duration: string;
   size: string;
+  isExecutionSuccess?: boolean;
 }
 
 export interface MoveActionRequest {
diff --git a/app/client/src/sagas/ActionExecutionSagas.ts b/app/client/src/sagas/ActionExecutionSagas.ts
index 7990b90d8f..278277230d 100644
--- a/app/client/src/sagas/ActionExecutionSagas.ts
+++ b/app/client/src/sagas/ActionExecutionSagas.ts
@@ -442,7 +442,7 @@ function* runActionSaga(
         type: ReduxActionTypes.RUN_ACTION_SUCCESS,
         payload: { [actionId]: payload },
       });
-      if (payload.statusCode[0] === "2") {
+      if (payload.isExecutionSuccess) {
         AppToaster.show({
           message: "Action ran successfully",
           type: ToastType.SUCCESS,