diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 087926a26..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. import '...'
-2. input '....'
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Source Code**
-If applicable, add source code to help explain your problem.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. Windows,Linux]
- - Python Version [e.g. 2.7, 3.6]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..4739ff162
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Propose a change or an addition
+---
+
+## Detailed description
+<!--- Provide a detailed description of the change or addition you are proposing -->
+
+## Context
+<!--- Why is this change important to you? How would you use it? -->
+<!--- How can it benefit other users? -->
+
+## Possible implementation
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
+
+**Your environment**
+* PyThaiNLP version:
+* Python version:
+* Operating system and version (distro, 32/64-bit):
+* More info (Docker, VM, etc.):
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
new file mode 100644
index 000000000..8d9c1aa05
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -0,0 +1,46 @@
+---
+name: Issue report
+about: Create a report to help us improve
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Description
+<!--- Provide a more detailed introduction to the issue itself. -->
+<!-- Why you consider it to be an issue or a bug. -->
+
+**Expected results**
+<!-- Tell us what should happen. -->
+
+**Current results**
+<!-- Tell us what happens instead. -->
+<!-- You can also put screenshot here. -->
+
+**Possible solution**
+<!-- (Optional) Suggest a fix for the issue,
+or ideas how to implement the change. -->
+
+**Steps to reproduce**
+<!-- Steps to reproduce the behavior. -->
+1.
+2.
+3.
+
+<!-- You can also put a source code here. -->
+```python
+```
+
+## Context
+<!-- How has this issue affected you? -->
+<!-- What are you trying to accomplish? -->
+<!-- Providing context helps us come up with a solution that is most useful in the real world. -->
+
+**Your environment**
+* PyThaiNLP version:
+* Python version:
+* Operating system and version (distro, 32/64-bit):
+* More info (Docker, VM, etc.):
+
+**Files**
+<!-- (Optional) A list of relevant files for this issue. -->
+<!-- This will help people navigate the project and offer some clues of where to start. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 000000000..f549d4dc3
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,19 @@
+### What does this changes
+
+Brief summary of the changes
+
+### What was wrong
+
+Description of what was the root cause of the issue.
+
+### How this fixes it
+
+Description of how the changes fix the issue.
+
+Fixes #...
+
+### Your checklist for this pull request
+🚨Please review the [guidelines for contributing](../CONTRIBUTING.md) to this repository.
+
+- [ ] Passed code styles and structures
+- [ ] Passed code linting checks and unit test
diff --git a/.github/workflows/pythainlp-test.yml b/.github/workflows/pythainlp-test.yml
index 9508d770f..67759bf3d 100644
--- a/.github/workflows/pythainlp-test.yml
+++ b/.github/workflows/pythainlp-test.yml
@@ -21,7 +21,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip pytest wheel flake8
+        python -m pip install --upgrade pip pytest wheel flake8 flake8-commas flake8-comprehensions
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install "h5py>=2.10.0,<3" "tensorflow>=2.3.1,<3"
         pip install torch==1.7.0+cpu -f https://download.pytorch.org/whl/torch_stable.html