Bot Updating Package Versions

2020-05-14 22:13:36 +02:00 · 2020-05-12 12:16:21 +02:00 · 2020-05-11 10:13:35 +00:00 · 2020-05-10 11:13:28 +00:00 · 2020-05-09 13:09:28 +00:00 · 2020-05-07 09:13:54 +00:00
38 changed files with 747 additions and 1611 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,20 +0,0 @@
-# This file is globally distributed to all container image projects from
-# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-# trim_trailing_whitespace may cause unintended issues and should not be globally set true
-trim_trailing_whitespace = false
-
-[{Dockerfile*,**.yml}]
-indent_style = space
-indent_size = 2
-
-[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
-indent_style = space
-indent_size = 4
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,123 +0,0 @@
-# Contributing to qbittorrent
-
-## Gotchas
-
-* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
-* Read, and fill the Pull Request template
-  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
-  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
-
-## Common files
-
-| File | Use case |
-| :----: | --- |
-| `Dockerfile` | Dockerfile used to build amd64 images |
-| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
-| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
-| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
-| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
-| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
-| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
-| `readme-vars.yml` | This file is used to generate the `README.md` |
-
-## Readme
-
-If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/master/readme-vars.yml).
-
-These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
-Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-qbittorrent)
-
-### Fixing typos or clarify the text in the readme
-
-There are variables for multiple parts of the readme, the most common ones are:
-
-| Variable | Description |
-| :----: | --- |
-| `project_blurb` | This is the short excerpt shown above the project logo. |
-| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
-
-### Parameters
-
-The compose and run examples are also generated from these variables.
-
-We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
-
-These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
-Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
-
-Devices, environment variables, ports and volumes expects its variables in a certain way.
-
-### Devices
-
-```yml
-param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
-opt_param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
-```
-
-### Environment variables
-
-```yml
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
-opt_param_env_vars:
-  - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
-```
-
-### Ports
-
-```yml
-param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
-opt_param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
-```
-
-### Volumes
-
-```yml
-param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
-opt_param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
-```
-
-### Testing template changes
-
-After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
-
-## Dockerfiles
-
-We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
-If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
-
-### Testing your changes
-
-```bash
-git clone https://github.com/linuxserver/docker-qbittorrent.git
-cd docker-qbittorrent
-docker build \
-  --no-cache \
-  --pull \
-  -t linuxserver/qbittorrent:latest .
-```
-
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-
-```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
-```
-
-Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
-
-## Update the changelog
-
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/master/root), add an entry to the changelog
-
-```yml
-changelogs:
-  - { date: "DD.MM.YY:", desc: "Added some love to templates" }
-```
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,34 @@
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+------------------------------
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Environment
+**OS:**      
+**CPU architecture:** x86_64/arm32/arm64      
+**How docker service was installed:**      
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Command used to create docker container (run/create/compose/screenshot)
+<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+
+## Docker logs
+<!--- Provide a full docker log, output of "docker logs qbittorrent" -->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,13 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
-    about: Realtime support / chat with the community and the team.
-
-  - name: Discourse discussion forum
-    url: https://discourse.linuxserver.io
-    about: Post on our community forum.
-
-  - name: Documentation
-    url: https://docs.linuxserver.io/images/docker-qbittorrent
-    about: Documentation - information about all of our containers.
--- a/.github/ISSUE_TEMPLATE/issue.bug.yml
+++ b/.github/ISSUE_TEMPLATE/issue.bug.yml
@@ -1,76 +0,0 @@
-# Based on the issue template
-name: Bug report
-description: Create a report to help us improve
-title: "[BUG] <title>"
-labels: [Bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing 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: textarea
-    attributes:
-      label: Current Behavior
-      description: Tell us what happens instead of the expected behavior.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: Tell us what should happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        examples:
-          - **OS**: Ubuntu 20.04
-          - **How docker service was installed**: distro's packagemanager
-      value: |
-        - OS:
-        - How docker service was installed:
-      render: markdown
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: CPU architecture
-      options:
-        - x86-64
-        - arm64
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Docker creation
-      description: |
-        Command used to create docker container
-        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
-      render: bash
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
-      label: Container logs
-      placeholder: |
-        Output of `docker logs linuxserver.io`
-      render: bash
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/issue.feature.yml
+++ b/.github/ISSUE_TEMPLATE/issue.feature.yml
@@ -1,31 +0,0 @@
-# Based on the issue template
-name: Feature request
-description: Suggest an idea for this project
-title: "[FEAT] <title>"
-labels: [enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is this a new feature request?
-      description: Please search to see if a feature request already exists.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Wanted change
-      description: Tell us what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reason for change
-      description: Justify your request, why do you want it, what is the benefit.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Proposed code change
-      description: Do you have a potential code change in mind?
-    validations:
-      required: false
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,11 +2,11 @@

 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
+	

 <!--- Before submitting a pull request please check the following -->

-<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
+<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
 <!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@@ -21,11 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
-
------------------------------
-
-<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
+We welcome all PR’s though this doesn’t guarantee it will be accepted.

 ## Description:
 <!--- Describe your changes in detail -->
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@@ -1,16 +0,0 @@
-name: Issue & PR Tracker
-
-on:
-  issues:
-    types: [opened,reopened,labeled,unlabeled,closed]
-  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
-  pull_request_review:
-    types: [submitted,edited,dismissed]
-
-jobs:
-  manage-project:
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
-    secrets: inherit
--- a/.github/workflows/call_issues_cron.yml
+++ b/.github/workflows/call_issues_cron.yml
@@ -1,13 +0,0 @@
-name: Mark stale issues and pull requests
-on:
-  schedule:
-    - cron:  '29 15 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    permissions:
-      issues: write
-      pull-requests: write
-    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
-    secrets: inherit
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -1,113 +0,0 @@
-name: External Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  external-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
-          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-            && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
-          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"
-            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-qbittorrent/actions/runs/${{ github.run_id }}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
-              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            exit 1
-          fi
-          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
-          image="linuxserver/qbittorrent"
-          tag="latest"
-          token=$(curl -sX GET \
-            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
-            | jq -r '.token')
-            multidigest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
-            digest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
-          image_info=$(curl -sL \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}")
-          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
-            image_info=$(echo $image_info | jq -r '.config')
-          else
-            image_info=$(echo $image_info | jq -r '.container_config')
-          fi
-          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
-          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
-          if [ -z "${IMAGE_VERSION}" ]; then
-            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
-              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            exit 1
-          fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
-          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
-            echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all arch repos are updated yet. Will try again later."
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            echo "**** Sleeping 10 seconds until job starts ****"
-            sleep 10
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
-            curl -iX POST \
-              "${buildurl}submitDescription" \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-              --data-urlencode "Submit=Submit"
-            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-          fi
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -1,45 +0,0 @@
-name: External Trigger Scheduler
-
-on:
-  schedule:
-    - cron:  '42 * * * *'
-  workflow_dispatch:
-
-jobs:
-  external-trigger-scheduler:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-        with:
-          fetch-depth: '0'
-
-      - name: External Trigger Scheduler
-        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
-          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml)
-            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
-            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
-            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/external_trigger.yml/dispatches
-              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
-              fi
-            else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
-            fi
-          done
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -1,13 +0,0 @@
-name: Greetings
-
-on: [pull_request_target, issues]
-
-jobs:
-  greeting:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/first-interaction@v1
-      with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
-            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
-          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=true \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-          echo "**** Sleeping 10 seconds until job starts ****"
-          sleep 10
-          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-          buildurl="${buildurl%$'\r'}"
-          echo "**** Jenkins job build url: ${buildurl} ****"
-          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Attempting to change the Jenkins job description ****"
-          curl -iX POST \
-            "${buildurl}submitDescription" \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -1,50 +0,0 @@
-name: Package Trigger Scheduler
-
-on:
-  schedule:
-    - cron:  '48 6 * * 0'
-  workflow_dispatch:
-
-jobs:
-  package-trigger-scheduler:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-        with:
-          fetch-depth: '0'
-
-      - name: Package Trigger Scheduler
-        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
-          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/jenkins-vars.yml | yq -r '.ls_branch')
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-qbittorrent/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-qbittorrent/actions/workflows/package_trigger.yml/dispatches
-                sleep 30
-              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
-              fi
-            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
-            fi
-          done
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-          echo "**** Notifying Discord ****"
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for qbittorrent** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-qbittorrent/activity/"' \n"}],
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@@ -1,10 +0,0 @@
-name: Permission check
-on:
-  pull_request_target:
-    paths:
-      - '**/run'
-      - '**/finish'
-      - '**/check'
-jobs:
-  permission_check:
-    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,3 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-.jenkins-external
--- a/90
+++ b/90
@@ -1,73 +1,53 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:edge
+FROM lsiobase/ubuntu:bionic

 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
+LABEL maintainer="thelamer"

 # environment settings
-ARG UNRAR_VERSION=6.2.8
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"

