diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000000000000000000000000000000000..208a8e72a9f1622351a09385c82126743df2cf75
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,19 @@
+<!-- You can erase any parts of this template not applicable to your issue. -->
+
+### Description
+
+[Description of the bug or feature]
+
+## Steps to Reproduce the Problem
+
+  1.
+  2.
+
+**Expected behavior:** [What you expected to happen]
+
+**Actual behavior:** [What actually happened]
+
+## Specifications
+
+  - Version:  (You can get this information from executing `ogs --version`)
+  - Platform: (Operating System)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000000000000000000000000000000000..e59148f39b9b4263ae66f9ba9e12fb033a369d14
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,6 @@
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+Fixes # <!-- you may add issues here to automatically close them -->
+
+1. [ ] Tests covering your feature were added?
+2. [ ] Any new feature or behavior change was documented?