diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 820228341..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-name: Bug report
-about: Container is not behaving as expected, please make sure this is docker/transmission related and NOT provider related
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-<!-- **PLEASE READ**
-
-We expect you to look through the links provided in the checklist below
-and investigate your issue before you submit a new one.
-Please elaborate on what you tried before opening this issue.
-
-**If you do not follow the template and show that you have done this, your issue will be closed automatically**
-*Please preview your issue before posting to make sure the template is properly filled in*
--->
-
-## Before creating this issue I have:
-<!-- Put an X (no space) in the boxes to tick them, like this [X], check *Preview Issue* to make sure they are ticked -->
-**REQUIRED**
-- [ ] Read through the pinned issues for related problems
-- [ ] Searched for similar [provider issues][pi] and [container issues][ci]
-- [ ] [Read the documentation][rd], especially the troubleshooting section and FAQ
-- [ ] Tried to add as much relevant information to the issue as possible
-- [ ] Verified I have tried using newest release as well
-- [ ] Agreed that my issue will be closed if I do not follow this template and will remain closed until I complete the template
-
-[pi]: https://github.com/haugene/vpn-configs-contrib/issues
-[ci]: https://github.com/haugene/docker-transmission-openvpn/issues
-[rd]: https://haugene.github.io/docker-transmission-openvpn/
-
-
-### Container version & last working release
-<!-- Please post the version you are using -->
-**Required, problem occurs in :** 
-<!-- Release tag and/or build number --> 
-```<placeholder>```
-
-
-*If possible, last working version:* 
-<!-- Release tag and/or build number --> 
-```<Leave empty if not known>```
-
-### Describe the problem
-<!-- A clear and concise description of what the bug is. -->
-<!-- Check your logs and compare it with the FAQ section of the documentation -->
-
-**REQUIRED**
-```txt
-<placeholder>
-```
-### Describe the steps you have tried to solve the problem
-<!-- A list of steps -->
-<!--
- e.g 1) tried other release/build (which ones?)
-     2) verified container can resolve DNS (added --dns?)
-     3) check .ovpn is valid (outdated?)
-     4) check settings.json is valid (try with clean container?)
-     5) Checked issues #XXX and #XXX and tried XXX
-     6) ...
- -->
-<!-- (please paste into the code block) -->
-
-**REQUIRED**
-```txt
-<-- Paste here -->
-```
-
-### Add your docker run command or docker-compose file or env details
-<!-- To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using Portainer e.g. or other GUI, please export the config to text (Portainer > Inspect containter > Set to Text > Copy Config section) -->
-<!-- (please paste into the code block) -->
-
-**REQUIRED**
-```txt
-<-- Paste here -->
-```
-
-### Logs
-<!-- Provide all logs from the container. By default the should not be any sensitive information there, but if there is then mask it with *** or something similar.
-You can get the logs by running "docker logs <container-name> or download the logs from Portainer".
-Make sure you include all the log-->
-<!-- (please paste into the code block) -->
-<!--This should start with
- e.g 
- Starting container with revision: 6ce64c4f367e509cbf018296e170cd08c0a93319
- Creating TUN device /dev/net/tun -->
- <!-- And end with as below (if not problem occurs earlier)
- e.g.
- Transmission startup script complete.
-2021-02-19 08:41:43 /sbin/ip route add xx.xx.xx.xx/32 via 172.20.10.11
-2021-02-19 08:41:43 /sbin/ip route add 0.0.0.0/1 via xx.xx.xx.xx
-2021-02-19 08:41:43 /sbin/ip route add 128.0.0.0/1 via xx.xx.xx.xx
-2021-02-19 08:41:43 Initialization Sequence Completed
--->
-
-**REQUIRED**
-```txt
-<-- Paste here -->
-```
-
-### Host system
-<!-- Are you running on Ubuntu, a NAS, Raspberry Pi, Mac OS or something else?
-Which version of Docker are you using? -->
-<!-- (please paste into the code block) -->
-
-**REQUIRED**
-```txt
-<-- Paste here -->
-```
-<!-- check *Preview Issue* before submitting -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..d4456e107
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,111 @@
+name: Bug report
+description: Container is not behaving as expected, please make sure this is docker/transmission related and NOT provider related
+labels: [Bug]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there a pinned issue for this?
+    description: Please read the pinned issues to see if they cover your issue first.
+    options:
+    - label: I have read the pinned issues
+      required: true
+- type: checkboxes
+  attributes:
+    label: Is there an existing or similar issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: checkboxes
+  attributes:
+    label: Is there any comment in the documentation for this?
+    description: Please read through the <a href="https://haugene.github.io/docker-transmission-openvpn/">documentation</a> first.
+    options:
+    - label: I have read the documentation, especially the FAQ and Troubleshooting parts
+      required: true
+- type: checkboxes
+  attributes:
+    label: Is this related to a provider? 
+    description: Please check the  <a href="https://github.com/haugene/vpn-configs-contrib/issues/">provider issues repo</a> for this.
+    options:
+    - label: I have checked the provider repo for issues
+      required: true
+- type: checkboxes
+  attributes:
+    label: Are you using the latest release? 
+    description: Please use the latest release.
+    options:
+    - label: I am using the latest release
+      required: true
+- type: checkboxes
+  attributes:
+    label: Have you tried using the dev branch latest?
+    description: Please try using dev branch if possible, if problem does no longer occur, please make a comment of any noticed changes.
+    options:
+    - label: I have tried using dev branch
+      required: false
+- type: textarea
+  attributes:
+    label: Config used
+    description: |
+      Please show what config you are using either with text or screenshots.
+      Make sure to remove your username and password!
+
+      Tip: You can attach images by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: How have you tried to solve the problem?
+    description: Steps taken to try and fix it.
+    placeholder: |
+     1) tried other release/build (which ones?)
+     2) verified container can resolve DNS (added --dns?)
+     3) check .ovpn is valid (outdated?)
+     4) check settings.json is valid (try with clean container?)
+     5) Checked issues #XXX and #XXX and tried XXX
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Log output
+    description: |
+      Please show log output, either text or screenshot
+
+      Tip: You can attach images by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: true    
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      examples:
+        - **OS**: Ubuntu 20.04
+        - **Docker**: 13.14.0
+    value: |
+        - OS:
+        - Docker:
+    render: markdown
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Anything else?
+    description: |
+      Links? References? Anything that will give us more context about the issue you are encountering!
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2ed92d98b..5f9624784 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Requesting new features or changes
+    url: https://github.com/haugene/docker-transmission-openvpn/discussions
+    about: This is the discussion forum, please create a new topic, grouped under "Ideas"
   - name: Requesting new providers/provider specific problems
     url: https://github.com/haugene/vpn-configs-contrib/issues
     about: This is the issue tracker for our backend. Please report issues with specific providers in the provider repo.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 2a9b96948..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-## Before creating this request I have:
-<!-- Put an X (no space) in the boxes to tick them, like this [X], check *Preview Issue* to make sure they are ticked -->
-**REQUIRED**
-- [ ] Read through the pinned issues for related problems
-- [ ] Searched for similar [provider issues][pi] and [container issues][ci]
-- [ ] [Read the documentation][rd], especially the troubleshooting section and FAQ
-- [ ] Tried to add as much relevant information to the request as possible
-- [ ] Agreed that my issue will be closed if I do not follow this template and will remain closed until I complete the template
-
-[pi]: https://github.com/haugene/vpn-configs-contrib/issues
-[ci]: https://github.com/haugene/docker-transmission-openvpn/issues
-[rd]: https://haugene.github.io/docker-transmission-openvpn/
-
-### Is your feature request related to a problem? Please describe.
-<!-- Write inside the code block -->
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-**REQUIRED**
-```txt
-<placeholder>
-```
-
-### Describe the solution you'd like
-<!-- Write inside the code block -->
-<!-- A clear and concise description of what you want to happen. -->
-**REQUIRED**
-```txt
-<placeholder>
-```
-
-### Describe alternatives you've considered
-<!-- Write inside the code block -->
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-**REQUIRED**
-```txt
-<placeholder>
-```
-### Additional context
-<!-- Write inside the code block -->
-<!-- Add any other context or screenshots about the feature request here. -->
-*Optional*
-```txt
-<placeholder for optional>
-```
-<!-- check *Preview Issue* before submitting -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0967edf8c..494c78623 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,8 @@
+<!--
+  Please, vpn provider updates should ONLY be done at the new repo:
+  https://github.com/haugene/vpn-configs-contrib
+  No updates and such will be accepted here
+-->
 <!--
   You are amazing! Thanks for contributing to our project!
   Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