-# install runtime packages and qbitorrent-cli
+# add repo and install qbitorrent
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
-  echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
-    p7zip \
-    python3 \
-    qt6-qtbase-sqlite && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
-  fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
-  mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /root/.cache \
-    /tmp/*
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "**** install packages ****" && \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+ fi && \
+ apt-get update && \
+ apt-get install -y \
+	p7zip-full \
+	qbittorrent-cli \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
+	unrar \
+	geoip-bin \
+	unzip && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*

 # add local files
 COPY root/ /

 # ports and volumes
-EXPOSE 8080 6881 6881/udp
-
-VOLUME /config
+EXPOSE 6881 6881/udp 8080
+VOLUME /config /downloads
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,73 +1,53 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
+FROM lsiobase/ubuntu:arm64v8-bionic

 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG QBITTORRENT_VERSION
-ARG QBT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thespad"
+LABEL maintainer="thelamer"

 # environment settings
-ARG UNRAR_VERSION=6.2.8
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"

-# install runtime packages and qbitorrent-cli
+# add repo and install qbitorrent
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base && \
-  echo "**** install packages ****" && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    icu-libs \
-    libstdc++ \
-    openssl \
-    openssl1.1-compat \
-    p7zip \
-    python3 \
-    qt6-qtbase-sqlite && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/bin && \
-  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
-  fi && \
-  apk add -U --upgrade --no-cache \
-    qbittorrent-nox==${QBITTORRENT_VERSION} && \
-  echo "***** install qbitorrent-cli ****" && \
-  mkdir /qbt && \
-  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
-      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-  curl -o \
-    /tmp/qbt.tar.gz -L \
-    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \
-  tar xf \
-    /tmp/qbt.tar.gz -C \
-    /qbt && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /root/.cache \
-    /tmp/*
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "**** install packages ****" && \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+ fi && \
+ apt-get update && \
+ apt-get install -y \
+	p7zip-full \
+	qbittorrent-cli \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
+	unrar \
+	geoip-bin \
+	unzip && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*

 # add local files
 COPY root/ /

 # ports and volumes
-EXPOSE 8080 6881 6881/udp
-
-VOLUME /config
+EXPOSE 6881 6881/udp 8080
+VOLUME /config /downloads
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -0,0 +1,53 @@
+FROM lsiobase/ubuntu:arm32v7-bionic
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG QBITTORRENT_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="thelamer"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/config" \
+XDG_CONFIG_HOME="/config" \
+XDG_DATA_HOME="/config"
+
+# add repo and install qbitorrent
+RUN \
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+ echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+ echo "**** install packages ****" && \
+ if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
+	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+ fi && \
+ apt-get update && \
+ apt-get install -y \
+	p7zip-full \
+	qbittorrent-cli \
+	qbittorrent-nox=${QBITTORRENT_VERSION} \
+	unrar \
+	geoip-bin \
+	unzip && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+# ports and volumes
+EXPOSE 6881 6881/udp 8080
+VOLUME /config /downloads
--- a/672
+++ b/672
@@ -16,7 +16,6 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
    CONTAINER_NAME = 'qbittorrent'
    BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
    LS_USER = 'linuxserver'
@@ -24,10 +23,7 @@ pipeline {
    DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
    DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
    PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
-    DIST_IMAGE = 'alpine'
-    DIST_TAG = 'edge'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-    DIST_REPO_PACKAGES = 'qbittorrent-nox'
+    DIST_IMAGE = 'ubuntu'
    MULTIARCH='true'
    CI='true'
    CI_WEB='true'
@@ -42,16 +38,10 @@ pipeline {
    // Setup all the basic environment variables needed for the build
    stage("Set ENV Variables base"){
      steps{
-        sh '''#! /bin/bash
-              containers=$(docker ps -aq)
-              if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
-              fi
-              docker system prune -af --volumes || : '''
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':unstable 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -65,7 +55,7 @@ pipeline {
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -108,15 +98,14 @@ pipeline {
    /* ########################
       External Release Tagging
       ######################## */
-    // If this is an alpine repo change for external version determine an md5 from the version string
-    stage("Set tag Alpine Repo"){
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: '''curl -sL "${DIST_REPO}x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-                       && awk '/^P:'"${DIST_REPO_PACKAGES}"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
            returnStdout: true).trim()
-            env.RELEASE_LINK = 'alpine_repo'
+            env.RELEASE_LINK = 'custom_command'
        }
      }
    }
@@ -127,76 +116,48 @@ pipeline {
          env.EXT_RELEASE_CLEAN = sh(
            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()
-
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
-          if (semver.find()) {
-            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
-          } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
-            if (semver.find()) {
-              if (semver[0][3]) {
-                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
-              } else if (!semver[0][3] && !semver[0][4]) {
-                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}"
-              }
-            }
-          }
-
-          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
-              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
-            }
-            println("SEMVER: ${env.SEMVER}")
-          } else {
-            println("No SEMVER detected")
-          }
-
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a unstable build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
        script{
          env.IMAGE = env.DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "unstable"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
        script{
          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -209,17 +170,15 @@ pipeline {
      steps {
        script{
          env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@@ -232,29 +191,32 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
        ]) {
          script{
-            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
          }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
+                set -e
+                docker pull lsiodev/spaces-file-upload:latest
                docker run --rm \
-                  -v ${WORKSPACE}:/mnt \
-                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
-                    pip install s3cmd && \
-                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
+                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
+                -e FILE_NAME="shellcheck-result.xml" \
+                -e MIMETYPE="text/xml" \
+                -v ${WORKSPACE}:/mnt \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -t lsiodev/spaces-file-upload:latest \
+                python /upload.py'''
        }
      }
    }
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -264,69 +226,21 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-              # Stage 1 - Jenkinsfile update
-              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-                mkdir -p ${TEMPDIR}/repo
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                git add Jenkinsfile
-                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
-                rm -Rf ${TEMPDIR}
-                exit 0
-              else
-                echo "Jenkinsfile is up to date."
-              fi
-              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
-              for i in ${OLD_TEMPLATES}; do
-                if [[ -f "${i}" ]]; then
-                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
-                fi
-              done
-              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                mkdir -p ${TEMPDIR}/repo
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                for i in ${TEMPLATES_TO_DELETE}; do
-                  git rm "${i}"
-                done
-                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
-                rm -Rf ${TEMPDIR}
-                exit 0
-              else
-                echo "No templates to delete"
-              fi
-              # Stage 3 - Update templates
+              docker pull linuxserver/jenkins-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=unstable -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f unstable
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
                cd ${TEMPDIR}/repo/${LS_REPO}/
