diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1ed4d7333..4cc2a35f2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,47 +1,47 @@
----
-name: "🐛 Bug report"
-about: Something isn't working correctly with the JavaScript library. This is the wrong place for user-interfaces or openHAB Core issues.
-labels: bug
-
----
-
-<!-- Provide a general summary of the issue in the *Title* above -->
-<!-- If the issue is related to a binding, please include its short name in -->
-<!-- square brackets in the title - Example: "[astro] My issue..." -->
-
-<!-- Important: Please contact the openHAB community forum for questions or -->
-<!-- for configuration and usage guidance: https://community.openhab.org -->
-
-<!-- Feel free to delete any comment lines in the template (starting with "<!--") -->
-
-## Expected Behavior
-<!-- If you're describing a bug, tell us what should happen -->
-<!-- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!-- If describing a bug, tell us what happens instead of the expected behavior -->
-<!-- Include related log information (preferably debug level) and related configs -->
-<!-- Use a file attachment for log and config information longer than a few lines -->
-<!-- Enclose multi-line log/code snippets with ``` on new lines for proper formatting -->
-<!-- If suggesting a change/improvement, explain the difference from current behavior -->
-<!-- For improvements, discuss at community.openhab.org first and include link to topic -->
-
-## Possible Solution
-<!-- Not obligatory, but suggest a fix/reason for the bug, -->
-<!-- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for Bugs)
-<!-- Provide a link to a live example, or an unambiguous set of steps to -->
-<!-- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-
-## Context
-<!-- How has this issue affected you? What are you trying to accomplish? -->
-<!-- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!-- Include as many relevant details about the environment you experienced the bug in -->
-* Version used: (e.g., openHAB and **JS Scripting add-on version**)
-* Environment name and version (e.g. Chrome 76, Java 8, Node.js 12.9, ...):
-* Operating System and version (desktop or mobile, Windows 10, Raspbian Buster, ...):
+---
+name: "🐛 Bug report"
+about: Something isn't working correctly with the JavaScript library. This is the wrong place for user-interfaces or openHAB Core issues.
+labels: bug
+
+---
+
+<!-- Provide a general summary of the issue in the *Title* above -->
+<!-- If the issue is related to a binding, please include its short name in -->
+<!-- square brackets in the title - Example: "[astro] My issue..." -->
+
+<!-- Important: Please contact the openHAB community forum for questions or -->
+<!-- for configuration and usage guidance: https://community.openhab.org -->
+
+<!-- Feel free to delete any comment lines in the template (starting with "<!--") -->
+
+## Expected Behavior
+<!-- If you're describing a bug, tell us what should happen -->
+<!-- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!-- If describing a bug, tell us what happens instead of the expected behavior -->
+<!-- Include related log information (preferably debug level) and related configs -->
+<!-- Use a file attachment for log and config information longer than a few lines -->
+<!-- Enclose multi-line log/code snippets with ``` on new lines for proper formatting -->
+<!-- If suggesting a change/improvement, explain the difference from current behavior -->
+<!-- For improvements, discuss at community.openhab.org first and include link to topic -->
+
+## Possible Solution
+<!-- Not obligatory, but suggest a fix/reason for the bug, -->
+<!-- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for Bugs)
+<!-- Provide a link to a live example, or an unambiguous set of steps to -->
+<!-- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+
+## Context
+<!-- How has this issue affected you? What are you trying to accomplish? -->
+<!-- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!-- Include as many relevant details about the environment you experienced the bug in -->
+* openHAB version used (check Main UI -> About):
+* openhab-js version used (run `console.log('openhab-js ' + utils.OPENHAB_JS_VERSION)` from a JS script):
+* Operating System and version (e.g. desktop or mobile, Windows 10, Raspbian Buster, ...):
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5fb8725dc..17841fb48 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,19 +1,19 @@
----
-name: "✨ Feature request"
-about: You think that the JavaScript library should gain another feature
-labels: enhancement
-
----
-
-<!-- Provide a general summary of the feature request in the *Title* above -->
-<!-- If the feature request is related to an add-on, please include its short name in -->
-<!-- square brackets in the title - Example: "[astro] My feature request..." -->
-
-<!-- Important: Please contact the openHAB community forum for questions or -->
-<!-- for configuration and usage guidance: https://community.openhab.org -->
-
-## Your Environment
-<!-- Include as many relevant details about the environment when applicable -->
-* Version used: (e.g., openHAB and **JS Scripting add-on version**)
-* Environment name and version (e.g. Chrome 76, Java 8, Node.js 12.9, ...):
-* Operating System and version (desktop or mobile, Windows 10, Raspbian Buster, ...):
+---
+name: "✨ Feature request"
+about: You think that the JavaScript library should gain another feature
+labels: enhancement
+
+---
+
+<!-- Provide a general summary of the feature request in the *Title* above -->
+<!-- If the feature request is related to an add-on, please include its short name in -->
+<!-- square brackets in the title - Example: "[astro] My feature request..." -->
+
+<!-- Important: Please contact the openHAB community forum for questions or -->
+<!-- for configuration and usage guidance: https://community.openhab.org -->
+
+## Your Environment
+<!-- Include as many relevant details about the environment you experienced the bug in -->
+* openHAB version used (check Main UI -> About):
+* openhab-js version used (run `console.log('openhab-js ' + utils.OPENHAB_JS_VERSION)` from a JS script):
+* Operating System and version (e.g. desktop or mobile, Windows 10, Raspbian Buster, ...):