diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 22d94c01e..89e224da6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: You have found a bug? That's great (ok, not that great)! Please help us to improve!
+about: You have found a bug? Does the library not behave as expected? That's great (ok, not that great)! Please help us to improve!
 title: ''
 labels: ''
 assignees: ''
@@ -9,30 +9,45 @@ assignees: ''
 
 <!--
 Please FOLLOW THE ISSUE TEMPLATE unless you have a good reason not to.
-If you have a question or an issue that is not a bug, please use the Q&A section under discussions instead. Thanks!
+If you have a question or an issue that is not a bug,
+please use the Q&A section under discussions instead. Thanks!
 -->
-**Describe the bug**
+
+**Describe the bug or unexpected behaviour**
+
 A clear and concise description of what the bug is.
 
+
 **Steps to reproduce the behavior**
+
 - When i do ...
 - The code below ...
 - Error message: ...
 
-**Code sample**
+
+**Code sample** (if applicable)
+
 ```php
 // your code here
 ```
 
+
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
+
 **Screenshots**
+
 If applicable, add screenshots to help explain your problem.
 
+
 **Environment (please complete the following information):**
- - PHP version/OS: [e.g. 7.4.12, Ubuntu 20.04]
- - Library version: [e.g. 4.3.1]
+
+- PHP version/OS: [e.g. 7.4.12, Ubuntu 20.04]
+- Library version: [e.g. 4.3.1]
+
 
 **Additional context**
+
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/general_issue.md b/.github/ISSUE_TEMPLATE/general_issue.md
index 22f1869f8..48fcdf3be 100644
--- a/.github/ISSUE_TEMPLATE/general_issue.md
+++ b/.github/ISSUE_TEMPLATE/general_issue.md
@@ -9,5 +9,6 @@ assignees: ''
 
 <!--
 Hi, you are trying to open an issue!
-If you have a question or an issue that is not a bug, please use the Q&A section under discussions instead. Thanks!
+If you have a question or an issue that is not a bug,
+please use the Q&A section under discussions instead. Thanks!
 -->