diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c8f9b4f..18acbde 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,7 @@
 name: Bug report
 description: Report an Issue to help and contribute to improve Project Patu
+title: "Brief bug summary"
+labels: ["needs-triaging", "kind/bug"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/enhancement-proposal.yml b/.github/ISSUE_TEMPLATE/enhancement-proposal.yml
new file mode 100644
index 0000000..0a41959
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement-proposal.yml
@@ -0,0 +1,43 @@
+name: Enhancement Proposal
+description: Suggest an enhancement to improve Project Patu
+title: "Brief enhancement summary "
+labels: ["needs-triaging", "kind/enhancement"]
+assignees: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for sparing the time to submit the enhancement proposal.
+  - type: textarea
+    id: why-enhancement
+    attributes:
+      label: Describe the Problem Statement
+      description: Please explain why this enhancement proposal is needed?
+      placeholder: Please provide a clear and concise description of the challenge/issue this enhancement will help resolve.
+    validations:
+      required: true
+  - type: textarea
+    id: enhancement-description
+    attributes:
+      label: Describe the Enhancement
+      description: Do you have any proposal on how to solve the problem statement you mentioned above?
+      placeholder: Please provide a clear and concise description of your proposal.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternate Solutions
+      description: did you explore any alternate solution for the above problem statement?
+      placeholder: Please provide a clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: add-context
+    attributes:
+      label: Additional context
+      description: Add any other context or information about the enhancement request here.
+      placeholder: ''
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/non-coding-task.yml b/.github/ISSUE_TEMPLATE/non-coding-task.yml
new file mode 100644
index 0000000..2269857
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/non-coding-task.yml
@@ -0,0 +1,41 @@
+name: Non Coding Task
+description: Any task that doesn't require any change in the repository contents (code, doc). E.g CPU/Mem profiling. 
+title: "Brief Description of the task."
+labels: ["needs-triaging", "kind/non-coding-task "]
+assignees: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for sparing the time to submit the task.
+  - type: textarea
+    id: task-description
+    attributes:
+      label: Describe the Task
+      description: what is this task about?
+      placeholder: Please provide a clear and concise description of the task.
+    validations:
+      required: true
+  - type: textarea
+    id: deployment-environment
+    attributes:
+      label: Deployment Environment
+      description: Please complete the following information
+      placeholder: |
+        Operating System: 
+        Kernel Version: 
+        Go Version:
+    validations:
+      required: false
+- type: textarea
+    id: deliverables
+    attributes:
+      label: Outcome/Deliverables of the Task
+      description: What deliverable do you think this task would generate?
+      placeholder: |
+        Please list the possible deliverables (or update this section once the task is concluded) such as 
+        - Logs, blogs, slide decks and relevant artifacts that are not published to the project repo.
+        - Reference to the PR that is generated as an outcome of this work.
+        - Anything that is relevant and helpful to understand the task and it's overall outcome.
+    validations:
+      required: false