-                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  echo ".jenkins-external" >> .gitignore
-                  git add .gitignore
-                fi
-                git add readme-vars.yml ${TEMPLATED_FILES}
+                git add ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -335,36 +249,13 @@ pipeline {
              fi
              mkdir -p ${TEMPDIR}/gitbook
              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                cd ${TEMPDIR}/gitbook/docker-documentation/
                git add images/docker-${CONTAINER_NAME}.md
                git commit -m 'Bot Updating Documentation'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
              fi
-              mkdir -p ${TEMPDIR}/unraid
-              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
-              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
-                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
-                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-              fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
-                cd ${TEMPDIR}/unraid/templates/
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, marking Unraid template as deprecated"
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git add -u unraid/${CONTAINER_NAME}.xml
-                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
-                else
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git add unraid/${CONTAINER_NAME}.xml
-                  git commit -m 'Bot Updating Unraid Template'
-                fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
-              fi
              rm -Rf ${TEMPDIR}'''
        script{
          env.FILES_UPDATED = sh(
@@ -376,7 +267,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -389,26 +280,6 @@ pipeline {
        }
      }
    }
-    // If this is a master build check the S6 service file perms
-    stage("Check S6 Service file Permissions"){
-      when {
-        branch "master"
-        environment name: 'CHANGE_ID', value: ''
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        script{
-          sh '''#! /bin/bash
-            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
-            if [[ -n "${WRONG_PERM}" ]]; then
-              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
-              exit 1
-            else
-              echo "S6 service file perms look good."
-            fi '''
-        }
-      }
-    }
    /* #######################
           GitLab Mirroring
       ####################### */
@@ -429,95 +300,60 @@ pipeline {
             "visibility":"public"}' '''
      } 
    }
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "master"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .uuid' || :)
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/qbittorrent",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-qbittorrent",\
-                       "backendUrl":"https://ghcr.io/linuxserver/qbittorrent",\
-                       "publicUrl":"https://lscr.io/linuxserver/qbittorrent"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
-      } 
-    }
    /* ###############
       Build Container
       ############### */
    // Build Docker container for push to LS Repo
    stage('Build-Single') {
      when {
-        expression {
-          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
-        }
+        environment name: 'MULTIARCH', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Running on node: ${NODE_NAME}"
-        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-        sh "docker buildx build \
-          --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-          --label \"org.opencontainers.image.authors=linuxserver.io\" \
-          --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
-          --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
-          --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
-          --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-          --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-          --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-          --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-          --label \"org.opencontainers.image.title=Qbittorrent\" \
-          --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
-          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
+        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
    stage('Build-Multi') {
      when {
-        allOf {
-          environment name: 'MULTIARCH', value: 'true'
-          expression { params.PACKAGE_CHECK == 'false' }
-        }
+        environment name: 'MULTIARCH', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      parallel {
        stage('Build X86') {
          steps {
-            echo "Running on node: ${NODE_NAME}"
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Qbittorrent\" \
-              --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
-              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+          }
+        }
+        stage('Build ARMHF') {
+          agent {
+            label 'ARMHF'
+          }
+          steps {
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
+              sh '''docker rmi \
+                    ${IMAGE}:arm32v7-${META_TAG} \
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            }
          }
        }
        stage('Build ARM64') {
@@ -525,37 +361,28 @@ pipeline {
            label 'ARM64'
          }
          steps {
-            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Qbittorrent\" \
-              --label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
-              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
+              sh '''docker rmi \
+                    ${IMAGE}:arm64v8-${META_TAG} \
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
            }
-            sh '''#! /bin/bash
-                  containers=$(docker ps -aq)
-                  if [[ -n "${containers}" ]]; then
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
          }
        }
      }
@@ -563,7 +390,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -571,22 +398,27 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ]; then
                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
              fi
-              touch ${TEMPDIR}/package_versions.txt
-              docker run --rm \
-                -v /var/run/docker.sock:/var/run/docker.sock:ro \
-                -v ${TEMPDIR}:/tmp \
-                ghcr.io/anchore/syft:latest \
-                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apk info -v > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              fi
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f unstable
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -610,7 +442,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -624,7 +456,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "master"
+        branch "unstable"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -649,19 +481,20 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
-          string(credentialsId: 'ci-tests-s3-secret-access-key	', variable: 'S3_SECRET')
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
        ]) {
          script{
-            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
-            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
+            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
          }
          sh '''#! /bin/bash
                set -e
-                docker pull ghcr.io/linuxserver/ci:latest
+                docker pull lsiodev/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
                --shm-size=1gb \
@@ -673,14 +506,16 @@ pipeline {
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -t ghcr.io/linuxserver/ci:latest \
-                python3 test_build.py'''
+                -e DO_REGION="ams3" \
+                -e DO_BUCKET="lsio-ci" \
+                -t lsiodev/ci:latest \
+                python /ci/ci.py'''
        }
      }
    }
@@ -711,26 +546,25 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
-                    docker push ${PUSHIMAGE}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:unstable
+                    docker push ${PUSHIMAGE}:unstable
                    docker push ${PUSHIMAGE}:${META_TAG}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
                  done
               '''
          }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:${META_TAG} \
+                  ${DELETEIMAGE}:unstable || :
+                done
+             '''
        }
      }
    }
@@ -758,75 +592,79 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-unstable
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-unstable
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-latest
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker push ${MANIFESTIMAGE}:amd64-unstable
+                    docker push ${MANIFESTIMAGE}:arm32v7-unstable
+                    docker push ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker manifest push --purge ${MANIFESTIMAGE}:unstable || :
+                    docker manifest create ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:amd64-unstable ${MANIFESTIMAGE}:arm32v7-unstable ${MANIFESTIMAGE}:arm64v8-unstable
+                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm32v7-unstable --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm64v8-unstable --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
+                    docker manifest push --purge ${MANIFESTIMAGE}:unstable
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
-                    fi
+                  done
+                  for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
+                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:unstable
+                    docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
+                    docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-unstable
+                    docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-unstable
+                    docker push ${LEGACYIMAGE}:amd64-${META_TAG}
+                    docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
+                    docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
+                    docker push ${LEGACYIMAGE}:unstable
+                    docker push ${LEGACYIMAGE}:${META_TAG}
+                    docker push ${LEGACYIMAGE}:arm32v7-unstable
+                    docker push ${LEGACYIMAGE}:arm64v8-unstable
                  done
               '''
          }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:amd64-${META_TAG} \
+                  ${DELETEIMAGE}:amd64-unstable \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-unstable \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-unstable || :
+                done
+                docker rmi \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             '''
        }
      }
    }
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "unstable"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -834,21 +672,21 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Pushing New tag for current commit ${META_TAG}"
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${META_TAG}'",\
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to unstable",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
-              echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
-              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
-                     "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+                     "target_commitish": "unstable",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
@@ -869,20 +707,14 @@ pipeline {
          ]
        ]) {
          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
+                docker pull lsiodev/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
                  -e DOCKER_REPOSITORY=${IMAGE} \
                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
+                  lsiodev/readme-sync bash -c 'node sync' '''
        }
      }
    }
@@ -890,78 +722,12 @@ pipeline {
    stage('Pull Request Comment') {
      when {
        not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'CI', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh '''#! /bin/bash
-            # Function to retrieve JSON data from URL
-            get_json() {
-              local url="$1"
-              local response=$(curl -s "$url")
-              if [ $? -ne 0 ]; then
-                echo "Failed to retrieve JSON data from $url"
-                return 1
-              fi
-              local json=$(echo "$response" | jq .)
-              if [ $? -ne 0 ]; then
-                echo "Failed to parse JSON data from $url"
-                return 1
-              fi
-              echo "$json"
-            }
-
-            build_table() {
-              local data="$1"
-
-              # Get the keys in the JSON data
-              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
-
-              # Check if keys are empty
-              if [ -z "$keys" ]; then
-                echo "JSON report data does not contain any keys or the report does not exist."
-                return 1
-              fi
-
-              # Build table header
-              local header="| Tag | Passed |\\n| --- | --- |\\n"
-
-              # Loop through the JSON data to build the table rows
-              local rows=""
-              for build in $keys; do
-                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
-                if [ "$status" = "true" ]; then
-                  status="✅"
-                else
-                  status="❌"
-                fi
-                local row="| "$build" | "$status" |\\n"
-                rows="${rows}${row}"
-              done
-
-              local table="${header}${rows}"
-              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
-              echo "$escaped_table"
-            }
-
-            if [[ "${CI}" = "true" ]]; then
-              # Retrieve JSON data from URL
-              data=$(get_json "$CI_JSON_URL")
-              # Create table from JSON data
-              table=$(build_table "$data")
-              echo -e "$table"
-
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
-            else
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
-            fi
-            '''
-
+        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
+        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
      }
    }
  }
@@ -975,26 +741,18 @@ pipeline {
          sh 'echo "build aborted"'
        }
        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
    }
    cleanup {
-      sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
-            containers=$(docker ps -aq)
-            if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
-            fi
-            docker system prune -af --volumes || :
-         '''
      cleanWs()
    }
  }
--- a/README.md
+++ b/README.md
@@ -1,25 +1,21 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md -->
-
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

