diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..28da2ef34
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: /r/Homebrewery Subreddit
+    url: https://www.reddit.com/r/homebrewery
+    about: The Homebrewery community on Reddit!
+  - name: Discord of Many Things
+    url: https://discord.gg/domt
+    about: "Join the conversation in the #formatting channel on DoMT!"
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..6851abb40
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,20 @@
+name: Feature Request
+description: Have an idea to improve the Homebrewery? Let us know!
+labels: ["feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        "We'd love to hear your idea!  Please be sure to [search the current Issues](https://github.com/naturalcrit/homebrewery/issues) for any duplicate requests."
+  - type: textarea
+    id: user-request
+    attributes:
+      label: "Your idea:"
+      description: The best feature requests provide an explanation of the current issue and then an explanation of how it could be improved.  Screenshots/images can be pasted right in as well!
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    options:
+      - label: I have searched the Issues tracker for any duplicate requests and found none.
+        required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/general_issue.yml b/.github/ISSUE_TEMPLATE/general_issue.yml
new file mode 100644
index 000000000..92319ad56
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general_issue.yml
@@ -0,0 +1,54 @@
+name: General Issue
+description: Report an issue unrelated to Saving
+body:
+  - type: markdown
+    attributes:
+      value: Please include as much information as possible.
+  - type: checkboxes
+    id: renderer
+    attributes:
+      label: Renderer
+      description: Which renderer does this issue occur on?  If you are unsure, you can check the renderer in the Properties Editor (click the "i" in the Snippet Menu bar above the editor).
+      options:
+        - label: Legacy
+        - label: v3
+      validations:
+        required: true
+  - type: dropdown
+    id: browser
+    attributes:
+      label: Browser
+      description: Which browser were you using when the issue occurred?
+      options:
+        - label: Chrome
+        - label: Firefox
+        - label: Edge
+        - label: Safari
+        - label: other
+      validations:
+        required: true
+  - type: dropdown
+    id: operating-system
+    attributes:
+      label: Operating System
+      description: Which OS were you using when the issue occurred?
+      options:
+        - label: Windows
+        - label: MacOS
+        - label: Linux
+        - label: other
+      validations:
+        required: true
+  - type: textarea
+    id: user-description
+    attributes:
+      label: "What happened?"
+      description: Please include any steps you took leading up to the issue and if you can reproduce it.  Let us know what you expected to happen, and what did happen.
+    validations:
+      required: true
+  - type: textarea
+    id: code
+    attributes:
+      label: Code
+      description: Paste in any relevant code snippet below.
+      render: gfm
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/save_issue.yml b/.github/ISSUE_TEMPLATE/save_issue.yml
new file mode 100644
index 000000000..09136f0a7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/save_issue.yml
@@ -0,0 +1,25 @@
+name: Saving Issue
+description: Report an issue Saving
+title: "Save Error: "
+labels: ["saving"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Woops, sorry there was an issue Saving.  Please add any detail you can to this report and check back soon!
+  - type: textarea
+    id: error-code
+    attributes:
+      label: Error Code
+      render: shell
+  - type: textarea
+    id: user-description
+    attributes:
+      label: "Your description of what happened:"
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for the report.  Here are some steps that may help in the meantime:
+        1. Refreshing your Google credentials in Homebrewery by signing out, and back in (they expire after one year).
+        2. Waiting a few minutes and trying again - sometimes there is just a momentary blip in the server.
+        3. Check the Issues in Github or the /r/homebrewery subreddit to see if others are experiencing the same issue.
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 773bf8248..19b33f148 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -322,7 +322,7 @@ const EditPage = createClass({
 				<div className='errorContainer'>
 					Looks like there was a problem saving. <br />
 					Report the issue <a target='_blank' rel='noopener noreferrer'
-						href={`https://github.com/naturalcrit/homebrewery/issues/new?body=${encodeURIComponent(errMsg)}`}>
+						href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yaml&error-code=${encodeURIComponent(errMsg)}`}>
 						here
 					</a>.
 				</div>