diff --git a/.github/ISSUE_TEMPLATE/10-doc-issue.md b/.github/ISSUE_TEMPLATE/10-doc-issue-bug.md
similarity index 82%
rename from .github/ISSUE_TEMPLATE/10-doc-issue.md
rename to .github/ISSUE_TEMPLATE/10-doc-issue-bug.md
index b3f0c84..6341fc5 100644
--- a/.github/ISSUE_TEMPLATE/10-doc-issue.md
+++ b/.github/ISSUE_TEMPLATE/10-doc-issue-bug.md
@@ -1,8 +1,8 @@
 ---
-name: 📚 Documentation issue
-about: Use this template for reporting an issue in the documentation.
+name: 📚 Documentation bug
+about: Use this template for reporting a bug in the documentation.
 title: ''
-labels: 'documentation'
+labels: [documentation, bug]
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/15-doc-issue-enhancements.md b/.github/ISSUE_TEMPLATE/15-doc-issue-enhancements.md
new file mode 100644
index 0000000..6dfdd05
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/15-doc-issue-enhancements.md
@@ -0,0 +1,30 @@
+---
+name: 📚 Documentation enhancements
+about: Use this template for sending an enhancement request for the documentation.
+title: ''
+labels: [documentation, enhancement]
+assignees: ''
+
+---
+
+<!--
+*******************
+PLEASE TAKE CARE!!!
+*******************
+
+This is a syslog-ng documentation related ONLY request.
+
+For creating issue request related to the syslog-ng application, use
+
+https://github.com/syslog-ng/syslog-ng/issues/new/choose
+
+-->
+
+## What section you wish to enhance
+<!-- Which section of the documentation needs enhancement? Please include a link to it, if that is possible. -->
+
+## Description of the problem
+<!-- What would you like to add, do differently, etc. in the documentation? -->
+
+## Proposed solution
+<!-- How would you correct/enhance it? -->
diff --git a/.github/ISSUE_TEMPLATE/20-doc-building-bug-report.md b/.github/ISSUE_TEMPLATE/20-doc-building-bug-report.md
index 8c54f7c..2205435 100644
--- a/.github/ISSUE_TEMPLATE/20-doc-building-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/20-doc-building-bug-report.md
@@ -2,7 +2,7 @@
 name: 📚 Documentation building bug report
 about: Use this template for reporting a bug related to building the documentation.
 title: ''
-labels: bug
+labels: 'bug'
 assignees: ''
 
 ---