diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 21b4a4273e..75e2d37185 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -2,7 +2,7 @@ name: 🚀 Feature
 description: "Submit a proposal for a new feature"
 title: "Feature: "
 labels: ["enhancement"]
-assignees: ["prakarsh-dt","nishant-d"]
+assignees: ["prakarsh-dt","nishant-d","abhibhaw"]
 body:
   - type: markdown
     attributes:
@@ -21,17 +21,9 @@ body:
     validations:
       required: true
     attributes:
-      label: "🎤 Pitch"
+      label: "🎤 Pitch / Usecases"
       description: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
       placeholder: "In my use-case, ..."
-  - type: textarea
-    id: solution
-    validations:
-      required: true
-    attributes:
-      label: "✌️ Solution"
-      description: "A clear and concise description of what you want to happen."
-      placeholder: "I want this feature to, ..."
   - type: textarea
     id: alternative
     validations:
diff --git a/.github/ISSUE_TEMPLATE/pager-duty.yaml b/.github/ISSUE_TEMPLATE/pager-duty.yaml
index f44743dd43..83ef72d40e 100644
--- a/.github/ISSUE_TEMPLATE/pager-duty.yaml
+++ b/.github/ISSUE_TEMPLATE/pager-duty.yaml
@@ -1,5 +1,5 @@
 name: "🚩 Pager duty Bug"
-description: "Submit a bug that is impacting/blocking/limiting a Devtron functionality."
+description: "Submit a bug that is impacting/blocking/limiting a Devtron functionality for an Enterprise."
 title: "Bug: "
 labels: ["bug","pager-duty"]
 assignees: ["prakarsh-dt","vikramdevtron","kripanshdevtron","vivek-devtron"]
@@ -16,12 +16,30 @@ body:
       label: "📜 Description"
       description: "A clear and concise description of what the bug is."
       placeholder: "It bugs out when ..."
+  - type: dropdown
+    id: criticality
+    attributes:
+      label: "Criticality"
+      description: "How critical is the issue? Please include the impact in the  "
+      options:
+        - P0 - Critical/Blocking
+        - P1 - High
+        - P2 - Medium
+        - P3 - Low
+  - type: textarea
+    id: impact
+    validations:
+      required: true
+    attributes:
+      label: "Impact on Enterprise"
+      description: "Describe the kind of Impact this bug/issue has on an Enterprise."
+      placeholder: "1. The users are unable to ..."
   - type: textarea
-    id: steps-to-reproduce
+    id: steps-to-replicate
     validations:
       required: true
     attributes:
-      label: "👟 Reproduction steps"
+      label: "👟 Steps to replicate the Issue"
       description: "How do you trigger this bug? Please walk us through it step by step."
       placeholder: "1. When I ..."
   - type: textarea