diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..874e320
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug Report
+about: Something's not working.
+title: ''
+labels: ''
+assignees: 'jethrokuan'
+---
+
+### Description
+
+#### Steps to Reproduce
+<!--
+Example:
+
+1. Load Emacs
+2. Run `org-roam--build-cache-async`
+3. Run `org-roam-find-file`
+...
+-->
+
+
+#### Expected Results
+<!-- Example: File A is there -->
+
+#### Actual Results
+<!-- Example: File A is missing -->
+
+### Versions
+- Emacs (`C-h v emacs-version`): vX.X.X
+- Org-roam commit: https://github.com/jethrokuan/org-roam/commit/commithashhere
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..8c16237
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature Request
+about: Create a feature request to improve Org-roam
+title: ''
+labels: 'enhancement'
+assignees: 'jethrokuan'
+---
+
+### Brief Abstract
+
+### Long Description
+
+### Proposed Implementation (if any)
+
+### Please check the following:
+- [ ] No similar feature requests
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..03c7f5d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1 @@
+###### Motivation for this change
diff --git a/README.md b/README.md
index af163b6..6553638 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ A changelog is being maintained [here](CHANGELOG.md)
 
 To report bugs and suggest new feature use the issue tracker. If you
 have some code which you would like to be merged, then open a pull
-request. Please also see [CONTRIBUTING.md](CONTRIBUTING.md).
+request. Please also see [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 
 ## License