diff --git a/.github/ISSUE_TEMPLATE/amba-alz-issue.yml b/.github/ISSUE_TEMPLATE/amba-alz-issue.yml
new file mode 100644
index 000000000..106de85eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/amba-alz-issue.yml
@@ -0,0 +1,42 @@
+name: AMBA - ALZ Pattern Issue 🚀
+description: Have an issue, question or suggestion for the AMBA ALZ Pattern? Let us know!
+title: "[General workload issue]: "
+assignees:
+  - arjenhuitema
+labels:
+  [
+    "Pattern: ALZ"
+  ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting this issue!
+  - type: checkboxes
+    id: existing-checks
+    attributes:
+      label: Check for previous/existing GitHub issues
+      description: By submitting this issue, you confirm that you have [searched for previous/existing GitHub issues](https://github.com/Azure/azure-monitor-baseline-alerts/issues) to avoid creating a duplicate.
+      options:
+        - label: I have checked for previous/existing GitHub issues
+          required: true
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type?
+      description: How would you best describe this issue? Is this a...
+      options:
+        - "Feature Request"
+        - "Bug"
+        - "Question"
+        - "Other"
+    validations:
+      required: true
+  - type: textarea
+    id: question-feedback-text
+    attributes:
+      label: Description
+      description: Let us know your question, feedback or suggestion here!
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/amba-avd-issue.yml b/.github/ISSUE_TEMPLATE/amba-avd-issue.yml
new file mode 100644
index 000000000..2f75c8773
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/amba-avd-issue.yml
@@ -0,0 +1,42 @@
+name: AMBA - AVD Pattern Issue 🚀
+description: Have an issue, question or suggestion for the AMBA AVD Pattern? Let us know!
+title: "[General workload issue]: "
+assignees:
+  - JCoreMS
+labels:
+  [
+    "Pattern: AVD"
+  ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting this issue!
+  - type: checkboxes
+    id: existing-checks
+    attributes:
+      label: Check for previous/existing GitHub issues
+      description: By submitting this issue, you confirm that you have [searched for previous/existing GitHub issues](https://github.com/Azure/azure-monitor-baseline-alerts/issues) to avoid creating a duplicate.
+      options:
+        - label: I have checked for previous/existing GitHub issues
+          required: true
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type?
+      description: How would you best describe this issue? Is this a...
+      options:
+        - "Feature Request"
+        - "Bug"
+        - "Question"
+        - "Other"
+    validations:
+      required: true
+  - type: textarea
+    id: question-feedback-text
+    attributes:
+      label: Description
+      description: Let us know your question, feedback or suggestion here!
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/amba-avs-issue.yml b/.github/ISSUE_TEMPLATE/amba-avs-issue.yml
new file mode 100644
index 000000000..cedb30424
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/amba-avs-issue.yml
@@ -0,0 +1,42 @@
+name: AMBA - AVS Pattern Issue 🚀
+description: Have an issue, question or suggestion for the AMBA AVS Pattern? Let us know!
+title: "[General workload issue]: "
+assignees:
+  - Mahesh-MSFT
+labels:
+  [
+    "Pattern: AVS"
+  ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting this issue!
+  - type: checkboxes
+    id: existing-checks
+    attributes:
+      label: Check for previous/existing GitHub issues
+      description: By submitting this issue, you confirm that you have [searched for previous/existing GitHub issues](https://github.com/Azure/azure-monitor-baseline-alerts/issues) to avoid creating a duplicate.
+      options:
+        - label: I have checked for previous/existing GitHub issues
+          required: true
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type?
+      description: How would you best describe this issue? Is this a...
+      options:
+        - "Feature Request"
+        - "Bug"
+        - "Question"
+        - "Other"
+    validations:
+      required: true
+  - type: textarea
+    id: question-feedback-text
+    attributes:
+      label: Description
+      description: Let us know your question, feedback or suggestion here!
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/amba-workload-issue.yml b/.github/ISSUE_TEMPLATE/amba-workload-issue.yml
new file mode 100644
index 000000000..da3a1d279
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/amba-workload-issue.yml
@@ -0,0 +1,42 @@
+name: AMBA - General workload Issue 🚀
+description: Have an issue, question or suggestion for a specific workload alert or for the overall project? Let us know!
+title: "[General workload issue]: "
+assignees:
+  - JoeyBarnes
+labels:
+  [
+    "AMBA Core"
+  ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting this issue!
+  - type: checkboxes
+    id: existing-checks
+    attributes:
+      label: Check for previous/existing GitHub issues
+      description: By submitting this issue, you confirm that you have [searched for previous/existing GitHub issues](https://github.com/Azure/azure-monitor-baseline-alerts/issues) to avoid creating a duplicate.
+      options:
+        - label: I have checked for previous/existing GitHub issues
+          required: true
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type?
+      description: How would you best describe this issue? Is this a...
+      options:
+        - "Feature Request"
+        - "Bug"
+        - "Question"
+        - "Other"
+    validations:
+      required: true
+  - type: textarea
+    id: question-feedback-text
+    attributes:
+      label: Description
+      description: Let us know your question, feedback or suggestion here!
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/question_feedback.yml b/.github/ISSUE_TEMPLATE/question_feedback.yml
deleted file mode 100644
index c9d72a7f4..000000000
--- a/.github/ISSUE_TEMPLATE/question_feedback.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: General Question/Feedback ❔
-description: Just got a question or some general feedback? Let us know
-title: "[Question/Feedback]: "
-labels: ["question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for your question/feedback
-  - type: checkboxes
-    id: existing-checks
-    attributes:
-      label: Check for previous/existing GitHub issues
-      description: By submitting this issue, you confirm that you have [searched for previous/existing GitHub issues](https://github.com/Azure/azure-monitor-baseline-alerts/issues?q=is%3Aissue+sort%3Aupdated-desc+) to avoid creating a duplicate.
-      options:
-        - label: I have checked for previous/existing GitHub issues
-          required: true
-  - type: textarea
-    id: question-feedback-text
-    attributes:
-      label: Description
-      description: Let us know your question or feedback here
-    validations:
-      required: true