diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.github/ISSUE_TEMPLATE/questions-help-support.md b/.github/ISSUE_TEMPLATE/questions-help-support.md
new file mode 100644
index 000000000..49dcefbd0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/questions-help-support.md
@@ -0,0 +1,5 @@
+---
+name: "Questions/Help/Support"
+---
+
+Please post questions and support requests in the [GTSAM Google group](https://groups.google.com/forum/#!forum/gtsam-users) and not on Github.
diff --git a/.github/bug-report.md b/.github/bug-report.md
new file mode 100644
index 000000000..9f15b2b7c
--- /dev/null
+++ b/.github/bug-report.md
@@ -0,0 +1,35 @@
+---
+name: "Bug Report"
+about: Submit a bug report to help us improve GTSAM
+---
+
+<!--Please only submit issues/bug reports that come with enough information to reproduce them, ideally a unit test that fails, and possible ideas on what might be wrong. -->
+
+<!-- Even better yet, fix the bug and/or documentation, add a unit test, and create a pull request! -->
+
+<!-- This is a channel to report bugs/issues, not a support channel to help install/use/debug your own code. We'd love to help, but just don't have the bandwidth. Please post questions in the GTSAM Google group (https://groups.google.com/forum/#!forum/gtsam-users) -->
+
+## Description
+
+<!-- A clear description of the bug -->
+
+## Steps to reproduce
+
+1. 
+2.
+
+<!-- If you have a code sample, unit test, error messages, stack traces, etc., please provide it here as well -->
+
+## Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Environment
+
+<!-- Please provide information about your code environment, things such as OS, language of use (C++, Matlab or Python), version of dependent libraries if using a custom build etc., anything to provide us more information. -->
+
+<!-- The more the information, the faster we can help resolve the issue -->
+
+## Additional information
+
+<!-- Add any other infor or context about the problem here. -->
\ No newline at end of file
diff --git a/.github/feature-request.md b/.github/feature-request.md
new file mode 100644
index 000000000..e1e13650a
--- /dev/null
+++ b/.github/feature-request.md
@@ -0,0 +1,24 @@
+---
+name: "Feature Request"
+about: Submit a proposal/request for a new GTSAM feature
+---
+
+## Feature
+
+<!-- A clear and concise description of the feature proposal -->
+
+## Motivation
+
+<!-- Please outline the motivation for the proposal. Is your feature request related to a problem? e.g., I'm always frustrated when [...]. If this is related to another GitHub issue, please link here too. -->
+
+## Pitch
+
+<!-- A clear and concise description of what you want to happen. -->
+
+## Alternatives
+
+<!-- A clear and concise description of any alternative solutions or features you've considered, if any. -->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request here. -->
\ No newline at end of file