diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index d495885b..1c7ddc68 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,12 +7,31 @@ assignees: qdm12
 
 ---
 
-1. What's your OS?
+1. What VPN service provider are you using?
 
-2. What's the version of the program (see at the top of logs)?
+    - [ ] PIA
+    - [ ] Mullvad
+    - [ ] Windscribe
 
-3. How are you running the container? (i.e Docker, Docker Compose, Docker Swarm, Kubernetes, etc.)
+2. What's the version of the program?
+
+    **See the line at the top of your logs**
+
+    `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`
+
+3. What are you using to run the container?
+
+    - [ ] Docker run
+    - [ ] Docker Compose
+    - [ ] Kubernetes
+    - [ ] Docker stack
+    - [ ] Docker swarm
+    - [ ] Podman
+    - [ ] Other:
 
 4. What's wrong? (please share some of your logs, and maybe configuration)
 
 5. Is this urgent?
+
+    - [ ] Yes
+    - [ ] No
diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md
index 883ef413..84de869f 100644
--- a/.github/ISSUE_TEMPLATE/help.md
+++ b/.github/ISSUE_TEMPLATE/help.md
@@ -7,10 +7,31 @@ assignees:
 
 ---
 
-1. What's your OS?
+1. What VPN service provider are you using?
 
-2. What's the version of the program (see at the top of logs)?
+    - [ ] PIA
+    - [ ] Mullvad
+    - [ ] Windscribe
 
-3. How are you running the container? (i.e Docker, Docker Compose, Docker Swarm, Kubernetes, etc.)
+2. What's the version of the program?
 
-4. What is the problem?
+    **See the line at the top of your logs**
+
+    `Running version latest built on 2020-03-13T01:30:06Z (commit d0f678c)`
+
+3. What are you using to run the container?
+
+    - [ ] Docker run
+    - [ ] Docker Compose
+    - [ ] Kubernetes
+    - [ ] Docker stack
+    - [ ] Docker swarm
+    - [ ] Podman
+    - [ ] Other:
+
+4. What's the problem?
+
+5. Is this urgent?
+
+    - [ ] Yes
+    - [ ] No