diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 190cd21c..7d9339a0 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,9 +7,11 @@ assignees: qdm12
 
 ---
 
+**Is this urgent?**: No
+
 **Host OS** (approximate answer is fine too): Ubuntu 18
 
-**Is this urgent?**: No
+**CPU arch** or **device name**: amd64
 
 **What VPN provider are you using**:
 
@@ -25,9 +27,7 @@ Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)
 
 That feature doesn't work
 
-**Share your logs...**
-
-...*careful to remove i.e. token information with PIA port forwarding*
+**Share your logs... (careful to remove in example tokens)**
 
 ```log
 
diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md
index 472cae0b..2dfc62fa 100644
--- a/.github/ISSUE_TEMPLATE/help.md
+++ b/.github/ISSUE_TEMPLATE/help.md
@@ -7,9 +7,11 @@ assignees:
 
 ---
 
+**Is this urgent?**: No
+
 **Host OS** (approximate answer is fine too): Ubuntu 18
 
-**Is this urgent?**: No
+**CPU arch** or **device name**: amd64
 
 **What VPN provider are you using**:
 
@@ -23,9 +25,7 @@ Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)
 
 That feature doesn't work
 
-**Share your logs...**
-
-...*careful to remove i.e. token information with PIA port forwarding*
+**Share your logs... (careful to remove in example tokens)**
 
 ```log
 
diff --git a/.github/ISSUE_TEMPLATE/provider.md b/.github/ISSUE_TEMPLATE/provider.md
index 19f9fce6..5d2ffb64 100644
--- a/.github/ISSUE_TEMPLATE/provider.md
+++ b/.github/ISSUE_TEMPLATE/provider.md
@@ -6,9 +6,11 @@ labels: ":bulb: New provider"
 
 ---
 
-1. Name of the provider:
-2. URL to Openvpn configuration files (zip, JSON, etc.):
-3. VPN server side port forwarding documentation, if available:
+One of the following is required:
 
-If 2. is not available, it's not possible to support the provider yet.
-Please instead subscribe to #223
+- Publicly accessible URL to a zip file containing the Openvpn configuration files
+- Publicly accessible URL to a structured (JSON etc.) list of servers **and attach** an example Openvpn configuration file for both TCP and UDP
+- Publicly accessible URL to the list of servers **and attach** an example Openvpn configuration file for both TCP and UDP
+
+If the list of servers requires to login **or** is hidden behind an interactive configurator,
+it's not possible to support the provider yet. Please instead subscribe to issue #223 which would solve it.