diff --git a/.github/ISSUE_TEMPLATE/00-bug-report.md b/.github/ISSUE_TEMPLATE/00-bug-report.md
index e1ea03d..ea8050c 100644
--- a/.github/ISSUE_TEMPLATE/00-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/00-bug-report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Tell us about a problem you are experiencing
 title: ''
 labels: ''
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/20-enhancement-request.md b/.github/ISSUE_TEMPLATE/20-enhancement-request.md
new file mode 100644
index 0000000..5adb599
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/20-enhancement-request.md
@@ -0,0 +1,26 @@
+---
+name: Enhancement request
+about: Suggest an improvement for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Checklist**
+
+- [ ] I searched existing [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue), and did not find a similar enhancement request
+- [ ] This enhancement request is about the VPN setup scripts, and not IPsec VPN itself
+- [ ] I read the [README](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md)
+- [ ] I read the [Important notes](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#important-notes)
+- [ ] I followed instructions to [configure VPN clients](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#next-steps)
+- [ ] I checked [Troubleshooting](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#troubleshooting) and [VPN status](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#check-logs-and-vpn-status)
+
+**Describe the enhancement request**
+A clear and concise description of your enhancement request.
+
+**Is your enhancement request related to a problem? Please describe.**
+(If applicable) A clear and concise description of what the problem is.
+
+**Additional context**
+Add any other context about the enhancement request here.
diff --git a/.github/ISSUE_TEMPLATE/30-enhancement-request-zh.md b/.github/ISSUE_TEMPLATE/30-enhancement-request-zh.md
new file mode 100644
index 0000000..214f0b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/30-enhancement-request-zh.md
@@ -0,0 +1,26 @@
+---
+name: 改进建议
+about: 请使用这个模板来提交改进建议
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**任务列表**
+
+- [ ] 我搜索了已有的 [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue)，没有找到类似的改进建议
+- [ ] 这个改进建议是关于 VPN 安装脚本，而不是 IPsec VPN 本身
+- [ ] 我已阅读 [自述文件](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md)
+- [ ] 我已阅读 [重要提示](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#重要提示)
+- [ ] 我已按照说明 [配置 VPN 客户端](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#下一步)
+- [ ] 我检查了 [故障排除](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#故障排除) 以及 [VPN 状态](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#检查日志及-vpn-状态)
+
+**描述改进建议**
+使用清楚简明的语言描述你的改进建议。
+
+**你的改进建议与遇到的问题有关吗？请描述。**
+（如果适用）清楚，简洁地说明问题所在。
+
+**其它信息**
+添加关于该改进建议的其它信息。