diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f1ca65c1..7f112af5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -94,6 +94,10 @@ body:
       label: Hardware interface
       description: the eBUS hardware interface in use
       options:
+        - adapter 5 via USB
+        - adapter 5 via WiFi
+        - adapter 5 via Ethernet
+        - adapter 5 via Raspberry GPIO
         - adapter 3.1 USB
         - adapter 3.1 WiFi
         - adapter 3.1 Ethernet
@@ -103,8 +107,6 @@ body:
         - adapter 3.0 Ethernet
         - adapter 3.0 RPi
         - adapter 2
-        - Esera USB
-        - Esera Ethernet
         - other
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index bc0428a2..f1b1b668 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -8,7 +8,7 @@ body:
     id: description
     attributes:
       label: Description
-      description: A clear and concise description of the requested feature, additional behaviour, different functionality. Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v3/v2 do not belong here! Use the appropriate repository for those.
-      placeholder: e.g. during startup, an error message as described below is reported instead of...
+      description: A clear and concise description of the requested feature, additional behaviour, different functionality. Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v5/v3/v2 do not belong here! Use the appropriate repository for those.
+      placeholder: e.g. add direct integration with xxx...
     validations:
       required: true