diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 59b6b1e1..5a68cd6a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 ---
 name: "Bug Report"
 description: "Submit a bug report for the current release"
-labels: ["bug"]
+labels: ["🕷️ bug"]
 projects: ["sysadminsmedia/2"]
 body:
   - type: checkboxes
@@ -20,6 +20,8 @@ body:
           required: true
         - label: I already read the docs and didn't find an answer.
           required: true
+        - label: I can replicate the issue inside the Demo install.
+          required: true
   - type: input
     id: homebox-version
     attributes:
@@ -55,6 +57,18 @@ body:
         - Other
     validations:
       required: true
+  - type: dropdown
+    id: arch
+    attributes:
+      label: OS Architechture
+      description: What type of processor are you running on.
+      multiple: true
+      options:
+        - x86_64 (AMD, Intel)
+        - ARM64
+        - ARM/v7
+    validations:
+      required: true
   - type: textarea
     id: os-details
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index d7a3ed13..3fa4d802 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 ---
 name: "Feature Request"
 description: "Submit a feature request for the current release"
-labels: ["enhancement"]
+labels: ["⬆️ enhancement"]
 projects: ["sysadminsmedia/2"]
 body:
   - type: textarea