diff --git a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
index d0d6aa6f90b307..659135117d1938 100644
--- a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
+++ b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
@@ -1,12 +1,46 @@
-name: "\U0001F4DC Cert Blocker"
-description: Create a report to identify matter certification blockers
-title: "[CERT-BLOCKER] "
+name: "\U0001F4DC Test Case Failure / Cert Blocker"
+description: Create a report to identify matter certification test failures
+title: "[CERT-TEST-FAILURE] "
 labels: [bug, "cert blocker", "needs triage"]
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for reporting an issue against the Matter SDK! We need information about the cert blocker to follow up, so please help us out by filling out this information.
+  - type: dropdown
+    attributes:
+      label: Feature Area
+      description: What feature area is the test failing in?
+      multiple: true
+      options:
+        - Area:AirPurifiers
+        - Area:AirQualitySensor
+        - Area:ConcentrationMeasurement
+        - Area:DeviceAppearance
+        - Area:Dishwashers
+        - Area:DoorLockEnhancements
+        - Area:EventList
+        - Area:ICDPhase2
+        - Area:ModeSelect
+        - Area:OperationalState
+        - Area:Refrigerators
+        - Area:RobotVacuums
+        - Area:RoomAirConditioner
+        - Area:Scenes
+        - Area:SmokeCO2
+        - Area:TemperatureControlledCabinet
+        - Area:TimeSync
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: testcase
+    attributes:
+      label: Test Case
+      description: "Which test case is failing?"
+      placeholder: "TC-XXXX"
+    validations:
+      required: true
   - type: textarea
     id: repro
     attributes:
@@ -60,12 +94,6 @@ body:
         - 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.2.1, N/A"
   - type: textarea
     attributes:
       label: Anything else?
@@ -77,4 +105,4 @@ body:
       required: false
   - type: markdown
     attributes:
-      value: "Thanks for submitting a cert blocker!"
+      value: "Thanks for submitting a test case/cert blocker!"
diff --git a/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml b/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
new file mode 100644
index 00000000000000..a99f5a6361715d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml
@@ -0,0 +1,59 @@
+name: "\U0001F6E0 Test Issue"
+description: Test issue
+title: "[Test Failed] "
+labels: ["build issue", "needs triage", "tests"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue against the Matter SDK's tests! 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: Test issue(s)
+      description: "What are the tests that failed? Please include links to failed jobs if possible."
+      value: |
+        1.
+        2.
+        3.
+        ...
+    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 tests"
diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
new file mode 100644
index 00000000000000..9065ed0d12735e
--- /dev/null
+++ b/.github/issue-labeler.yml
@@ -0,0 +1,43 @@
+darwin:
+  - "(ios|homepod|darwin|mac|macos)"
+
+linux:
+  - "(linux)"
+
+# Special Keywords for Cert Blockers
+air purifiers:
+  - "(Area-AirPurifiers)"
+air quality sensors:
+  - "(Area-AirQualitySensor)"
+concentration measurement:
+  - "(Area-ConcentrationMeasurement)"
+device appearance:
+  - "(Area-DeviceAppearance)"
+dishwashers:
+  - "(Area-Dishwashers)"
+door lock enhancements:
+  - "(Area-DoorLockEnhancements)"
+event list:
+  - "(Area-EventList)"
+icd:
+  - "(Area-ICDPhase2)"
+icd phase 2:
+  - "(Area-ICDPhase2)"
+mode select:
+  - "(Area-ModeSelect)"
+operational state:
+  - "(Area-OperationalState)"
+refrigerators:
+  - "(Area-Refrigerators)"
+robot vacuums:
+  - "(Area-RobotVacuums)"
+room air conditioners:
+  - "(Area-RoomAirConditioner)"
+scenes:
+  - "(Area-Scenes)"
+smoke & c02:
+  - "(Area-SmokeCO2)"
+temperature controlled cabinet:
+  - "(Area-TemperatureControlledCabinet)"
+time sync:
+  - "(Area-TimeSync)"
diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml
new file mode 100644
index 00000000000000..c04bcee2bb459e
--- /dev/null
+++ b/.github/workflows/issue-labeler.yaml
@@ -0,0 +1,20 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened, edited]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: github/issue-labeler@v3.1 #May not be the latest version
+      with:
+        configuration-path: .github/issue-labeler.yml
+        not-before: 2020-01-15T02:54:32Z
+        enable-versioned-regex: 0
+        sync-labels: 1
+        repo-token: ${{ github.token }}
\ No newline at end of file