diff --git a/.github/ISSUE_TEMPLATE/bug-external.md b/.github/ISSUE_TEMPLATE/bug-external.md
index 4c7f9520..3018aacb 100644
--- a/.github/ISSUE_TEMPLATE/bug-external.md
+++ b/.github/ISSUE_TEMPLATE/bug-external.md
@@ -1,28 +1,32 @@
 ---
 name: 'Bug: communication with an external camera or another software'
-about: Bug that arised when using the software with an external camera or another software
+about: Bug that arises when using the software with an external camera or another software
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-<!--
-The most helpful content you can provide to fix a communication issue between rtsp-simple-server and an external hardware or software, is a dump of the data exchanged between the server and the target (network dump), that can be generated in this way:
-1) Download wireshark (https://www.wireshark.org/)
-2) Start capturing on the interface used for exchanging RTSP (if the server and the target software are both installed on your pc, the interface is probably "loopback", otherwise it's the one of your network card)
-3) Start the server and replicate the issue
-4) Stop capturing, save the result in .pcap format
-5) Attach
--->
-
 ## Which version are you using?
 
 v0.0.0
 
 ## Which operating system are you using?
 
-Windows / Mac / Linux
+<!-- fill checkboxes with a x. Example: [x] Linux -->
+
+OS
+
+- [ ] Linux
+- [ ] Windows
+- [ ] macOS
+
+Architecture
+
+- [ ] amd64
+- [ ] arm64
+- [ ] arm7
+- [ ] arm6
 
 ## Describe the problem
 
@@ -30,4 +34,13 @@ Description
 
 ## Did you attach a network dump?
 
+<!--
+The most helpful content you can provide to fix a communication issue between rtsp-simple-server and an external hardware or software, is a dump of the data exchanged between the server and the target (network dump), that can be generated in this way:
+1) Download wireshark (https://www.wireshark.org/)
+2) Start capturing on the interface used for exchanging RTSP (if the server and the target software are both installed on your pc, the interface is probably "loopback", otherwise it's the one of your network card)
+3) Start the server and replicate the issue
+4) Stop capturing, save the result in .pcap format
+5) Attach
+-->
+
 yes / no
diff --git a/.github/ISSUE_TEMPLATE/bug-generic.md b/.github/ISSUE_TEMPLATE/bug-generic.md
index 30e34610..d9c7171d 100644
--- a/.github/ISSUE_TEMPLATE/bug-generic.md
+++ b/.github/ISSUE_TEMPLATE/bug-generic.md
@@ -13,8 +13,27 @@ v0.0.0
 
 ## Which operating system are you using?
 
-Windows / Mac / Linux
+<!-- fill checkboxes with a x. Example: [x] Linux -->
 
-## Describe the problem
+OS
+
+- [ ] Linux
+- [ ] Windows
+- [ ] macOS
+
+Architecture
+
+- [ ] amd64
+- [ ] arm64
+- [ ] arm7
+- [ ] arm6
+
+## Describe the issue
 
 Description
+
+## Describe how to replicate the issue
+
+1. start the server
+2. publish with ...
+3. read with ...
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index 6eac7a90..634e04c5 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -11,10 +11,6 @@ assignees: ''
 
 v0.0.0
 
-## Which operating system are you using?
-
-Windows / Mac / Linux
-
 ## Enhancement request
 
 Description
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 49a15b70..add65c69 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -11,10 +11,6 @@ assignees: ''
 
 v0.0.0
 
-## Which operating system are you using?
-
-Windows / Mac / Linux
-
 ## Question
 
 Description