diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..734daec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report errors and/or issues
+title: Short & descriptive title
+labels: bug
+assignees: ''
+
+---
+
+## Bug Description
+
+<!-- A clear and concise description of the problem, include screenshots or recordings of the issue. In addition, open the console (F12 on most machines) and take a screenshot of any errors you might see after reproducing the issue. -->
+
+## Steps to Reproduce
+
+1. Step 1
+2. Step 2
+3. Step 3, etc...
+
+## Expected Behavior
+
+<!-- Describe what you expected to happen. -->
+
+## System Info
+
+- Foundry VTT Version:
+- Delta Green System Version:
+- Access Method: [ ] Browser / [ ] Electron App
+- OS & Browser (if applicable):
+
+## Additional Context
+
+<!-- Optional: Add additional screenshots, logs, or other context here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 50d209e..c624af4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,3 +1,12 @@
+---
+name: Feature request
+about: Suggest a feature or enhancement
+title: Short & descriptive title
+labels: enhancement
+assignees: ''
+
+---
+
 ## What is the feature?
 
 <!-- Describe the feature you'd like to see implemented. -->
@@ -8,4 +17,4 @@
 
 ## Additional Context (Optional)
 
-<!-- Add any extra info, mockups, or related discussion links. -->
+<!-- Add any extra info, mockups, or related links. -->