diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 148159ef2..d6a028bab 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,29 +7,34 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
 
 (Before opening an issue, check StrictDoc's 'Troubleshooting' document, which contains solutions to the most common issues.)
 
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## To Reproduce
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+## Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. Linux, macOS, Windows]
- - Browser [e.g. Chrome, Safari]
- - Version [e.g. 22]
+## Environment
+
+ - OS: (e.g. Ubuntu Linux 22.04, macOS 12.6.3 (21G419), Windows 11)
+ - Browser: (e.g. Chrome, Safari)
+ - Version: (e.g. 22)
+
+## Additional context
 
-**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..8d145a9ca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Create a feature request
+title: 'Feature: '
+labels: ''
+assignees: ''
+
+---
+
+<!-- Feel free to complete only the relevant sections and skip the rest. -->
+
+## Description
+
+<!-- Provide a clear and concise description of the feature you want to request. -->
+
+## Problem
+
+<!-- Describe the problem or gap that this feature aims to address. Why is it needed? -->
+
+## Solution
+
+<!-- Suggest a possible solution or feature implementation. -->
+
+## Additional Information
+
+<!-- Add any other relevant details, such as dependencies, related issues, or references to similar features elsewhere. -->
diff --git a/.github/ISSUE_TEMPLATE/general.md b/.github/ISSUE_TEMPLATE/general.md
new file mode 100644
index 000000000..4f0750376
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general.md
@@ -0,0 +1,9 @@
+---
+name: General issue
+about: Create a general issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+