diff --git a/.github/ISSUE_TEMPLATE/papi_bug_report.yaml b/.github/ISSUE_TEMPLATE/papi_bug_report.yaml
index 912ccd4..971f239 100644
--- a/.github/ISSUE_TEMPLATE/papi_bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/papi_bug_report.yaml
@@ -1,16 +1,56 @@
-name: PAPI Bug Report
-description: File a PAPI bug report.
-title: "[Bug]: "
+name: PAPI Issue Report
+description: File a PAPI issue report.
+title: "[Issue]: "
 body:
+  - type: markdown
+    attributes:
+      value: Thank you for taking the time to fill out this issue report!
+  - type: textarea
+    id: issue-description
+    attributes:
+      label: Issue Description
+      description: What is the issue that you are encountering?
+    validation:
+      required: True
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+      description: What is the your operating system? Include name and version number.
+      placeholder: e.g. Rocky Linux Version 9.5 
+    validation:
+      required: True
   - type: input
-    id: system-and-architecture-of-users-machine
+    id: architecture
     attributes:
-      label: What is the system and architecture of your machine?
-      placeholder: e.g. 6.1.129-1.el9.elrepo.x86_64 
+      label: Architecture
+      description: What is your machines architecture?
+      placeholder: e.g. x86_64
+    validation:
+      required: True
   - type: input
     id: cpu-architecture
     attributes:
-      label: What CPU architecture are you using?
-      placeholder: e.g. Intel Xeon Gold 6140 CPU 
+      label: CPU Architecture
+      description: What CPU architecture are you using?
+      placeholder: e.g. Intel Xeon Gold 6140 CPU
+    validation:
+      required: True
+  - type: input
+    id: compiler
+    attributes:
+      label: Compiler
+      description: What is your compiler and compiler version?
+      placeholder: e.g. GCC 11.5.0
+    validation:
+      required: True
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: Provide steps to reproduce this issue (optional).
+    validation:
+      required: False
+