diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000..7beec114
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,31 @@
+name: Bug report
+description: Let us know if you've found a bug in OSMCha
+labels: ["bug"]
+body:
+  - type: textarea
+    id: describe-bug
+    attributes:
+      label: Describe the bug
+      description: Be as clear and concise as you can. Include steps to reproduce the bug if necessary.
+    validations:
+      required: true
+
+  - type: input
+    id: changeset-url
+    attributes:
+      label: Changeset URL
+      description: If this bug happens when viewing a particular changeset, please paste the link to that changeset here
+    
+  - type: input
+    id: environment
+    attributes:
+      label: Environment
+      description: Your browser (including version) and operating system (e.g. "Chrome 137 on macOS")
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional information
+      description: Screenshots, console logs, or any other details that might help us understand the issue (optional)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000..09308e57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,17 @@
+name: Feature request
+description: Suggest a new feature for OSMCha
+labels: [enhancement]
+body:
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: What feature would you like to see added?
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-value
+    attributes:
+      label: Why would this be useful to you or other users?
+    validations:
+      required: true