diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9a29321cb..4999f4f71 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,6 +9,8 @@ assignees: ''
 
 **Which addon?**
 <!-- The title of the addon this issue is for. -->
+* Addon name :
+* Addon version : 
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
@@ -20,14 +22,13 @@ assignees: ''
 3. Scroll down to '....'
 4. See error -->
 
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen.-->
+**Full addon log**
+<!-- The full log that appears when starting the addon -->
 
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
+**Full addon config**
+<!-- The addon config in yaml, please remove your passwords-->
 
 **System**
 <!-- Those information can be found under the Supervisor page on the System tab. -->
 * Supervisor version: <!--Your Supervisor Version, eg. 209. -->
 * Host system version: <!--Your Home Assistant (former HASSIO) version, eg. HassOS 3.12 -->
-<!-- When using a beta or development version please also specify them here. -->