diff --git a/.github/COMMIT_GUIDELINES.md b/.github/COMMIT_GUIDELINES.md
new file mode 100644
index 00000000..27ee144a
--- /dev/null
+++ b/.github/COMMIT_GUIDELINES.md
@@ -0,0 +1,25 @@
+# Commit Guidelines
+
+```
+<type><(scope)?>: <msg>
+```
+
+Where type is one of:
+
+```
+build
+chore
+ci
+docs
+feat
+fix
+perf
+refactor
+revert
+style
+test 
+```
+
+And where scope is one of ui-toolkit, my-joy-beta, cloudapi-gql, boilerplate, and create-instance.
+
+*The recommended method to commit should be by running npm run commit.*
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..e8cbe0e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+* **I'm submitting a ... **
+  - [ ] bug report
+  - [ ] feature request
+  - [ ] design request
+
+* **What is the current behavior?**
+
+
+* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem**
+
+
+* **What is the expected behavior?**
+
+
+
+* **What is the motivation / use case for changing the behavior?**
+
+
+
+* **If the current behavior is a bug, please provide your browser**
+
+
+
+* **Other information** 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..d3dfaa8e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,22 @@
+* **Please check if the PR fulfills these requirements**
+- [ ] The commit message follows our [guidelines](https://github.com/yldio/joyent-portal/blob/issue-template/.github/COMMIT_GUIDELINES.md)
+- [ ] Tests for the changes have been added (for bug fixes / features)
+
+
+* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+
+
+
+* **Does this PR close an issue?** (If not please create one)
+
+
+
+* **What is the new behavior (if this is a feature change)?**
+
+
+
+* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
+
+
+
+* **Other information**: