diff --git a/.github/ISSUE_TEMPLATE/Device_support_request.yaml b/.github/ISSUE_TEMPLATE/Device_support_request.yaml
new file mode 100644
index 00000000..8d7f31eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Device_support_request.yaml
@@ -0,0 +1,58 @@
+name: Device Support request
+description: Create a issue to support a device which is not currently supported in the zigbee adapter. Unsupported devices are reported as `supported:false` during pairing.
+labels: [devicesupport]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              **IMPORTANT:** Before submitting:             
+              - check whether your [device](https://www.zigbee2mqtt.io/supported-devices/) is listed as supported at zigbee2mqtt.io.
+              - ensure that both the manufacturer and the model match between your device and the listed device. 
+    - type: input
+      id: zigbee_version
+      attributes:
+          label: Tested with adapter version
+          placeholder: '1.10.13'
+      validations:
+          required: true    
+    - type: input
+      id: model_zigbee
+      attributes:
+          label: modelZigbee
+          description: Can be found on the info-panel accessible from the backside of the device tile in the Admin GUI / Zigbee Tab
+          placeholder: 'TS0601'
+      validations:
+          required: true          
+    - type: input
+      id: manufacturer
+      attributes:
+          label: manufacturer
+          description: Can be found on the info-panel accessible from the backside of the device tile in the Admin GUI / Zigbee Tab
+          placeholder: '_TZ3000_upgcbody'
+      validations:
+          required: true          
+    - type: input
+      id: Link_to_device
+      attributes:
+          label: Link to device
+          description: Post the link of the device listing on zigbee2mqtt.io
+          placeholder: 'https://www.zigbee2mqtt.io/supported-devices/'
+      validations:
+          required: false          
+    - type: input
+      id: coordinator_type
+      attributes:
+          label: Coordinator 
+          description: Hardware Coordinator
+          placeholder: Electrolama zig-a-zig-ah! (zzh!), Slaeshs CC2652RB stick, SONOFF Zigbee 3.0 USB Dongle Plus ...
+      validations:
+          required: true                    
+    - type: input
+      id: coordinator_fwversion
+      attributes:
+          label: Coordinator firmware version
+          description: Can be found on the Device tile for the coordinator in the Admin GUI / Zigbee Tab
+          placeholder: '20230921'
+      validations:
+          required: false
+         
diff --git a/.github/ISSUE_TEMPLATE/problem.yaml b/.github/ISSUE_TEMPLATE/problem.yaml
index 48969281..f4616bd0 100644
--- a/.github/ISSUE_TEMPLATE/problem.yaml
+++ b/.github/ISSUE_TEMPLATE/problem.yaml
@@ -1,16 +1,18 @@
 name: Problem
-description: Create a issue
+description: Create a generic issue
 labels: [problem]
 body:
     - type: markdown
       attributes:
           value: |
               **IMPORTANT:** Before submitting:             
-              - check whether your [device](https://www.zigbee2mqtt.io/supported-devices/) is supported 
+              - check whether the issue is linked to a single device or a group of devices
+              - verify that you can recreate the issue by executing a limited number of steps
+              - do **not** use this issue template to request support for new devices.
     - type: textarea
       id: what_problem
       attributes:
-          label: what does not work?
+          label: describe the problem in Detail. What do you expect to happen ? What does happen ?
       validations:
           required: true    
     - type: input
@@ -48,8 +50,8 @@ body:
     - type: textarea
       id: log
       attributes:
-          label: Debug log
-          description: first 50 rows after starting adapter
+          label: Protocol of the error (as text, encapsulated in multiline code tags <>). Separate different occurrances into clearly split log sections
+          description: At least 50 lines from the iobroker protocol, run in INFO mode. Ensure to include a number of lines before and after the actual error message
           placeholder: Click here and drag the file into it or click on "Attach files by.." below
       validations:
           required: false