diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 54ce1fa..e69de29 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,45 +0,0 @@
-<!-- READ THIS FIRST:
-  - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
-  DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
--->
-## The problem
-<!--
-  Describe the issue you are experiencing here to communicate to the
-  maintainers. Tell us what you were trying to do and what happened.
--->
-
-
-## Environment
-<!--
-  Provide details about the versions you are using, which helps us to reproduce
-  and find the issue quicker. Version information is of homeassistant found in the
-  Home Assistant frontend: Settings -> About. The installed version of the integration can be found via HACS -> Victron GX modbus TCP
--->
-
-- Home Assistant Core release with the issue:
-- Last working Home Assistant Core release (if known):
-- Integration version causing this issue:
-
-## Problem-relevant `configuration dialog`
-<!--
-  An example configuration that caused the problem for you. Fill this out even
-  if it seems unimportant to you. Please be sure to remove personal information
-  like passwords, private URLs and other credentials. You can provide it as text or as an screenshot.
--->
-
-```yaml
-
-```
-
-
-## Traceback/Error logs
-<!--
-  If you come across any trace or error logs, please provide them.
--->
-
-```txt
-
-```
-
-## Additional information
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..18b475f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,52 @@
+<!-- READ THIS FIRST:
+  - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
+  DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
+-->
+## The problem
+<!--
+  Describe the issue you are experiencing here to communicate to the
+  maintainers. Tell us what you were trying to do and what happened.
+-->
+
+
+## Environment
+<!--
+  Provide details about the versions you are using, which helps us to reproduce
+  and find the issue quicker. Version information is of homeassistant found in the
+  Home Assistant frontend: Settings -> About. The installed version of the integration can be found via HACS -> Victron GX modbus TCP
+-->
+
+- Home Assistant Core release with the issue:
+- Last working Home Assistant Core release (if known):
+- Integration version causing this issue:
+
+## Problem-relevant `configuration dialog`
+<!--
+  An example configuration that caused the problem for you. Fill this out even
+  if it seems unimportant to you. Please be sure to remove personal information
+  like passwords, private URLs and other credentials. You can provide it as text or as an screenshot.
+-->
+
+```yaml
+
+```
+
+## Traceback/Error logs
+<!--
+  Enable debug logging and perform steps to trigger the bug to occur. Download the debug logging and provide it and any other relevant HA core erors logs as an attachment to this issue
+-->
+
+```txt
+
+```
+
+## In case of unit ID issue, missing devices or non-updating devices
+<!--
+  Go to Settings -> Services -> Modbus TCP on your GX device and provide an screenshot of the devices listed under "Available services"
+-->
+
+## Additional information
+
+<!--
+  Any other relevant information for the bug you are experiencing
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/change_request.md b/.github/ISSUE_TEMPLATE/change_request.md
new file mode 100644
index 0000000..c37e521
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/change_request.md
@@ -0,0 +1,28 @@
+---
+name: Change Request
+about: Request an update or change for the integration.
+title: ''
+labels: ''
+assignees: ''
+---
+<!-- IF YOU DO NOT FILL OUT THIS TEMPLATE YOUR ISSUE WILL BE CLOSED -->
+<!-- If you delete the template the issue will be closed and you will be asked to resubmit using the template. -->
+
+<!-- DO NOT OPEN AN ISSUE TO ASK HOW TO SET UP OR CONFIGURE THE INTEGRATION -->
+<!-- READ THE INSTRUCTIONS: -->
+<!-- https://github.com/sfstar/hass-victron/?tab=readme-ov-file#installing-the-integration -->
+
+<!-- Make sure your configuration is correct, switch over your gx device to an wired LAN connection if possible -->
+
+**Describe the current behavior**
+A clear and concise description of what the feature should be.
+
+**What should be updated or changed?**
+A clear and concise description of the proposed new or updated behavior.
+
+**Home Assistant (please complete the following information):**
+ - Home Assistant Core Version:
+ - solaredge-modbus-multi Version:
+
+**Additional context**
+Add any other context about the request here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..e69de29
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..e23df41
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,28 @@
+---
+name: Feature Request
+about: Request a new feature for the integration.
+title: ''
+labels: ''
+assignees: ''
+---
+<!-- IF YOU DO NOT FILL OUT THIS TEMPLATE YOUR ISSUE WILL BE CLOSED -->
+<!-- If you delete the template the issue will be closed and you will be asked to resubmit using the template. -->
+
+<!-- DO NOT OPEN AN ISSUE TO ASK HOW TO SET UP OR CONFIGURE THE INTEGRATION -->
+<!-- READ THE INSTRUCTIONS: -->
+<!-- https://github.com/sfstar/hass-victron/?tab=readme-ov-file#installing-the-integration -->
+
+<!-- Make sure your configuration is correct, switch over your gx device to an wired LAN connection if possible -->
+
+**Describe the feature**
+A clear and concise description of what the feature should be.
+
+**Screenshots**
+If applicable, add screenshots or edits of the proposed feature that help describe it.
+
+**Home Assistant (please complete the following information):**
+ - Home Assistant Core Version:
+ - solaredge-modbus-multi Version:
+
+**Additional context**
+Add any other context about the request here.
\ No newline at end of file