diff --git a/.github/issue-template.md b/.github/issue-template.md
new file mode 100644
index 000000000..7be34fe6f
--- /dev/null
+++ b/.github/issue-template.md
@@ -0,0 +1,34 @@
+<!--
+Pro-tip: You can leave this block commented, and it still works!
+
+Select the appropriate areas for your issue:
+
+/area API
+/area monitoring
+/area networking
+/area test-and-release
+
+Classify what kind of issue this is:
+
+/kind question
+/kind bug
+/kind cleanup
+/kind doc
+/kind feature
+/kind good-first-issue
+
+-->
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  2.
+  3.
+
+## Additional Info
diff --git a/.github/pull-request-template.md b/.github/pull-request-template.md
new file mode 100644
index 000000000..033ec443c
--- /dev/null
+++ b/.github/pull-request-template.md
@@ -0,0 +1,6 @@
+<!--
+Pro-tip: To automatically close issues when a PR is merged,
+include the following in your PR description:
+
+Fixes: <LINK TO ISSUE>
+-->