diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4de2262..5df85e3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,45 +1,70 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve component
 title: ''
 labels: 'bug'
 assignees: ''
 
 ---
 
-<!-- Before you open a new issue, search through the existing issues to see if others have had the same problem.
+<!-- Please READ THIS FIRST
 
-Issues not containing the minimum requirements will be closed:
+Before opening a new issue, please check if a similar one is already open
 
-- Issues without a description (using the header is not good enough) will be closed.
-- Issues without debug logging will be closed.
-- Issues without configuration will be closed
+DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
+
+Please check if the bug is already reported and add more information there instead of creating a new report.
 
 -->
 
-**Versions**
+**Environment**
+<!--
+If you are not using the newest release, download and try that before opening an issue.
+If you are unsure about the release check the manifest.json file of this component.
+-->
+
+- Home Assistant Core release with the issue:
+- This custom component release with the issue:
+- Last working this custom component release (if known):
+- Operating environment (Home Assistant/Supervisor/Docker/venv):
+
+**Describe the bug**
 <!--
-If you are not using the newest version, download and try that before opening an issue.
-If you are unsure about the version check the manifest.json file of this component.
+  Make a brief description of the problem you are experiencing
 -->
 
-* Version of the Home Assistant:
-* Version of the custom component:
 
-**Configuration**
+**Configuration.yaml**
 ```yaml
 
-Add your configs here.
+Add your configs here if any.
 
 ```
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+**Steps to Reproduce**
+<!--
+  Please list the steps needed to reproduce the issue
+-->
+
+
+**Expected behavior**
+<!--
+  Insert a brief description of the expected behavior is
+-->
+
 
 **Debug log**
-<!-- To enable debug logs check "Troubleshooting" section of README of this component or this https://www.home-assistant.io/components/logger/ -->
+<!--
+  To enable debug logs check "Troubleshooting" section of README of this component
+  or this https://www.home-assistant.io/components/logger/
+-->
 ```text
 
 Add your logs here.
 
 ```
+
+**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
index 36014cd..c2d2583 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,34 @@ assignees: ''
 
 ---
 
+<!-- Please READ THIS FIRST
+
+DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
+
+Always check if there is a similar feature request already do avoid duplicates.
+If there is a similar FR already, please add comments if you have other thoughts about the solution.
+
+-->
+
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+<!--
+  A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+-->
+
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!--
+  A clear and concise description of what you want to happen.
+-->
+
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+<!--
+  A clear and concise description of any alternative solutions or features you've considered.
+-->
+
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!--
+  Add any other context or screenshots about the feature request here.
+-->