diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index 78c0e9c..10551fe 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.0 Issue"
+name: "\u0030\u20e3 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
index cd6179d..50db3e8 100644
--- a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.1 Issue"
+name: "\u0031\u20e3 1.1 Issue"
 description: Create an issue that is required for Matter 1.1 release
 title: "[1.1] "
 labels: [bug, "V1.1", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
index dd67cd7..81b641a 100644
--- a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.2 Issue"
+name: "\u0032\u20e3 1.2 Issue"
 description: Create an issue that is required for Matter 1.2 release
 title: "[1.2] "
 labels: [bug, "V1.2", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
index a904231..5c91f91 100644
--- a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.3 Issue"
+name: "\u0033\u20e3 1.3 Issue"
 description: Create an issue that is required for Matter 1.3 release
 title: "[1.3] "
 labels: [bug, "V1.3", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
index 667c894..0d775a6 100644
--- a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F3C3 Tooling Fix/Feature"
+name: "\U0001F9F0 Tooling Fix/Feature"
 description: Create an issue for a tooling specific fix/feature
 title: "[Tooling] "
 labels: ["tools", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
index 691a5ce..fdb8b76 100644
--- a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F9F0 Platform Fix"
+name: "\U0001F3D7 Platform Fix"
 description: Create an issue for a platform specific fix
 title: "[Platform] "
 labels: ["platform", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
index bf24349..d0d6aa6 100644
--- a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
+++ b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F41B Cert Blocker"
+name: "\U0001F4DC Cert Blocker"
 description: Create a report to identify matter certification blockers
 title: "[CERT-BLOCKER] "
 labels: [bug, "cert blocker", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/098-build-issue.yaml b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
new file mode 100644
index 0000000..5d1adb3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
@@ -0,0 +1,59 @@
+name: "\U0001F6E0 Build Issue"
+description: Build issue
+title: "[Build] "
+labels: ["build issue", "needs triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue against the Matter SDK's builds! 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: Build issue(s)
+      description: "What are the build issues? 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 builds"