diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yaml b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
index ec13ee3ee5bb44..3266f2bb9ba5e4 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
@@ -2,76 +2,76 @@ name: "\U0001F41B Bug report"
 description: Create a report to help Matter
 title: "[BUG] "
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
-  - type: textarea
-    id: repro
-    attributes:
-      label: Reproduction steps
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      value: |
-        1.
-        2.
-        3.
-        ...
-      render: bash
-    validations:
-      required: true
-  - type: input
-    id: prevalence
-    attributes:
-      label: Bug prevalence
-      description: "How often do you or others encounter this bug?"
-      placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: GitHub hash of the SDK that was being used
-      description: Hash of the GitHub SDK used
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Platform
-      description: What platforms are affected?
-      multiple: true
-      options:
-        - ameba
-        - android
-        - cc13x2_cc26x2
-        - darwin
-        - efr32
-        - esp32
-        - freeRTOS
-        - IMX8
-        - k32w
-        - nrf
-        - python
-        - raspi
-        - vscode
-        - windows
-        - other
-        - core
-    validations:
-      required: true
-  - type: input
-    id: platform-versions
-    attributes:
-      label: Platform Version(s)
-      description: "What platform version(s) are affected [optional]"
-      placeholder: "eg: 1.0.1, N/A"
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps
+          description: "How do you trigger this bug? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: input
+      id: prevalence
+      attributes:
+          label: Bug prevalence
+          description: "How often do you or others encounter this bug?"
+          placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: GitHub hash of the SDK that was being used
+          description: Hash of the GitHub SDK used
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
 
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: "Thanks for submitting a bug!"
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for submitting a bug!"
diff --git a/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml b/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
index ced8423ab260ee..5bc63949be7039 100644
--- a/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
@@ -2,57 +2,57 @@ name: "\U0001F5BA Documentation Issue"
 description: Create an issue to improve documentation
 title: "[Documentation] "
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
-  - type: textarea
-    id: repro
-    attributes:
-      label: Documentation issues
-      description: "What updates to documentation are needed?"
-      value: |
-        1.
-        2.
-        3.
-        ...
-      render: bash
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Platform
-      description: What platforms are affected?
-      multiple: true
-      options:
-        - ameba
-        - android
-        - cc13x2_cc26x2
-        - darwin
-        - efr32
-        - esp32
-        - freeRTOS
-        - IMX8
-        - k32w
-        - nrf connect
-        - nrf
-        - python
-        - raspi
-        - vscode
-        - windows
-        - other
-        - core (please add to version below)
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Documentation issues
+          description: "What updates to documentation are needed?"
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
 
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: "Thanks for submitting a documentation issue!"
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for helping improve our documentation."
diff --git a/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml
index 2344a139f74624..15c8a8a64e2937 100644
--- a/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml
@@ -1,95 +1,95 @@
-name: "\U0001F41B 1.0 Issue"
+name: "\U0001F680 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
-  - type: textarea
-    id: repro
-    attributes:
-      label: Reproduction steps
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      value: |
-        1.
-        2.
-        3.
-        ...
-      render: bash
-    validations:
-      required: true
-  - type: input
-    id: prevalence
-    attributes:
-      label: Bug prevalence
-      description: "How often do you or others encounter this bug?"
-      placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: GitHub hash of the SDK that was being used
-      description: Hash of the GitHub SDK used
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Platform
-      description: What platforms are affected?
-      multiple: true
-      options:
-        - ameba
-        - android
-        - cc13x2_cc26x2
-        - darwin
-        - efr32
-        - esp32
-        - freeRTOS
-        - IMX8
-        - k32w
-        - nrf connect
-        - nrf
-        - python
-        - raspi
-        - vscode
-        - windows
-        - other
-        - core
-    validations:
-      required: true
-  - type: input
-    id: platform-versions
-    attributes:
-      label: Platform Version(s)
-      description: "What platform version(s) are affected [optional]"
-      placeholder: "eg: 1.0.1, N/A"
-  - type: dropdown
-    attributes:
-      label: Type
-      description: What type of issue is this?
-      multiple: true
-      options:
-        - Test Improvement
-        - Common Cluster Logic
-        - Spec Compliance Issue
-        - Security Issue
-        - Platform Issue
-        - Core SDK Memory Issue
-        - Core SDK Crash
-        - Core SDK Performance Improvement
-        - Core SDK Interopability Issue
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps
+          description: "How do you trigger this bug? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: input
+      id: prevalence
+      attributes:
+          label: Bug prevalence
+          description: "How often do you or others encounter this bug?"
+          placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: GitHub hash of the SDK that was being used
+          description: Hash of the GitHub SDK used
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: dropdown
+      attributes:
+          label: Type
+          description: What type of issue is this?
+          multiple: true
+          options:
+              - Test Improvement
+              - Common Cluster Logic
+              - Spec Compliance Issue
+              - Security Issue
+              - Platform Issue
+              - Core SDK Memory Issue
+              - Core SDK Crash
+              - Core SDK Performance Improvement
+              - Core SDK Interopability Issue
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
 
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: "Thanks for submitting a bug!"
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for helping us get to 1.0!"
diff --git a/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
index df8fc198fe33d6..90de36176c2e3f 100644
--- a/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
@@ -1,95 +1,116 @@
-name: "\U0001F41B SVE Issue"
+name: "\U0001F9EA SVE Issue"
 description: Create an issue that is required for SVE
 title: "[SVE] "
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
-  - type: textarea
-    id: repro
-    attributes:
-      label: Reproduction steps
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      value: |
-        1.
-        2.
-        3.
-        ...
-      render: bash
-    validations:
-      required: true
-  - type: input
-    id: prevalence
-    attributes:
-      label: Bug prevalence
-      description: "How often do you or others encounter this bug?"
-      placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: GitHub hash of the SDK that was being used
-      description: Hash of the GitHub SDK used
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Platform
-      description: What platforms are affected?
-      multiple: true
-      options:
-        - ameba
-        - android
-        - cc13x2_cc26x2
-        - darwin
-        - efr32
-        - esp32
-        - freeRTOS
-        - IMX8
-        - k32w
-        - nrf connect
-        - nrf
-        - python
-        - raspi
-        - vscode
-        - windows
-        - other
-        - core (please add to version below)
-    validations:
-      required: true
-  - type: input
-    id: platform-versions
-    attributes:
-      label: Platform Version(s)
-      description: "What platform version(s) are affected [optional]"
-      placeholder: "eg: 1.0.1, N/A"
-  - type: dropdown
-    attributes:
-      label: Type
-      description: What type of issue is this?
-      multiple: true
-      options:
-        - Test Improvement
-        - Common Cluster Logic
-        - Spec Compliance Issue
-        - Security Issue
-        - Platform Issue
-        - Core SDK Memory Issue
-        - Core SDK Crash
-        - Core SDK Performance Improvement
-        - Core SDK Interopability Issue
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting an issue against the Matter SDK! We need information about the bug report to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps
+          description: "How do you trigger this bug? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: input
+      id: prevalence
+      attributes:
+          label: Bug prevalence
+          description: "How often do you or others encounter this bug?"
+          placeholder: "Example: Whenever I do this, 1-2 times a week, day, hour, etc"
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: GitHub hash of the SDK that was being used
+          description: Hash of the GitHub SDK used
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: dropdown
+      attributes:
+          label: Type
+          description: What type of issue is this?
+          multiple: true
+          options:
+              - Test Improvement
+              - Common Cluster Logic
+              - Spec Compliance Issue
+              - Security Issue
+              - Platform Issue
+              - Core SDK Memory Issue
+              - Core SDK Crash
+              - Core SDK Performance Improvement
+              - Core SDK Interopability Issue
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Type
+          description: How was this tested?
+          multiple: true
+          options:
+              - Unit tested
+              - YAML tested
+              - Manually tested with SDK
+              - CI tested
+              - Hardware validated
+              - Platform validated
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: (Optional) If manually tested please explain why this is only manually tested
+          description: |
+              Please explain how you tested it
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
 
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: "Thanks for submitting a bug!"
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for helping our SVE!"
diff --git a/.github/ISSUE_TEMPLATE/50-tooling-fix.yaml b/.github/ISSUE_TEMPLATE/50-tooling-fix.yaml
new file mode 100644
index 00000000000000..ed314f9cb925a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/50-tooling-fix.yaml
@@ -0,0 +1,85 @@
+name: "\U0001F3C3 Tooling Fix/Feature"
+description: Create an issue for a tooling specific fix/feature
+title: "[Platform] "
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to submit a an issue for our tooling, can you please please help us understand this change in this quick form?
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps / Feature
+          description: "How do you trigger this issue and/or can you please explain this new feature? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: dropdown
+      attributes:
+          label: Type
+          description: How was this tested?
+          multiple: true
+          options:
+              - Unit tested
+              - YAML tested
+              - Manually tested with SDK
+              - CI tested
+              - Hardware validated
+              - Platform validated
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: (Optional) If manually tested please explain why this is only manually tested
+          description: |
+              Please explain how you tested it
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about this!
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for help our tooling!"
diff --git a/.github/ISSUE_TEMPLATE/60-platform-fix.yaml b/.github/ISSUE_TEMPLATE/60-platform-fix.yaml
new file mode 100644
index 00000000000000..9593847a228290
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/60-platform-fix.yaml
@@ -0,0 +1,85 @@
+name: "\U0001F9F0 Platform Fix"
+description: Create an issue for a platform specific fix
+title: "[Platform] "
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to submit a an issue for a platform, can you please please help us understand this change in this quick form?
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps
+          description: "How do you trigger this issue? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: dropdown
+      attributes:
+          label: Type
+          description: How was this tested?
+          multiple: true
+          options:
+              - Unit tested
+              - YAML tested
+              - Manually tested with SDK
+              - CI tested
+              - Hardware validated
+              - Platform validated
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: (Optional) If manually tested please explain why this is only manually tested
+          description: |
+              Please explain how you tested it
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about this!
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for submitting a platform issue!"
diff --git a/.github/ISSUE_TEMPLATE/70-trivial-fix.yaml b/.github/ISSUE_TEMPLATE/70-trivial-fix.yaml
new file mode 100644
index 00000000000000..d9438ab611f83b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/70-trivial-fix.yaml
@@ -0,0 +1,98 @@
+name: "\U0001F3C3 Trivial Fix"
+description: Create an issue for a trivial fix
+title: "[Trivial] "
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to submit a trivial fix, can you please please help us understand this change in this quick form?
+    - type: dropdown
+      attributes:
+          label: Type
+          description: What type of trivial fix is this?
+          multiple: true
+          options:
+              - Comment fix
+              - Typo fix
+              - Rename
+              - Other
+      validations:
+          required: true
+    - type: textarea
+      id: repro
+      attributes:
+          label: Explanation
+          description: "(Optional) If other, why do you think this is trivial?"
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: false
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - all
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: dropdown
+      attributes:
+          label: Type
+          description: How was this tested?
+          multiple: true
+          options:
+              - Unit tested
+              - YAML tested
+              - Manually tested with SDK
+              - CI tested
+              - Hardware validated
+              - Platform validated
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: (Optional) If manually tested please explain why this is only manually tested
+          description: |
+              Please explain how you tested it
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about this!
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for submitting a trivial issue!"
diff --git a/.github/ISSUE_TEMPLATE/80-feature-request.yaml b/.github/ISSUE_TEMPLATE/80-feature-request.yaml
new file mode 100644
index 00000000000000..1526dc23c54755
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/80-feature-request.yaml
@@ -0,0 +1,62 @@
+name: "\U0001F4A1 Feature Request"
+description: Create an feature to be considered future release
+title: "[Feature] "
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for submitting a feature request to the Matter SDK! We need information about the feature to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Feature description
+          description: "What feature are you looking to add? Please walk us through it!"
+          value: |
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - all
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core
+      validations:
+          required: true
+    - type: input
+      id: platform-versions
+      attributes:
+          label: Platform Version(s)
+          description: "What platform version(s) are affected [optional]"
+          placeholder: "eg: 1.0.1, N/A"
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for submitting a new feature request."
diff --git a/.github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml b/.github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml
new file mode 100644
index 00000000000000..2f1570e4b860a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml
@@ -0,0 +1,59 @@
+name: "\U0001F477 GitHub / CI / Workflow"
+description: Create an issue to improve CI / Workflows
+title: "[Workflow] "
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for reporting an issue against the Matter SDK's workflows! We need information about the bug report to follow up, so please help us out by filling out this information.
+    - type: textarea
+      id: repro
+      attributes:
+          label: Workflow issues
+          description: "What updates to the workflows are needed?"
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+    - type: dropdown
+      attributes:
+          label: Platform
+          description: What platforms are affected?
+          multiple: true
+          options:
+              - ameba
+              - android
+              - cc13x2_cc26x2
+              - darwin
+              - efr32
+              - esp32
+              - freeRTOS
+              - IMX8
+              - k32w
+              - nrf connect
+              - nrf
+              - python
+              - raspi
+              - vscode
+              - windows
+              - other
+              - core (please add to version below)
+              - all
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Anything else?
+          description: |
+              Links? References? Anything that will give us more context about the issue you are encountering!
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      validations:
+          required: false
+    - type: markdown
+      attributes:
+          value: "Thanks for helping improve our development workflows"
diff --git a/.github/workflows/require-issue.yaml b/.github/workflows/require-issue.yaml
new file mode 100644
index 00000000000000..3915821ae618b7
--- /dev/null
+++ b/.github/workflows/require-issue.yaml
@@ -0,0 +1,32 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Require Issues for PRs
+
+on:
+    pull_request:
+        types: [edited, synchronize, opened, reopened]
+
+jobs:
+    verify_issue_exists:
+        name: Verify Linked Issue
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Verify Linked Issue
+              uses: hattan/verify-linked-issue-action@v1.1.5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  message: "All PRs require an issue to be accepted, please link an issue or mention it in the body using #<issue_id>"
diff --git a/.pullapprove.yml b/.pullapprove.yml
index f9da0a4be5ab3b..90ac75dcec2472 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -43,6 +43,13 @@ overrides:
       status: failure
       explanation: "Style must be inline before reviewing can be complete"
 
+    ############################################################
+    #  Require Issues
+    ############################################################
+    - if: "'*issue*' not in statuses.successful"
+      status: failure
+      explanation: "An issue is required for all PRs"
+
     ############################################################
     #  Fast tracking
     ############################################################