-[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
-[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
-[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
-[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
-[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
+[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")

 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:

-* regular and timely application updates
-* easy user mappings (PGID, PUID)
-* custom base image with s6 overlay
-* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
-* regular security updates
+ * regular and timely application updates
+ * easy user mappings (PGID, PUID)
+ * custom base image with s6 overlay
+ * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+ * regular security updates

 Find us at:
-
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
@@ -29,16 +25,16 @@ Find us at:

 # [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fqbittorrent?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fqbittorrent)
-[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent)
-[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-qbittorrent/releases)
-[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-qbittorrent/packages)
-[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
-[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/qbittorrent)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/qbittorrent)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-qbittorrent%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fqbittorrent%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/latest/index.html)
+[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-qbittorrent.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-qbittorrent)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-qbittorrent.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-qbittorrent/releases)
+[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-qbittorrent/packages)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-qbittorrent/container_registry)
+[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/qbittorrent)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/qbittorrent.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/qbittorrent)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/qbittorrent)
+[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
+[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/qbittorrent/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/qbittorrent/latest/index.html)

 The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.

@@ -46,32 +42,129 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-

 ## Supported Architectures

-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

-Simply pulling `lscr.io/linuxserver/qbittorrent:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

 The architectures supported by this image are:

-| Architecture | Available | Tag |
-| :----: | :----: | ---- |
-| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ❌ | |
+| Architecture | Tag |
+| :----: | --- |
+| x86-64 | amd64-latest |
+| arm64 | arm64v8-latest |
+| armhf | arm32v7-latest |

 ## Version Tags

-This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.

-| Tag | Available | Description |
-| :----: | :----: |--- |
-| latest | ✅ | Stable qbittorrent releases |
-| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
+| Tag | Description |
+| :----: | --- |
+| latest | Stable qbittorrent releases |
+| unstable | Unstable qbittorrent releases |
+
+## Usage
+
+Here are some example snippets to help you get started creating a container.
+
+### docker
+
+```
+docker create \
+  --name=qbittorrent \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  -e TZ=Europe/London \
+  -e UMASK_SET=022 \
+  -e WEBUI_PORT=8080 \
+  -p 6881:6881 \
+  -p 6881:6881/udp \
+  -p 8080:8080 \
+  -v </path/to/appdata/config>:/config \
+  -v </path/to/downloads>:/downloads \
+  --restart unless-stopped \
+  linuxserver/qbittorrent
+```
+
+
+### docker-compose
+
+Compatible with docker-compose v2 schemas.
+
+```
+---
+version: "2.1"
+services:
+  qbittorrent:
+    image: linuxserver/qbittorrent
+    container_name: qbittorrent
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/London
+      - UMASK_SET=022
+      - WEBUI_PORT=8080
+    volumes:
+      - </path/to/appdata/config>:/config
+      - </path/to/downloads>:/downloads
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - 8080:8080
+    restart: unless-stopped
+```
+
+## Parameters
+
+Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+
+| Parameter | Function |
+| :----: | --- |
+| `-p 6881` | tcp connection port |
+| `-p 6881/udp` | udp connection port |
+| `-p 8080` | http gui |
+| `-e PUID=1000` | for UserID - see below for explanation |
+| `-e PGID=1000` | for GroupID - see below for explanation |
+| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
+| `-e UMASK_SET=022` | for umask setting of qbittorrent, optional , default if left unset is 022 |
+| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
+| `-v /config` | Contains all relevant configuration files. |
+| `-v /downloads` | Location of downloads on disk. |
+
+## Environment variables from files (Docker secrets)
+
+You can set any environment variable from a file by using a special prepend `FILE__`. 
+
+As an example:
+
+```
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
+```
+
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+
+## User / Group Identifiers
+
+When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+
+Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
+
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+
+```
+  $ id username
+    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
+
+
+&nbsp;
 ## Application Setup

 The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  

 Change username/password via the webui in the webui section of settings.  

+
 ### WEBUI_PORT variable

 Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -84,112 +177,18 @@ If you have no webui , check the file /config/qBittorrent/qBittorrent.conf

 edit or add the following lines  

-```text
+```
 WebUI\Address=*

 WebUI\ServerDomains=*
 ```

-If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
-
-## Usage
-
-Here are some example snippets to help you get started creating a container.
-
-### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
-
-```yaml
---
-version: "2.1"
-services:
-  qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:latest
-    container_name: qbittorrent
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-      - WEBUI_PORT=8080
-    volumes:
-      - /path/to/appdata/config:/config
-      - /path/to/downloads:/downloads
-    ports:
-      - 8080:8080
-      - 6881:6881
-      - 6881:6881/udp
-    restart: unless-stopped
-```
-
-### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
-
-```bash
-docker run -d \
-  --name=qbittorrent \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Etc/UTC \
-  -e WEBUI_PORT=8080 \
-  -p 8080:8080 \
-  -p 6881:6881 \
-  -p 6881:6881/udp \
-  -v /path/to/appdata/config:/config \
-  -v /path/to/downloads:/downloads \
-  --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent:latest
-
-```
-
-## Parameters
-
-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
-
-| Parameter | Function |
-| :----: | --- |
-| `-p 8080` | WebUI |
-| `-p 6881` | tcp connection port |
-| `-p 6881/udp` | udp connection port |
-| `-e PUID=1000` | for UserID - see below for explanation |
-| `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
-| `-v /config` | Contains all relevant configuration files. |
-| `-v /downloads` | Location of downloads on disk. |
-
-## Environment variables from files (Docker secrets)
-
-You can set any environment variable from a file by using a special prepend `FILE__`.
-
-As an example:
-
-```bash
-e FILE__PASSWORD=/run/secrets/mysecretpassword
-```
-
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
-
-## Umask for running applications
-
-For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
-Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
-
-## User / Group Identifiers
-
-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
-
-Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
-
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
-
-```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
-```

 ## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27qbittorrent%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.")

-[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=qbittorrent&query=%24.mods%5B%27qbittorrent%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.

-We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.

 ## Support Info

@@ -198,7 +197,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/qbittorrent`

 ## Updating Info

@@ -206,57 +205,48 @@ Most of our images are static, versioned, and require an image update and contai

 Below are the instructions for updating containers:

-### Via Docker Compose
+### Via Docker Run/Create
+* Update the image: `docker pull linuxserver/qbittorrent`
+* Stop the running container: `docker stop qbittorrent`
+* Delete the container: `docker rm qbittorrent`
+* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
+* Start the new container: `docker start qbittorrent`
+* You can also remove the old dangling images: `docker image prune`

+### Via Docker Compose
 * Update all images: `docker-compose pull`
  * or update a single image: `docker-compose pull qbittorrent`
 * Let compose update all containers as necessary: `docker-compose up -d`
  * or update a single container: `docker-compose up -d qbittorrent`
 * You can also remove the old dangling images: `docker image prune`

-### Via Docker Run
-
-* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:latest`
-* Stop the running container: `docker stop qbittorrent`
-* Delete the container: `docker rm qbittorrent`
-* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
-
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
+### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
 * Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
+  ```
  docker run --rm \
  -v /var/run/docker.sock:/var/run/docker.sock \
  containrrr/watchtower \
  --run-once qbittorrent
  ```

+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
+
 * You can also remove the old dangling images: `docker image prune`

-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
-
-### Image Update Notifications - Diun (Docker Image Update Notifier)
-
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
-
 ## Building locally

 If you want to make local modifications to these images for development purposes or just to customize the logic:
-
-```bash
+```
 git clone https://github.com/linuxserver/docker-qbittorrent.git
 cd docker-qbittorrent
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/qbittorrent:latest .
+  -t linuxserver/qbittorrent:latest .
 ```

 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-
-```bash
+```
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```

@@ -264,25 +254,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **17.06.23:** - Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
-* **10.06.23:** - Bump unrar to 6.2.8.
-* **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
-* **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
-* **31.10.22:** - Add libtorrentv1 branch.
-* **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
-* **12.08.22:** - Bump unrar to 6.1.7.
-* **16.06.22:** - Rebase to Alpine 3.16 from edge.
-* **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
-* **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
-* **01.03.22:** - Add python for search plugin support.
-* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
-* **19.02.22:** - Add jq to build-stage
-* **07.01.22:** - Rebase to Alpine, build from source.
-* **06.01.22:** - Deprecate unstable branch.
-* **10.02.21:** - Rebase to focal.
-* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
-* **12.11.20:** - Stop creating /config/data directory on startup
-* **03.04.20:** - Fix adding search engine plugin
+* **31.10.19:** - Adding unstable tag.
 * **02.08.19:** - Add qbitorrent-cli for processing scripts.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -2,11 +2,11 @@

 # jenkins variables
 project_name: docker-qbittorrent
-external_type: alpine_repo
-release_type: stable
-release_tag: latest
-ls_branch: master
-build_armhf: false
+external_type: na
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
+release_type: prerelease
+release_tag: unstable
+ls_branch: unstable
 repo_vars:
  - CONTAINER_NAME = 'qbittorrent'
  - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -15,10 +15,7 @@ repo_vars:
  - DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
-  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = 'edge'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
-  - DIST_REPO_PACKAGES = 'qbittorrent-nox'
+  - DIST_IMAGE = 'ubuntu'
  - MULTIARCH='true'
  - CI='true'
  - CI_WEB='true'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,211 +1,179 @@
-NAME                                                                           VERSION                TYPE   
-7zip                                                                           23.01-r0               apk     
-Alba.CsConsoleFormat                                                           1.0.0                  dotnet  
-BencodeNET                                                                     2.3.0                  dotnet  
-CsvHelper                                                                      12.1.2                 dotnet  
-IPNetwork2                                                                     2.5.235                dotnet  
-McMaster.Extensions.CommandLineUtils                                           2.4.4                  dotnet  
-Microsoft.CSharp                                                               4.4.0                  dotnet  
-Microsoft.NETCore.Platforms                                                    1.1.0                  dotnet  
-Microsoft.NETCore.Targets                                                      1.1.0                  dotnet  
-Microsoft.Win32.Primitives                                                     4.3.0                  dotnet  
-Mono.Posix.NETStandard                                                         1.0.0                  dotnet  
-NETStandard.Library                                                            1.6.1                  dotnet  
-NJsonSchema                                                                    9.14.1                 dotnet  
-Newtonsoft.Json                                                                13.0.1                 dotnet  
-Portable.BouncyCastle                                                          1.8.8                  dotnet  
-Portable.Xaml                                                                  0.18.0                 dotnet  
-QBittorrent.Client                                                             1.8.23016.2            dotnet  
-System.AppContext                                                              4.3.0                  dotnet  
-System.Buffers                                                                 4.3.0                  dotnet  
-System.Collections                                                             4.3.0                  dotnet  
-System.Collections.Concurrent                                                  4.3.0                  dotnet  
-System.Collections.NonGeneric                                                  4.3.0                  dotnet  
-System.Collections.Specialized                                                 4.3.0                  dotnet  
-System.ComponentModel                                                          4.3.0                  dotnet  
-System.ComponentModel.Annotations                                              4.4.1                  dotnet  
-System.ComponentModel.Primitives                                               4.3.0                  dotnet  
-System.ComponentModel.TypeConverter                                            4.3.0                  dotnet  
-System.Console                                                                 4.3.0                  dotnet  
-System.Diagnostics.Debug                                                       4.3.0                  dotnet  
-System.Diagnostics.DiagnosticSource                                            4.3.0                  dotnet  
-System.Diagnostics.Tools                                                       4.3.0                  dotnet  
-System.Diagnostics.Tracing                                                     4.3.0                  dotnet  
-System.Globalization                                                           4.3.0                  dotnet  
-System.Globalization.Calendars                                                 4.3.0                  dotnet  
-System.Globalization.Extensions                                                4.3.0                  dotnet  
-System.IO                                                                      4.3.0                  dotnet  
-System.IO.Compression                                                          4.3.0                  dotnet  
-System.IO.Compression.ZipFile                                                  4.3.0                  dotnet  
-System.IO.FileSystem                                                           4.3.0                  dotnet  
-System.IO.FileSystem.Primitives                                                4.3.0                  dotnet  
-System.Linq                                                                    4.3.0                  dotnet  
-System.Linq.Expressions                                                        4.3.0                  dotnet  
-System.Net.Http                                                                4.3.0                  dotnet  
-System.Net.NameResolution                                                      4.3.0                  dotnet  
-System.Net.Primitives                                                          4.3.0                  dotnet  
-System.Net.Sockets                                                             4.3.0                  dotnet  
-System.ObjectModel                                                             4.3.0                  dotnet  
-System.Private.Uri                                                             4.3.0                  dotnet  
-System.Reflection                                                              4.3.0                  dotnet  
-System.Reflection.Emit                                                         4.3.0                  dotnet  
-System.Reflection.Emit.ILGeneration                                            4.3.0                  dotnet  
-System.Reflection.Emit.Lightweight                                             4.3.0                  dotnet  
-System.Reflection.Extensions                                                   4.3.0                  dotnet  
-System.Reflection.Primitives                                                   4.3.0                  dotnet  
-System.Reflection.TypeExtensions                                               4.4.0                  dotnet  
-System.Resources.ResourceManager                                               4.3.0                  dotnet  
-System.Runtime                                                                 4.3.0                  dotnet  
-System.Runtime.Extensions                                                      4.3.0                  dotnet  
-System.Runtime.Handles                                                         4.3.0                  dotnet  
-System.Runtime.InteropServices                                                 4.3.0                  dotnet  
-System.Runtime.InteropServices.RuntimeInformation                              4.3.0                  dotnet  
-System.Runtime.Numerics                                                        4.3.0                  dotnet  
-System.Runtime.Serialization.Primitives                                        4.3.0                  dotnet  
-System.Security.Claims                                                         4.3.0                  dotnet  
-System.Security.Cryptography.Algorithms                                        4.3.0                  dotnet  
-System.Security.Cryptography.Cng                                               4.3.0                  dotnet  
-System.Security.Cryptography.Csp                                               4.3.0                  dotnet  
-System.Security.Cryptography.Encoding                                          4.3.0                  dotnet  
-System.Security.Cryptography.OpenSsl                                           4.3.0                  dotnet  
-System.Security.Cryptography.Primitives                                        4.3.0                  dotnet  
-System.Security.Cryptography.ProtectedData                                     5.0.0                  dotnet  
-System.Security.Cryptography.X509Certificates                                  4.3.0                  dotnet  
-System.Security.Principal                                                      4.3.0                  dotnet  
-System.Security.Principal.Windows                                              4.3.0                  dotnet  
-System.Text.Encoding                                                           4.3.0                  dotnet  
-System.Text.Encoding.Extensions                                                4.3.0                  dotnet  
-System.Text.RegularExpressions                                                 4.3.0                  dotnet  
-System.Threading                                                               4.3.0                  dotnet  
-System.Threading.Tasks                                                         4.3.0                  dotnet  
-System.Threading.Tasks.Extensions                                              4.3.0                  dotnet  
-System.Threading.ThreadPool                                                    4.3.0                  dotnet  
-System.Threading.Timer                                                         4.3.0                  dotnet  
-System.Xml.ReaderWriter                                                        4.3.0                  dotnet  
-System.Xml.XDocument                                                           4.3.0                  dotnet  
-System.Xml.XmlDocument                                                         4.3.0                  dotnet  
-alpine-baselayout                                                              3.4.3-r1               apk     
-alpine-baselayout-data                                                         3.4.3-r1               apk     
-alpine-keys                                                                    2.4-r1                 apk     
-apk-tools                                                                      2.14.0-r5              apk     
-bash                                                                           5.2.15-r5              apk     
-brotli-libs                                                                    1.0.9-r15              apk     
-busybox                                                                        1.36.1                 binary  
-busybox                                                                        1.36.1-r2              apk     
-busybox-binsh                                                                  1.36.1-r2              apk     
-c-ares                                                                         1.19.1-r1              apk     
-ca-certificates                                                                20230506-r0            apk     
-ca-certificates-bundle                                                         20230506-r0            apk     
-coreutils                                                                      9.3-r7                 apk     
-coreutils-env                                                                  9.3-r7                 apk     
-coreutils-fmt                                                                  9.3-r7                 apk     
-coreutils-sha512sum                                                            9.3-r7                 apk     
-curl                                                                           8.1.2-r2               apk     
-dbus-libs                                                                      1.14.8-r0              apk     
-double-conversion                                                              3.3.0-r0               apk     
-duktape                                                                        2.7.0-r1               apk     
-gdbm                                                                           1.23-r1                apk     
-glib                                                                           2.76.3-r0              apk     
-icu-data-en                                                                    73.2-r1                apk     
-icu-libs                                                                       73.2-r1                apk     
-jq                                                                             1.6-r3                 apk     
-libacl                                                                         2.3.1-r4               apk     
-libattr                                                                        2.5.1-r5               apk     
-libb2                                                                          0.98.1-r3              apk     
-libblkid                                                                       2.39.1-r0              apk     
-libbsd                                                                         0.11.7-r2              apk     
-libbz2                                                                         1.0.8-r6               apk     
-libc-utils                                                                     0.7.2-r5               apk     
-libcrypto1.1                                                                   1.1.1u-r0              apk     
-libcrypto3                                                                     3.1.1-r1               apk     
-libcurl                                                                        8.1.2-r2               apk     
-libexpat                                                                       2.5.0-r2               apk     
-libffi                                                                         3.4.4-r3               apk     
-libgcc                                                                         13.1.1_git20230624-r2  apk     
-libgomp                                                                        13.1.1_git20230624-r2  apk     
-libidn2                                                                        2.3.4-r2               apk     
-libintl                                                                        0.22-r0                apk     
-libmd                                                                          1.1.0-r0               apk     
-libmount                                                                       2.39.1-r0              apk     
-libncursesw                                                                    6.4_p20230625-r0       apk     
-libpanelw                                                                      6.4_p20230625-r0       apk     
-libpcre2-16                                                                    10.42-r1               apk     
-libproc2                                                                       4.0.3-r2               apk     
-libproxy                                                                       0.5.2-r1               apk     
-libssl1.1                                                                      1.1.1u-r0              apk     
-libssl3                                                                        3.1.1-r1               apk     
-libstdc++                                                                      13.1.1_git20230624-r2  apk     
-libtorrent-rasterbar                                                           2.0.9-r0               apk     
-libunistring                                                                   1.1-r2                 apk     
-linux-pam                                                                      1.5.3-r4               apk     
-mpdecimal                                                                      2.5.1-r2               apk     
-musl                                                                           1.2.4-r1               apk     
-musl-utils                                                                     1.2.4-r1               apk     
-ncurses-terminfo-base                                                          6.4_p20230625-r0       apk     
-netcat-openbsd                                                                 1.225-r0               apk     
-nghttp2-libs                                                                   1.54.0-r0              apk     
-oniguruma                                                                      6.9.8-r1               apk     
-openssl                                                                        3.1.1-r1               apk     
-openssl1.1-compat                                                              1.1.1u-r0              apk     
-pcre2                                                                          10.42-r1               apk     
-procps-ng                                                                      4.0.3-r2               apk     
-pyc                                                                            0.1-r0                 apk     
-python                                                                         3.11.4                 binary  
-python3                                                                        3.11.4-r1              apk     
-python3-pyc                                                                    3.11.4-r1              apk     
-python3-pycache-pyc0                                                           3.11.4-r1              apk     
-qbittorrent-nox                                                                4.5.4-r0               apk     
-qt6-qtbase                                                                     6.5.1-r2               apk     
-qt6-qtbase-sqlite                                                              6.5.1-r2               apk     
-readline                                                                       8.2.1-r2               apk     
-runtime.any.System.Collections                                                 4.3.0                  dotnet  
-runtime.any.System.Diagnostics.Tools                                           4.3.0                  dotnet  
-runtime.any.System.Diagnostics.Tracing                                         4.3.0                  dotnet  
-runtime.any.System.Globalization                                               4.3.0                  dotnet  
-runtime.any.System.Globalization.Calendars                                     4.3.0                  dotnet  
-runtime.any.System.IO                                                          4.3.0                  dotnet  
-runtime.any.System.Reflection                                                  4.3.0                  dotnet  
-runtime.any.System.Reflection.Extensions                                       4.3.0                  dotnet  
-runtime.any.System.Reflection.Primitives                                       4.3.0                  dotnet  
-runtime.any.System.Resources.ResourceManager                                   4.3.0                  dotnet  
-runtime.any.System.Runtime                                                     4.3.0                  dotnet  
-runtime.any.System.Runtime.Handles                                             4.3.0                  dotnet  
-runtime.any.System.Runtime.InteropServices                                     4.3.0                  dotnet  
-runtime.any.System.Text.Encoding                                               4.3.0                  dotnet  
-runtime.any.System.Text.Encoding.Extensions                                    4.3.0                  dotnet  
-runtime.any.System.Threading.Tasks                                             4.3.0                  dotnet  
-runtime.any.System.Threading.Timer                                             4.3.0                  dotnet  
-runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl       4.3.0                  dotnet  
-runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.native.System                                                          4.3.0                  dotnet  
-runtime.native.System.IO.Compression                                           4.3.0                  dotnet  
-runtime.native.System.Net.Http                                                 4.3.0                  dotnet  
-runtime.native.System.Security.Cryptography.Apple                              4.3.0                  dotnet  
-runtime.native.System.Security.Cryptography.OpenSsl                            4.3.0                  dotnet  
-runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                  dotnet  
-runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                  dotnet  
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple        4.3.0                  dotnet  
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                  dotnet  
-runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl         4.3.0                  dotnet  
-runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                  dotnet  
-runtime.unix.Microsoft.Win32.Primitives                                        4.3.0                  dotnet  
-runtime.unix.System.Console                                                    4.3.0                  dotnet  
-runtime.unix.System.Diagnostics.Debug                                          4.3.0                  dotnet  
-runtime.unix.System.IO.FileSystem                                              4.3.0                  dotnet  
-runtime.unix.System.Net.Primitives                                             4.3.0                  dotnet  
-runtime.unix.System.Net.Sockets                                                4.3.0                  dotnet  
-runtime.unix.System.Private.Uri                                                4.3.0                  dotnet  
-runtime.unix.System.Runtime.Extensions                                         4.3.0                  dotnet  
-scanelf                                                                        1.3.7-r2               apk     
-shadow                                                                         4.13-r6                apk     
-skalibs                                                                        2.13.1.1-r2            apk     
-sqlite-libs                                                                    3.42.0-r2              apk     
-ssl_client                                                                     1.36.1-r2              apk     
-tzdata                                                                         2023c-r1               apk     
-utmps-libs                                                                     0.1.2.1-r2             apk     
-xz-libs                                                                        5.4.3-r1               apk     
-zlib                                                                           1.2.13-r2              apk     
-zstd-libs                                                                      1.5.5-r5               apk     
+adduser3.116ubuntu1
+apt1.6.12
+apt-utils1.6.12
+base-files10.1ubuntu2.8
+base-passwd3.5.44
+bash4.4.18-2ubuntu1.2
+bsdutils1:2.31.1-0.4ubuntu3.6
+bzip21.0.6-8.1ubuntu0.2
+ca-certificates20180409
+coreutils8.28-1ubuntu1
+curl7.58.0-2ubuntu3.8
+dash0.5.8-2.10
+dbus1.12.2-1ubuntu1.1
+debconf1.5.66ubuntu1
+debianutils4.8.4
+diffutils1:3.6-1
+dirmngr2.2.4-1ubuntu1.2
+dpkg1.19.0.5ubuntu2.3
+e2fsprogs1.44.1-1ubuntu1.3
+fdisk2.31.1-0.4ubuntu3.6
+file1:5.32-2ubuntu0.4
+findutils4.6.0+git+20170828-2
+gcc-8-base8.4.0-1ubuntu1~18.04
+geoip-bin1.6.12-1
+geoip-database20180315-1
+gnupg2.2.4-1ubuntu1.2
+gnupg-l10n2.2.4-1ubuntu1.2
+gnupg-utils2.2.4-1ubuntu1.2
+gpg2.2.4-1ubuntu1.2
+gpg-agent2.2.4-1ubuntu1.2
+gpgconf2.2.4-1ubuntu1.2
+gpgsm2.2.4-1ubuntu1.2
+gpgv2.2.4-1ubuntu1.2
+gpg-wks-client2.2.4-1ubuntu1.2
+gpg-wks-server2.2.4-1ubuntu1.2
+grep3.1-2build1
+gzip1.6-5ubuntu1
+hostname3.20
+init-system-helpers1.51
+krb5-locales1.16-2ubuntu0.1
+libacl12.2.52-3build1
+libapparmor12.12-4ubuntu5.1
+libapt-inst2.01.6.12
+libapt-pkg5.01.6.12
+libasn1-8-heimdal7.5.0+dfsg-1
+libassuan02.5.1-2
+libattr11:2.4.47-2build1
+libaudit11:2.8.2-1ubuntu1
+libaudit-common1:2.8.2-1ubuntu1
+libblkid12.31.1-0.4ubuntu3.6
+libboost-system1.65.11.65.1+dfsg-0ubuntu5
+libbz2-1.01.0.6-8.1ubuntu0.2
+libc62.27-3ubuntu1
+libcap-ng00.7.7-3.1
+libc-bin2.27-3ubuntu1
+libcom-err21.44.1-1ubuntu1.3
+libcurl47.58.0-2ubuntu3.8
+libdb5.35.3.28-13.1ubuntu1.1
+libdbus-1-31.12.2-1ubuntu1.1
+libdebconfclient00.213ubuntu1
+libdouble-conversion12.0.1-4ubuntu1
+libexpat12.2.5-3ubuntu0.2
+libext2fs21.44.1-1ubuntu1.3
+libfdisk12.31.1-0.4ubuntu3.6
+libffi63.2.1-8
+libgcc11:8.4.0-1ubuntu1~18.04
+libgcrypt201.8.1-4ubuntu1.2
+libgeoip11.6.12-1
+libglib2.0-02.56.4-0ubuntu0.18.04.6
+libglib2.0-data2.56.4-0ubuntu0.18.04.6
+libgmp102:6.1.2+dfsg-2
+libgnutls303.5.18-1ubuntu1.3
+libgpg-error01.27-6
+libgssapi3-heimdal7.5.0+dfsg-1
+libgssapi-krb5-21.16-2ubuntu0.1
+libhcrypto4-heimdal7.5.0+dfsg-1
+libheimbase1-heimdal7.5.0+dfsg-1
+libheimntlm0-heimdal7.5.0+dfsg-1
+libhogweed43.4-1
+libhx509-5-heimdal7.5.0+dfsg-1
+libicu6060.2-3ubuntu3.1
+libidn2-02.0.4-1.1ubuntu0.2
+libk5crypto31.16-2ubuntu0.1
+libkeyutils11.5.9-9.2ubuntu2
+libkrb5-26-heimdal7.5.0+dfsg-1
+libkrb5-31.16-2ubuntu0.1
+libkrb5support01.16-2ubuntu0.1
+libksba81.3.5-2
+libldap-2.4-22.4.45+dfsg-1ubuntu1.5
+libldap-common2.4.45+dfsg-1ubuntu1.5
+liblz4-10.0~r131-2ubuntu3
+liblzma55.2.2-1.3
+libmagic11:5.32-2ubuntu0.4
+libmagic-mgc1:5.32-2ubuntu0.4
+libmount12.31.1-0.4ubuntu3.6
+libncurses56.1-1ubuntu1.18.04
+libncursesw56.1-1ubuntu1.18.04
+libnettle63.4-1
+libnghttp2-141.30.0-1ubuntu1
+libnpth01.5-3
+libp11-kit00.23.9-2
+libpam0g1.1.8-3.6ubuntu2.18.04.1
+libpam-modules1.1.8-3.6ubuntu2.18.04.1
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.1
+libpam-runtime1.1.8-3.6ubuntu2.18.04.1
+libpcre32:8.39-9
+libprocps62:3.3.12-3ubuntu1.2
+libpsl50.19.1-5build1
+libpython2.7-minimal2.7.17-1~18.04ubuntu1
+libpython2.7-stdlib2.7.17-1~18.04ubuntu1
+libpython-stdlib2.7.15~rc1-1
+libqt5core5a5.9.5+dfsg-0ubuntu2.5
+libqt5dbus55.9.5+dfsg-0ubuntu2.5
+libqt5network55.9.5+dfsg-0ubuntu2.5
+libqt5xml55.9.5+dfsg-0ubuntu2.5
+libreadline77.0-3
+libroken18-heimdal7.5.0+dfsg-1
+librtmp12.4+20151223.gitfa8646d.1-1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libseccomp22.4.1-0ubuntu0.18.04.2
+libselinux12.7-2build2
+libsemanage12.7-2build2
+libsemanage-common2.7-2build2
+libsepol12.7-1
+libsmartcols12.31.1-0.4ubuntu3.6
+libsqlite3-03.22.0-1ubuntu0.3
+libss21.44.1-1ubuntu1.3
+libssl1.0.01.0.2n-1ubuntu5.3
+libssl1.11.1.1-1ubuntu2.1~18.04.5
+libstdc++68.4.0-1ubuntu1~18.04
+libsystemd0237-3ubuntu10.40
+libtasn1-64.13-2
+libtinfo56.1-1ubuntu1.18.04
+libtorrent-rasterbar101.2.6+git20200425.a9968916ca-1ppa1~18.04
+libudev1237-3ubuntu10.40
+libunistring20.9.9-0ubuntu2
+libuuid12.31.1-0.4ubuntu3.6
+libwind0-heimdal7.5.0+dfsg-1
+libxml22.9.4+dfsg1-6.1ubuntu1.3
+libzstd11.3.3+dfsg-2ubuntu1.1
+locales2.27-3ubuntu1
+login1:4.5-1ubuntu2
+lsb-base9.20170808ubuntu1
+mawk1.3.3-17ubuntu3
+mime-support3.60ubuntu1
+mount2.31.1-0.4ubuntu3.6
+ncurses-base6.1-1ubuntu1.18.04
+ncurses-bin6.1-1ubuntu1.18.04
+openssl1.1.1-1ubuntu2.1~18.04.5
+p7zip16.02+dfsg-6
+p7zip-full16.02+dfsg-6
+passwd1:4.5-1ubuntu2
+perl-base5.26.1-6ubuntu0.3
+pinentry-curses1.1.0-1
+procps2:3.3.12-3ubuntu1.2
+publicsuffix20180223.1310-1
+python2.7.15~rc1-1
+python2.72.7.17-1~18.04ubuntu1
+python2.7-minimal2.7.17-1~18.04ubuntu1
+python-minimal2.7.15~rc1-1
+qbittorrent-cli1.5.19350-1
+qbittorrent-nox4.3.0~202005141437-6985-5470ae8~ubuntu18.04.1
+qttranslations5-l10n5.9.5-0ubuntu1
+readline-common7.0-3
+sed4.4-2
+sensible-utils0.0.12
+shared-mime-info1.9-2
+sysvinit-utils2.88dsf-59.10ubuntu1
+tar1.29b-2ubuntu0.1
+tzdata2019c-0ubuntu0.18.04
+ubuntu-keyring2018.09.18.1~18.04.0
+unrar1:5.5.8-1
+unzip6.0-21ubuntu1
+util-linux2.31.1-0.4ubuntu3.6
+xdg-user-dirs0.17-1ubuntu1
+xz-utils5.2.2-1.3
+zlib1g1:1.2.11.dfsg-0ubuntu2
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -11,28 +11,30 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}

 # development version
 development_versions: true
 development_versions_items:
  - { tag: "latest", desc: "Stable qbittorrent releases" }
-  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }  
+  - { tag: "unstable", desc: "Unstable qbittorrent releases" }

 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
-  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/downloads", vol_host_path: "</path/to/downloads>", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
  - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
+  - { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
 param_usage_include_env: true
 param_env_vars:
  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
+  - { env_var: "UMASK_SET", env_value: "022", desc: "for umask setting of qbittorrent, optional , default if left unset is 022"}
  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}

 # optional parameters
@@ -46,6 +48,7 @@ app_setup_block: |
  
  Change username/password via the webui in the webui section of settings.  

+
  ### WEBUI_PORT variable
  
  Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -58,35 +61,15 @@ app_setup_block: |
  
  edit or add the following lines  

-  ```text
+  ```
  WebUI\Address=*
  
  WebUI\ServerDomains=*
  ```
-  
-  If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)

 # changelog
 changelogs:
-  - { date: "17.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
-  - { date: "10.06.23:", desc: "Bump unrar to 6.2.8." }
-  - { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
-  - { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
-  - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
-  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
-  - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
-  - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
-  - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
-  - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
-  - { date: "01.03.22:", desc: "Add python for search plugin support." }
-  - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
-  - { date: "19.02.22:", desc: "Add jq to build-stage" }
-  - { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
-  - { date: "06.01.22:", desc: "Deprecate unstable branch." }
-  - { date: "10.02.21:", desc: "Rebase to focal." }
-  - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
-  - { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
-  - { date: "03.04.20:", desc: "Fix adding search engine plugin" }
+  - { date: "31.10.19:", desc: "Adding unstable tag." }
  - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p \
+	/config/qBittorrent \
+	/config/data
+
+# copy config
+[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
+	cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
+
+# chown download directory if currently set to root
+if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+	chown -R abc:abc /downloads
+fi
+
+# permissions
+chown -R abc:abc \
+	/config
--- a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent-config
--- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/dependencies.d/init-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/dependencies.d/init-config
--- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
@@ -1,21 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# make our folder
-mkdir -p /config/qBittorrent
-
-# copy default config
-if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
-    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-fi
-
-# chown download directory if currently not set to abc
-if [[ -d /downloads ]]; then
-    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
-        lsiown -R abc:abc /downloads
-    fi
-fi
-
-# permissions
-lsiown -R abc:abc \
-    /config
--- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type
@@ -1 +0,0 @@
-oneshot
--- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
--- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-services
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-services
--- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd
@@ -1 +0,0 @@
-3
--- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-WEBUI_PORT=${WEBUI_PORT:-8080}
-
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
-        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
--- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
@@ -1 +0,0 @@
-longrun
--- a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent-config
+++ b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent-config
--- a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-qbittorrent
+++ b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-qbittorrent
--- a/root/etc/services.d/qbittorrent/run
+++ b/root/etc/services.d/qbittorrent/run
@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+UMASK_SET=${UMASK_SET:-022}
+WEBUI_PORT=${WEBUI_PORT:-8080}
+
+umask "$UMASK_SET"
+
+exec \
+	s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
--- a/root/usr/bin/qbt
+++ b/root/usr/bin/qbt
@@ -1,14 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# qbt bash wrapper to prompt user when trying to save password
-if [[ "$@" == "settings set password" ]]; then
-  echo "Setting password is not supported"
-  echo "Please use --ask-for-password or --password"
-elif [[ "$@" == "settings set"* ]]; then
-  /qbt/qbt "$@"
-elif [[ "$@" != *"--ask-for-password"* ]] && [[ "$@" != *"--password"* ]];then
-  echo "Please use --ask-for-password or --password and ensure username/url are set"
-  /qbt/qbt "$@"
-else
-  /qbt/qbt "$@"
-fi
Author	SHA1	Message	Date
LinuxServer-CI	fb7edd7cd8	Bot Updating Package Versions	2020-05-14 22:13:36 +02:00
LinuxServer-CI	cb5d2a4722	Bot Updating Package Versions	2020-05-12 12:16:21 +02:00
LinuxServer-CI	7e7b414276	Bot Updating Package Versions	2020-05-11 10:13:35 +00:00
LinuxServer-CI	c227b217b2	Bot Updating Package Versions	2020-05-10 11:13:28 +00:00
LinuxServer-CI	7d2018ab1b	Bot Updating Package Versions	2020-05-09 13:09:28 +00:00
LinuxServer-CI	45f7d2f776	Bot Updating Package Versions	2020-05-07 09:13:54 +00:00
LinuxServer-CI	b97c9b8621	Bot Updating Package Versions	2020-05-06 10:15:05 +00:00
LinuxServer-CI	ca0667734d	Bot Updating Package Versions	2020-05-05 11:09:25 +02:00
LinuxServer-CI	1cc1832bde	Bot Updating Package Versions	2020-05-04 09:09:06 +00:00
LinuxServer-CI	2b92095233	Bot Updating Package Versions	2020-05-03 07:13:16 -04:00
LinuxServer-CI	4a4f41809c	Bot Updating Package Versions	2020-05-02 09:09:14 -04:00
LinuxServer-CI	9219e8fce5	Bot Updating Package Versions	2020-05-01 09:14:23 +00:00
LinuxServer-CI	304045fa76	Bot Updating Package Versions	2020-04-30 09:09:37 +00:00
LinuxServer-CI	df557ace64	Bot Updating Package Versions	2020-04-29 09:08:33 +00:00
LinuxServer-CI	379a1c9dd6	Bot Updating Package Versions	2020-04-28 22:18:01 +02:00
LinuxServer-CI	3d2af511b9	Bot Updating Templated Files	2020-04-28 09:05:00 +00:00
LinuxServer-CI	29213a7f55	Bot Updating Package Versions	2020-04-27 13:08:56 +02:00
LinuxServer-CI	67b56af21e	Bot Updating Package Versions	2020-04-25 08:13:42 -04:00
LinuxServer-CI	3de432ecd9	Bot Updating Package Versions	2020-04-24 07:43:30 -04:00
LinuxServer-CI	3a2a0f6a64	Bot Updating Package Versions	2020-04-23 02:14:02 -04:00
LinuxServer-CI	cfe29d7bea	Bot Updating Package Versions	2020-04-22 08:14:45 +01:00
LinuxServer-CI	9ec6cb8041	Bot Updating Package Versions	2020-04-21 07:13:32 +01:00
LinuxServer-CI	4076cf5ec5	Bot Updating Package Versions	2020-04-20 07:15:08 +01:00
LinuxServer-CI	d50c109e59	Bot Updating Package Versions	2020-04-19 07:13:11 +01:00
LinuxServer-CI	8afc2aab34	Bot Updating Package Versions	2020-04-18 07:15:39 +01:00
LinuxServer-CI	939def454a	Bot Updating Package Versions	2020-04-17 07:14:40 +01:00
LinuxServer-CI	c86f294259	Bot Updating Package Versions	2020-04-15 02:08:40 -04:00
LinuxServer-CI	3615b6d989	Bot Updating Package Versions	2020-04-13 13:13:09 +01:00
LinuxServer-CI	93fab38db4	Bot Updating Package Versions	2020-04-12 12:13:33 +00:00
LinuxServer-CI	083f5184e8	Bot Updating Package Versions	2020-04-11 08:09:22 -04:00
LinuxServer-CI	6fce866995	Bot Updating Package Versions	2020-04-10 13:13:05 +01:00
LinuxServer-CI	67a21bc3ae	Bot Updating Package Versions	2020-04-09 14:12:32 +02:00
LinuxServer-CI	1700fd0597	Bot Updating Package Versions	2020-04-08 09:09:54 +00:00
LinuxServer-CI	dcf3c900c6	Bot Updating Templated Files	2020-04-08 05:05:35 -04:00
LinuxServer-CI	7ea39a799d	Bot Updating Package Versions	2020-04-07 11:15:04 +01:00
LinuxServer-CI	c07ea919fe	Bot Updating Package Versions	2020-04-06 11:13:13 +02:00
LinuxServer-CI	8050b258c9	Bot Updating Package Versions	2020-04-05 11:10:17 +00:00
LinuxServer-CI	623687cd2b	Bot Updating Package Versions	2020-04-04 10:14:18 +02:00
LinuxServer-CI	fd5e88ff3a	Bot Updating Package Versions	2020-04-03 13:13:36 +02:00
LinuxServer-CI	c485ce2fbd	Bot Updating Package Versions	2020-04-02 17:15:11 +02:00
LinuxServer-CI	71118d855d	Bot Updating Package Versions	2020-03-31 17:08:13 -04:00
LinuxServer-CI	51a3cf9dee	Bot Updating Package Versions	2020-03-30 07:19:50 +00:00
LinuxServer-CI	207f13fc7a	Bot Updating Package Versions	2020-03-29 11:12:27 +00:00
LinuxServer-CI	5de828fded	Bot Updating Package Versions	2020-03-28 08:12:44 +00:00
LinuxServer-CI	137e2b5d6a	Bot Updating Package Versions	2020-03-27 07:18:59 +00:00
LinuxServer-CI	f0853cfabb	Bot Updating Package Versions	2020-03-26 03:18:34 -04:00
LinuxServer-CI	a5a7eb8d02	Bot Updating Package Versions	2020-03-25 04:14:16 +00:00
LinuxServer-CI	dc0f91c473	Bot Updating Package Versions	2020-03-23 20:10:23 +01:00
LinuxServer-CI	d28675bbf6	Bot Updating Package Versions	2020-03-22 11:08:10 -04:00
LinuxServer-CI	111caa6a1f	Bot Updating Package Versions	2020-03-21 08:19:55 +00:00
LinuxServer-CI	69f2f66043	Bot Updating Package Versions	2020-03-19 11:08:15 +00:00
LinuxServer-CI	fd812496bc	Bot Updating Package Versions	2020-03-17 07:08:09 +00:00
LinuxServer-CI	c5612f816e	Bot Updating Package Versions	2020-03-13 16:43:50 -04:00
LinuxServer-CI	8607efc1fe	Bot Updating Package Versions	2020-03-10 11:08:12 +00:00
LinuxServer-CI	88af8b5693	Bot Updating Package Versions	2020-03-09 07:13:53 -04:00
LinuxServer-CI	f514a71654	Bot Updating Package Versions	2020-03-08 07:19:15 -04:00
LinuxServer-CI	4ea94c9d1f	Bot Updating Package Versions	2020-03-07 11:11:04 +00:00
LinuxServer-CI	c604390868	Bot Updating Package Versions	2020-03-06 11:13:30 +00:00
LinuxServer-CI	838278894d	Bot Updating Package Versions	2020-03-04 20:08:08 +00:00
LinuxServer-CI	68bb38cc68	Bot Updating Package Versions	2020-03-03 19:10:17 +00:00
LinuxServer-CI	04f35bbc4d	Bot Updating Package Versions	2020-03-01 20:13:00 +00:00
LinuxServer-CI	b3b097ebdc	Bot Updating Package Versions	2020-02-28 07:18:34 -05:00
LinuxServer-CI	557b443175	Bot Updating Package Versions	2020-02-27 12:13:15 +00:00
LinuxServer-CI	49376cb514	Bot Updating Package Versions	2020-02-25 10:12:08 +00:00
LinuxServer-CI	15d7379386	Bot Updating Package Versions	2020-02-24 08:12:46 +00:00
LinuxServer-CI	2656893674	Bot Updating Package Versions	2020-02-22 07:08:43 -05:00
LinuxServer-CI	a5af0b35b7	Bot Updating Package Versions	2020-02-21 07:14:39 -05:00
LinuxServer-CI	b50b3d2897	Bot Updating Package Versions	2020-02-19 11:10:47 +00:00
LinuxServer-CI	a8c929c4fe	Bot Updating Package Versions	2020-02-18 11:15:01 +00:00
LinuxServer-CI	e53c5dd330	Bot Updating Package Versions	2020-02-17 06:09:09 -05:00
LinuxServer-CI	49b3a91ab0	Bot Updating Package Versions	2020-02-16 05:14:22 -05:00
LinuxServer-CI	cf2e5b4ab0	Bot Updating Package Versions	2020-02-14 05:08:57 -05:00
LinuxServer-CI	f12ca4a394	Bot Updating Package Versions	2020-02-13 05:08:22 -05:00
LinuxServer-CI	57646b7af5	Bot Updating Package Versions	2020-02-12 10:12:52 +00:00
LinuxServer-CI	f6e5aa9f1e	Bot Updating Package Versions	2020-02-11 10:09:23 +00:00
LinuxServer-CI	5c01f3dd4f	Bot Updating Package Versions	2020-02-08 19:08:55 +00:00
LinuxServer-CI	1ab20ab07e	Bot Updating Package Versions	2020-02-07 06:10:59 -05:00
LinuxServer-CI	71c9d26288	Bot Updating Package Versions	2020-01-31 19:14:05 +00:00
LinuxServer-CI	b027f732cd	Bot Updating Package Versions	2020-01-30 12:10:30 +00:00
LinuxServer-CI	136bfc0cc5	Bot Updating Package Versions	2020-01-28 19:08:29 -05:00
LinuxServer-CI	f0658171c5	Bot Updating Package Versions	2020-01-24 20:12:48 +01:00
LinuxServer-CI	d9ff314a4c	Bot Updating Package Versions	2020-01-22 06:08:58 +00:00
LinuxServer-CI	48695f300e	Bot Updating Package Versions	2020-01-20 01:13:28 -05:00
LinuxServer-CI	156684155f	Bot Updating Package Versions	2020-01-17 07:10:37 -05:00
LinuxServer-CI	8cb1690973	Bot Updating Package Versions	2020-01-16 06:09:28 +00:00
LinuxServer-CI	e90c67b867	Bot Updating Package Versions	2020-01-14 11:10:31 +00:00
LinuxServer-CI	5291380ad2	Bot Updating Package Versions	2020-01-13 01:13:18 -05:00
LinuxServer-CI	55acda7d6c	Bot Updating Package Versions	2020-01-12 05:54:07 +00:00
LinuxServer-CI	ac6e13960e	Bot Updating Package Versions	2020-01-11 00:12:38 -05:00
LinuxServer-CI	fa775fbd67	Bot Updating Package Versions	2020-01-09 06:08:34 +00:00
LinuxServer-CI	4068b58145	Bot Updating Package Versions	2020-01-08 01:10:34 -05:00
LinuxServer-CI	6bd6406f99	Bot Updating Package Versions	2020-01-06 19:09:42 -05:00
LinuxServer-CI	6be6f5e72b	Bot Updating Package Versions	2020-01-02 13:11:44 -05:00
LinuxServer-CI	345081f5d9	Bot Updating Package Versions	2019-12-28 13:12:39 -05:00
LinuxServer-CI	89a246f79f	Bot Updating Package Versions	2019-12-27 22:08:18 +00:00
LinuxServer-CI	f6f793f551	Bot Updating Package Versions	2019-12-26 17:12:04 +00:00
LinuxServer-CI	60e14150ca	Bot Updating Package Versions	2019-12-25 22:12:03 -05:00
LinuxServer-CI	db0de95ceb	Bot Updating Package Versions	2019-12-24 12:09:36 -05:00
LinuxServer-CI	b8711fd5bb	Bot Updating Package Versions	2019-12-23 18:10:19 +00:00
LinuxServer-CI	22df5852db	Bot Updating Package Versions	2019-12-20 00:12:50 -05:00
LinuxServer-CI	cd897f4a50	Bot Updating Package Versions	2019-12-19 08:46:39 +00:00
LinuxServer-CI	c1a23eda66	Bot Updating Package Versions	2019-12-17 05:12:10 +00:00
LinuxServer-CI	0d2c39dd04	Bot Updating Package Versions	2019-12-13 11:09:56 +00:00
LinuxServer-CI	9d3259cbdf	Bot Updating Package Versions	2019-12-12 12:10:04 +01:00
LinuxServer-CI	034e9f1d68	Bot Updating Package Versions	2019-12-11 11:10:13 +00:00
LinuxServer-CI	924b3a2402	Bot Updating Package Versions	2019-12-10 06:10:36 -05:00
LinuxServer-CI	c53014eac3	Bot Updating Package Versions	2019-12-08 19:20:11 +00:00
LinuxServer-CI	0613934e6b	Bot Updating Package Versions	2019-12-06 06:10:37 -05:00
LinuxServer-CI	40d19347c3	Bot Updating Package Versions	2019-12-05 10:12:20 +00:00
LinuxServer-CI	47d58f9e4d	Bot Updating Package Versions	2019-12-04 05:11:41 -05:00
LinuxServer-CI	ece00294b1	Bot Updating Package Versions	2019-12-03 08:08:34 -05:00
LinuxServer-CI	5c8677d600	Bot Updating Package Versions	2019-12-02 05:15:18 -05:00
LinuxServer-CI	788d8fb753	Bot Updating Package Versions	2019-11-30 05:10:01 +01:00
LinuxServer-CI	c7e7c1c222	Bot Updating Package Versions	2019-11-27 17:19:39 -05:00
LinuxServer-CI	634fcd0f7d	Bot Updating Templated Files	2019-11-27 17:05:09 -05:00
LinuxServer-CI	8f0acdeb52	Bot Updating Package Versions	2019-11-23 10:10:17 +00:00
LinuxServer-CI	e7f77f2ffc	Bot Updating Package Versions	2019-11-21 17:08:14 -05:00
LinuxServer-CI	44fe098e99	Bot Updating Package Versions	2019-11-20 23:15:21 +01:00
LinuxServer-CI	9a220e3eee	Bot Updating Package Versions	2019-11-18 16:09:38 -05:00
LinuxServer-CI	ad31b8c925	Bot Updating Package Versions	2019-11-15 08:12:27 +00:00
LinuxServer-CI	cb7a875129	Bot Updating Package Versions	2019-11-14 08:09:02 +00:00
LinuxServer-CI	cc700c5af2	Bot Updating Package Versions	2019-11-13 02:49:18 +01:00
LinuxServer-CI	fa140d452d	Bot Updating Package Versions	2019-11-12 03:08:33 +00:00
LinuxServer-CI	02fe01a63a	Bot Updating Package Versions	2019-11-11 02:09:05 +01:00
LinuxServer-CI	d9b8488135	Bot Updating Package Versions	2019-11-09 08:08:54 +00:00
LinuxServer-CI	20b308df2c	Bot Updating Package Versions	2019-11-05 03:13:46 -05:00
LinuxServer-CI	419f0ae428	Bot Updating Package Versions	2019-11-04 20:12:38 +00:00
j0nnymoe	8766fd9a5c	#55 adding unstable tag (#57 ) #55 adding unstable tag	2019-11-04 20:08:01 +00:00
thelamer	60da66b714	adding unstable logic	2019-10-31 13:59:24 -07:00
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run`