diff --git a/.github/workflows/issue_invalid_action.yml b/.github/workflows/issue_invalid_action.yml
deleted file mode 100644
index 5f436c65f..000000000
--- a/.github/workflows/issue_invalid_action.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-on:
-  issues:
-    types: [opened, edited]
-
-jobs:
-  auto_close_issues:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: "Automatically close issues that don't follow the issue template"
-        uses: pkishino/auto-close-issues@v1.0.7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-close-message: "@${issue.user.login}: hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template.\n If you edit and follow the template properly by filling it in completely the issue will be re-opened" # optional property
-          closed-issues-label: "🙁 Not following issue template" # optional property
diff --git a/transmission/userSetup.sh b/transmission/userSetup.sh
index fcb2eb342..ab4113d24 100644
--- a/transmission/userSetup.sh
+++ b/transmission/userSetup.sh
@@ -19,27 +19,27 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
 
     # Make sure directories exist before chown and chmod
     mkdir -p /config \
-        ${TRANSMISSION_HOME} \
-        ${TRANSMISSION_DOWNLOAD_DIR} \
-        ${TRANSMISSION_INCOMPLETE_DIR} \
-        ${TRANSMISSION_WATCH_DIR}
+        "${TRANSMISSION_HOME}" \
+        "${TRANSMISSION_DOWNLOAD_DIR}" \
+        "${TRANSMISSION_INCOMPLETE_DIR}" \
+        "${TRANSMISSION_WATCH_DIR}"
 
     echo "Enforcing ownership on transmission config directories"
     chown -R ${RUN_AS}:${RUN_AS} \
         /config \
-        ${TRANSMISSION_HOME}
+        "${TRANSMISSION_HOME}"
 
     echo "Applying permissions to transmission config directories"
     chmod -R go=rX,u=rwX \
         /config \
-        ${TRANSMISSION_HOME}
+        "${TRANSMISSION_HOME}"
 
     if [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then
         echo "Setting owner for transmission paths to ${PUID}:${PGID}"
         chown -R ${RUN_AS}:${RUN_AS} \
-            ${TRANSMISSION_DOWNLOAD_DIR} \
-            ${TRANSMISSION_INCOMPLETE_DIR} \
-            ${TRANSMISSION_WATCH_DIR}
+            "${TRANSMISSION_DOWNLOAD_DIR}" \
+            "${TRANSMISSION_INCOMPLETE_DIR}" \
+            "${TRANSMISSION_WATCH_DIR}"
 
         echo "Setting permissions for download and incomplete directories"
         TRANSMISSION_UMASK_OCTAL=$(printf '%03g' $(printf '%o\n' $(jq .umask ${TRANSMISSION_HOME}/settings.json)))
@@ -56,7 +56,7 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
 
         echo "Setting permission for watch directory (775) and its files (664)"
         chmod -R o=rX,ug=rwX \
-            ${TRANSMISSION_WATCH_DIR}
+            "${TRANSMISSION_WATCH_DIR}"
     fi
 fi