diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000..5bed5f9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,45 @@
+name: Bug
+description: File a bug report
+title: 'Bug: '
+labels: ['bug']
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Provide steps to reproduce the bug, and some context.
+      value: 'A bug happened!'
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of Zipline are you using?
+      options:
+        - upstream
+        - latest
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browser(s) are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+  - type: textarea
+    id: zipline-logs
+    attributes:
+      label: Zipline Logs
+      description: Please copy and paste any relevant log output.
+      render: shell
+  - type: textarea
+    id: browser-logs
+    attributes:
+      label: Browser Logs
+      description: Please copy and paste any relevant log output.
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/suggest.yml b/.github/ISSUE_TEMPLATE/suggest.yml
new file mode 100644
index 0000000..71c893b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/suggest.yml
@@ -0,0 +1,12 @@
+name: Suggestion
+description: Suggest a feature to be added
+title: 'Suggestion: '
+labels: ['suggestion']
+body:
+  - type: textarea
+    id: suggest
+    attributes:
+      label: Suggestion
+      description: Be as descriptive as possible!
+      placeholder: What do you want in Zipline?
+      value: A suggestion