Bot Updating Package Versions

2025-04-20 06:53:51 +00:00 · 2025-04-13 06:53:41 +00:00 · 2025-04-06 06:55:31 +00:00 · 2025-03-30 06:53:31 +00:00 · 2025-03-23 06:53:52 +00:00 · 2025-03-16 06:52:54 +00:00
14 changed files with 302 additions and 416 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@
 * 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)
+* 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://linuxserver.io/discord)
 ## Common files
@@ -24,7 +24,7 @@
 ## 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/libtorrentv1/readme-vars.yml).
+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)
@@ -115,7 +115,7 @@ 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/libtorrentv1/root), add an entry to 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:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
+    url: https://linuxserver.io/discord
    about: Realtime support / chat with the community and the team.
  - name: Discourse discussion forum
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@
 ------------------------------
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] 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
 ------------------------------
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -4,31 +4,40 @@ on:
  workflow_dispatch:
 jobs:
-  external-trigger-libtorrentv1:
+  external-trigger-master:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4.1.1
      - name: External Trigger
-        if: github.ref == 'refs/heads/libtorrentv1'
+        if: github.ref == 'refs/heads/master'
        env:
          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
          printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^qbittorrent_libtorrentv1" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          if grep -q "^qbittorrent_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
          elif grep -q "^qbittorrent_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of libtorrentv1 branch. To disable this trigger, add \`qbittorrent_libtorrentv1\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of master branch. To disable this trigger, add \`qbittorrent_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)')
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
+            && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
          echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
          if grep -q "^qbittorrent_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve external version for qbittorrent branch libtorrentv1"
+            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"}],
@@ -39,7 +48,7 @@ jobs:
          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
          image="linuxserver/qbittorrent"
-          tag="libtorrentv1"
+          tag="latest"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
            | jq -r '.token')
@@ -85,7 +94,7 @@ jobs:
          if [ -z "${IMAGE_VERSION}" ]; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag libtorrentv1"
+            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 }}
@@ -95,14 +104,21 @@ jobs:
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          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" >> $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" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
            if [[ "${artifacts_found}" == "false" ]]; then
              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag libtorrentv1 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              FAILURE_REASON="New version ${EXT_RELEASE} for qbittorrent tag latest is detected, however not all artifacts are uploaded to upstream release 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 }}
@@ -113,7 +129,7 @@ jobs:
                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
              fi
              response=$(curl -iX POST \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/buildWithParameters?PACKAGE_CHECK=false \
+                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'})" >> $GITHUB_STEP_SUMMARY
              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -128,7 +144,7 @@ jobs:
                --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 libtorrentv1. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              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 }}
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -9,5 +9,5 @@ jobs:
    - 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/libtorrentv1/.github/PULL_REQUEST_TEMPLATE.md)!'
+        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/15
+++ b/15
@@ -2,7 +2,7 @@
 FROM ghcr.io/linuxserver/unrar:latest AS unrar
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:edge
 # set version label
 ARG BUILD_DATE
@@ -20,21 +20,18 @@ XDG_DATA_HOME="/config"
 # install runtime packages and qbitorrent-cli
 RUN \
  echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
+  apk add --no-cache \
    grep \
    icu-libs \
    p7zip \
    python3 \
    qt6-qtbase-sqlite && \
  echo "**** install qbittorrent ****" && \
  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
+    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
-  curl -o \
+  apk add -U --upgrade --no-cache \
-    /app/qbittorrent-nox -L \
+    qbittorrent-nox==${QBITTORRENT_VERSION} && \
    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/x86_64-qbittorrent-nox" && \
  chmod +x /app/qbittorrent-nox && \
  echo "***** install qbitorrent-cli ****" && \
  mkdir /qbt && \
  if [ -z ${QBT_CLI_VERSION+x} ]; then \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -2,7 +2,7 @@
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 # set version label
 ARG BUILD_DATE
@@ -20,21 +20,18 @@ XDG_DATA_HOME="/config"
 # install runtime packages and qbitorrent-cli
 RUN \
  echo "**** install packages ****" && \
-  apk add -U --update --no-cache \
+  apk add --no-cache \
    grep \
    icu-libs \
    p7zip \
    python3 \
    qt6-qtbase-sqlite && \
  echo "**** install qbittorrent ****" && \
  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-    jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
+    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
-  curl -o \
+  apk add -U --upgrade --no-cache \
-    /app/qbittorrent-nox -L \
+    qbittorrent-nox==${QBITTORRENT_VERSION} && \
    "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/aarch64-qbittorrent-nox" && \
  chmod +x /app/qbittorrent-nox && \
  echo "***** install qbitorrent-cli ****" && \
  mkdir /qbt && \
  if [ -z ${QBT_CLI_VERSION+x} ]; then \
--- a/165
+++ b/165
@@ -27,6 +27,9 @@ pipeline {
    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'
    MULTIARCH='true'
    CI='true'
    CI_WEB='true'
@@ -56,15 +59,27 @@ pipeline {
      steps{
        echo "Running on node: ${NODE_NAME}"
        sh '''#! /bin/bash
-              containers=$(docker ps -aq)
+              echo "Pruning builder"
              docker builder prune -f --builder container || :
              containers=$(docker ps -q)
              if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
+                BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
                for container in ${containers}; do
                  if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
                    echo "skipping buildx container in docker stop"
                  else
                    echo "Stopping container ${container}"
                    docker stop ${container}
                  fi
                done
              fi
-              docker system prune -af --volumes || : '''
+              docker system prune -f --volumes || :
              docker image prune -af || :
           '''
        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}:libtorrentv1 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            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' || : ''',
            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' ''',
@@ -93,7 +108,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 libtorrentv1-${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -126,14 +141,15 @@ pipeline {
    /* ########################
       External Release Tagging
       ######################## */
-    // If this is a custom command to determine version use that command
+    // If this is an alpine repo change for external version determine an md5 from the version string
-    stage("Set tag custom bash"){
+    stage("Set tag Alpine Repo"){
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)' ''',
+            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://' ''',
            returnStdout: true).trim()
-            env.RELEASE_LINK = 'custom_command'
+            env.RELEASE_LINK = 'alpine_repo'
        }
      }
    }
@@ -171,10 +187,10 @@ pipeline {
        }
      }
    }
-    // If this is a libtorrentv1 build use live docker endpoints
+    // If this is a master build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -184,13 +200,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            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 = 'libtorrentv1-' + 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 = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
@@ -198,7 +214,7 @@ pipeline {
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "libtorrentv1"}
+        not {branch "master"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -208,13 +224,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-libtorrentv1-' + 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 + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
-            env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            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 = 'libtorrentv1-' + 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 = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
@@ -232,13 +248,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-libtorrentv1-' + 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 + '-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
          } else {
-            env.CI_TAGS = 'libtorrentv1-' + 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 + '-dev-' + env.COMMIT_SHA + '-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 = 'libtorrentv1-' + 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 = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          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/'
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
@@ -276,7 +292,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -288,24 +304,24 @@ pipeline {
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
              # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch libtorrentv1 of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-              git clone --branch libtorrentv1 --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
              echo "Starting 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 libtorrentv1
+                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 pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -324,13 +340,13 @@ pipeline {
                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 libtorrentv1
+                git checkout -f master
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -345,20 +361,20 @@ pipeline {
                sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
              fi
              mkdir -p ${TEMPDIR}/d2
-              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:libtorrentv1
+              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
              ls -al ${TEMPDIR}/d2
-              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-libtorrentv1.d2\\")" readme-vars.yml
+              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
              if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
                echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
                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 libtorrentv1
+                git checkout -f master
                cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
                git add readme-vars.yml
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -375,7 +391,7 @@ pipeline {
                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 libtorrentv1
+                git checkout -f master
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -388,8 +404,8 @@ pipeline {
                fi
                git add readme-vars.yml ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -490,7 +506,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -503,10 +519,10 @@ pipeline {
        }
      }
    }
-    // If this is a libtorrentv1 build check the S6 service file perms
+    // If this is a master build check the S6 service file perms
    stage("Check S6 Service file Permissions"){
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -741,7 +757,8 @@ pipeline {
                  if [[ -n "${containers}" ]]; then
                    docker stop ${containers}
                  fi
-                  docker system prune -af --volumes || :
+                  docker system prune -f --volumes || :
                  docker image prune -af || :
               '''
          }
        }
@@ -750,7 +767,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -773,14 +790,14 @@ pipeline {
              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 libtorrentv1
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git libtorrentv1
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -798,7 +815,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -812,7 +829,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -866,7 +883,7 @@ pipeline {
                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                -e TAGS=\"${CI_TAGS}\" \
                -e META_TAG=\"${META_TAG}\" \
-                -e RELEASE_TAG=\"libtorrentv1\" \
+                -e RELEASE_TAG=\"latest\" \
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
@@ -903,7 +920,7 @@ pipeline {
                          CACHEIMAGE=${i}
                      fi
                  done
-                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:libtorrentv1 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
                  if [ -n "${SEMVER}" ]; then
                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
                  fi
@@ -930,15 +947,15 @@ pipeline {
                          CACHEIMAGE=${i}
                      fi
                  done
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-libtorrentv1 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-libtorrentv1 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                  if [ -n "${SEMVER}" ]; then
                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                  fi
                done
                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:amd64-libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
@@ -953,7 +970,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -965,17 +982,17 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to libtorrentv1",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
-              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
+              echo "Updating external repo packages to ${EXT_RELEASE_CLEAN}" > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "libtorrentv1",\
+                     "target_commitish": "master",\
                     "name": "'${META_TAG}'",\
                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": true}' >> releasebody.json
+              printf '","draft": false,"prerelease": false}' >> 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'''
      }
@@ -983,14 +1000,14 @@ pipeline {
    // Add protection to the release branch
    stage('Github-Release-Branch-Protection') {
      when {
-        branch "libtorrentv1"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Setting up protection for release branch libtorrentv1"
+        echo "Setting up protection for release branch master"
        sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/libtorrentv1/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
          -d $(jq -c .  << EOF
            {
              "required_status_checks": null,
@@ -1152,12 +1169,22 @@ EOF
    }
    cleanup {
      sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
+            echo "Pruning builder!!"
-            containers=$(docker ps -aq)
+            docker builder prune -f --builder container || :
            containers=$(docker ps -q)
            if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
+              BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
              for container in ${containers}; do
                if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
                  echo "skipping buildx container in docker stop"
                else
                  echo "Stopping container ${container}"
                  docker stop ${container}
                fi
              done
            fi
-            docker system prune -af --volumes || :
+            docker system prune -f --volumes || :
            docker image prune -af || :
         '''
      cleanWs()
    }
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/CONTRIBUTING.md -->
+<!-- Please read 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.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "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.")
@@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 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.
+* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -36,8 +36,8 @@ Find us at:
 [![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%2Flibtorrentv1%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/)
+[![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%2Flibtorrentv1%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/libtorrentv1/index.html)
+[![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)
 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.
@@ -47,7 +47,7 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
-Simply pulling `lscr.io/linuxserver/qbittorrent:libtorrentv1` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+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.
 The architectures supported by this image are:
@@ -78,7 +78,7 @@ If you are running a very old (3.x) kernel you may run into [this issue](https:/
 Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
-For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
+For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
 ### TORRENTING_PORT
@@ -90,6 +90,10 @@ Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:68
 This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
 ## Non-Root Operation
 This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
 ## Usage
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -103,7 +107,7 @@ To help you get started creating a container from this image you can either use
 ---
 services:
  qbittorrent:
-    image: lscr.io/linuxserver/qbittorrent:libtorrentv1
+    image: lscr.io/linuxserver/qbittorrent:latest
    container_name: qbittorrent
    environment:
      - PUID=1000
@@ -137,7 +141,7 @@ docker run -d \
  -v /path/to/qbittorrent/appdata:/config \
  -v /path/to/downloads:/downloads `#optional` \
  --restart unless-stopped \
-  lscr.io/linuxserver/qbittorrent:libtorrentv1
+  lscr.io/linuxserver/qbittorrent:latest
 ```
 ## Parameters
@@ -157,6 +161,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /downloads` | Location of downloads on disk. |
 | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
 | `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 ## Environment variables from files (Docker secrets)
@@ -222,7 +227,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:libtorrentv1
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest
    ```
 ## Updating Info
@@ -270,7 +275,7 @@ Below are the instructions for updating containers:
 * Update the image:
    ```bash
-    docker pull lscr.io/linuxserver/qbittorrent:libtorrentv1
+    docker pull lscr.io/linuxserver/qbittorrent:latest
    ```
 * Stop the running container:
@@ -307,7 +312,7 @@ cd docker-qbittorrent
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/qbittorrent:libtorrentv1 .
+  -t lscr.io/linuxserver/qbittorrent:latest .
 ```
 The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
@@ -321,19 +326,18 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
 * **17.07.24:** - Restore qbittorrent-cli as it now supports openssl 3.
-* **25.05.24:** - Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
+* **25.05.24:** - Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
 * **14.02.24:** - Only set/override torrenting port if the optional env var is set.
 * **14.02.24:** - Add torrenting port support.
-* **31.01.24:** - Rebase to Alpine 3.19.
+* **31.01.24:** - Remove obsolete compat packages.
 * **25.12.23:** - Only pull stable releases of qbittorrent-cli.
 * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.
-* **17.06.23:** - Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
+* **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.
-* **25.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
+* **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
-* **15.01.23:** - Rebase to Alpine 3.17, add openssl1.1-compat.
+* **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
-* **29.11.22:** - Add icu-libs to support qbittorrent-cli.
+* **31.10.22:** - Add libtorrentv1 branch.
 * **30.10.22:** - Add libtorrent v1 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.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -2,11 +2,10 @@
 # jenkins variables
 project_name: docker-qbittorrent
-external_type: na
+external_type: alpine_repo
-custom_version_command: "curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'"
+release_type: stable
-release_type: prerelease
+release_tag: latest
-release_tag: libtorrentv1
+ls_branch: master
 ls_branch: libtorrentv1
 repo_vars:
  - CONTAINER_NAME = 'qbittorrent'
  - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
@@ -16,6 +15,9 @@ repo_vars:
  - 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'
  - MULTIARCH='true'
  - CI='true'
  - CI_WEB='true'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,260 +1,99 @@
-NAME                                               VERSION                                                                                  TYPE     
+NAME                                                      VERSION           TYPE     
-7zip                                               23.01-r0                                                                                 apk       
+7zip                                                      24.09-r0          apk       
-Alba.CsConsoleFormat                               1.0.0.89                                                                                 dotnet    
+Alba.CsConsoleFormat                                      1.0.0             dotnet    
-BencodeNET                                         2.3.0.0                                                                                  dotnet    
+BencodeNET                                                2.3.0             dotnet    
-Bouncy Castle for .NET (netstandard2.0)            1.8.8.2                                                                                  dotnet    
+CsvHelper                                                 12.1.2            dotnet    
-CommandLineUtils                                   2.4.4+3c2a4909757a51602dcca9b961d577511b85fd31.3c2a4909757a51602dcca9b961d577511b85fd31  dotnet    
+IPNetwork2                                                2.5.235           dotnet    
-CsvHelper                                          12.1.2                                                                                   dotnet    
+McMaster.Extensions.CommandLineUtils                      2.4.4             dotnet    
-Json.NET                                           13.0.3.27908                                                                             dotnet    
+Mono.Posix.NETStandard                                    1.0.0             dotnet    
-Microsoft.CSharp                                   6.0.3524.45918                                                                           dotnet    
+NJsonSchema                                               9.14.1            dotnet    
-Microsoft.VisualBasic                              6.0.3524.45918                                                                           dotnet    
+Newtonsoft.Json                                           13.0.3            dotnet    
-Microsoft.VisualBasic.Core                         11.100.3524.45918                                                                        dotnet    
+Portable.BouncyCastle                                     1.8.8             dotnet    
-Microsoft.Win32.Primitives                         6.0.3524.45918                                                                           dotnet    
+Portable.Xaml                                             0.18.0            dotnet    
-Microsoft.Win32.Registry                           6.0.3524.45918                                                                           dotnet    
+QBittorrent.Client                                        1.9.24285.1       dotnet    
-Mono.Posix.NETStandard                             1.0.0.0                                                                                  dotnet    
+System.Security.Cryptography.ProtectedData                5.0.0             dotnet    
-NJsonSchema                                        9.14.1.0                                                                                 dotnet    
+acl-libs                                                  2.3.2-r1          apk       
-Portable.Xaml.dll                                  0.18.0.0                                                                                 dotnet    
+alpine-baselayout                                         3.7.0-r0          apk       
-QBittorrent.Client                                 1.9.24285.1                                                                              dotnet    
+alpine-baselayout-data                                    3.7.0-r0          apk       
-System                                             6.0.3524.45918                                                                           dotnet    
+alpine-keys                                               2.5-r0            apk       
-System.AppContext                                  6.0.3524.45918                                                                           dotnet    
+apk-tools                                                 2.14.9-r1         apk       
-System.Buffers                                     6.0.3524.45918                                                                           dotnet    
+bash                                                      5.2.37-r0         apk       
-System.Collections                                 6.0.3524.45918                                                                           dotnet    
+brotli-libs                                               1.1.0-r2          apk       
-System.Collections.Concurrent                      6.0.3524.45918                                                                           dotnet    
+busybox                                                   1.37.0-r16        apk       
-System.Collections.Immutable                       6.0.3524.45918                                                                           dotnet    
+busybox-binsh                                             1.37.0-r16        apk       
-System.Collections.NonGeneric                      6.0.3524.45918                                                                           dotnet    
+c-ares                                                    1.34.5-r0         apk       
-System.Collections.Specialized                     6.0.3524.45918                                                                           dotnet    
+ca-certificates                                           20241121-r2       apk       
-System.ComponentModel                              6.0.3524.45918                                                                           dotnet    
+ca-certificates-bundle                                    20241121-r2       apk       
-System.ComponentModel.Annotations                  6.0.3524.45918                                                                           dotnet    
+catatonit                                                 0.2.1-r0          apk       
-System.ComponentModel.DataAnnotations              6.0.3524.45918                                                                           dotnet    
+coreutils                                                 9.7-r1            apk       
-System.ComponentModel.EventBasedAsync              6.0.3524.45918                                                                           dotnet    
+coreutils-env                                             9.7-r1            apk       
-System.ComponentModel.Primitives                   6.0.3524.45918                                                                           dotnet    
+coreutils-fmt                                             9.7-r1            apk       
-System.ComponentModel.TypeConverter                6.0.3524.45918                                                                           dotnet    
+coreutils-sha512sum                                       9.7-r1            apk       
-System.Configuration                               6.0.3524.45918                                                                           dotnet    
+curl                                                      8.13.0-r1         apk       
-System.Console                                     6.0.3524.45918                                                                           dotnet    
+dbus-libs                                                 1.16.2-r1         apk       
-System.Core                                        6.0.3524.45918                                                                           dotnet    
+double-conversion                                         3.3.1-r0          apk       
-System.Data                                        6.0.3524.45918                                                                           dotnet    
+duktape-libs                                              2.7.0-r2          apk       
-System.Data.Common                                 6.0.3524.45918                                                                           dotnet    
+findutils                                                 4.10.0-r0         apk       
-System.Data.DataSetExtensions                      6.0.3524.45918                                                                           dotnet    
+gdbm                                                      1.24-r0           apk       
-System.Diagnostics.Contracts                       6.0.3524.45918                                                                           dotnet    
+glib                                                      2.84.1-r0         apk       
-System.Diagnostics.Debug                           6.0.3524.45918                                                                           dotnet    
+grep                                                      3.12-r0           apk       
-System.Diagnostics.DiagnosticSource                6.0.3524.45918                                                                           dotnet    
+icu-data-en                                               76.1-r0           apk       
-System.Diagnostics.FileVersionInfo                 6.0.3524.45918                                                                           dotnet    
+icu-libs                                                  76.1-r0           apk       
-System.Diagnostics.Process                         6.0.3524.45918                                                                           dotnet    
+jq                                                        1.7.1-r0          apk       
-System.Diagnostics.StackTrace                      6.0.3524.45918                                                                           dotnet    
+libapk2                                                   2.14.9-r1         apk       
-System.Diagnostics.TextWriterTraceListener         6.0.3524.45918                                                                           dotnet    
+libattr                                                   2.5.2-r2          apk       
-System.Diagnostics.Tools                           6.0.3524.45918                                                                           dotnet    
+libb2                                                     0.98.1-r3         apk       
-System.Diagnostics.TraceSource                     6.0.3524.45918                                                                           dotnet    
+libblkid                                                  2.41-r4           apk       
-System.Diagnostics.Tracing                         6.0.3524.45918                                                                           dotnet    
+libbsd                                                    0.12.2-r0         apk       
-System.Drawing                                     6.0.3524.45918                                                                           dotnet    
+libbz2                                                    1.0.8-r6          apk       
-System.Drawing.Primitives                          6.0.3524.45918                                                                           dotnet    
+libcrypto3                                                3.5.0-r0          apk       
-System.Dynamic.Runtime                             6.0.3524.45918                                                                           dotnet    
+libcurl                                                   8.13.0-r1         apk       
-System.Formats.Asn1                                6.0.3524.45918                                                                           dotnet    
+libeconf                                                  0.6.3-r0          apk       
-System.Globalization                               6.0.3524.45918                                                                           dotnet    
+libexpat                                                  2.7.1-r0          apk       
-System.Globalization.Calendars                     6.0.3524.45918                                                                           dotnet    
+libffi                                                    3.4.8-r0          apk       
-System.Globalization.Extensions                    6.0.3524.45918                                                                           dotnet    
+libgcc                                                    14.2.0-r5         apk       
-System.IO                                          6.0.3524.45918                                                                           dotnet    
+libgomp                                                   14.2.0-r5         apk       
-System.IO.Compression                              6.0.3524.45918                                                                           dotnet    
+libidn2                                                   2.3.7-r0          apk       
-System.IO.Compression.Brotli                       6.0.3524.45918                                                                           dotnet    
+libintl                                                   0.24-r0           apk       
-System.IO.Compression.FileSystem                   6.0.3524.45918                                                                           dotnet    
+libmd                                                     1.1.0-r0          apk       
-System.IO.Compression.ZipFile                      6.0.3524.45918                                                                           dotnet    
+libmount                                                  2.41-r4           apk       
-System.IO.FileSystem                               6.0.3524.45918                                                                           dotnet    
+libncursesw                                               6.5_p20250405-r0  apk       
-System.IO.FileSystem.AccessControl                 6.0.3524.45918                                                                           dotnet    
+libpanelw                                                 6.5_p20250405-r0  apk       
-System.IO.FileSystem.DriveInfo                     6.0.3524.45918                                                                           dotnet    
+libpcre2-16                                               10.43-r1          apk       
-System.IO.FileSystem.Primitives                    6.0.3524.45918                                                                           dotnet    
+libproc2                                                  4.0.4-r2          apk       
-System.IO.FileSystem.Watcher                       6.0.3524.45918                                                                           dotnet    
+libproxy                                                  0.5.9-r0          apk       
-System.IO.IsolatedStorage                          6.0.3524.45918                                                                           dotnet    
+libpsl                                                    0.21.5-r3         apk       
-System.IO.MemoryMappedFiles                        6.0.3524.45918                                                                           dotnet    
+libssl3                                                   3.5.0-r0          apk       
-System.IO.Pipes                                    6.0.3524.45918                                                                           dotnet    
+libstdc++                                                 14.2.0-r5         apk       
-System.IO.Pipes.AccessControl                      6.0.3524.45918                                                                           dotnet    
+libtorrent-rasterbar                                      2.0.11-r0         apk       
-System.IO.UnmanagedMemoryStream                    6.0.3524.45918                                                                           dotnet    
+libunistring                                              1.3-r0            apk       
-System.Linq                                        6.0.3524.45918                                                                           dotnet    
+linux-pam                                                 1.7.0-r2          apk       
-System.Linq.Expressions                            6.0.3524.45918                                                                           dotnet    
+mpdecimal                                                 4.0.0-r0          apk       
-System.Linq.Parallel                               6.0.3524.45918                                                                           dotnet    
+musl                                                      1.2.5-r10         apk       
-System.Linq.Queryable                              6.0.3524.45918                                                                           dotnet    
+musl-utils                                                1.2.5-r10         apk       
-System.Memory                                      6.0.3524.45918                                                                           dotnet    
+ncurses-terminfo-base                                     6.5_p20250405-r0  apk       
-System.Net                                         6.0.3524.45918                                                                           dotnet    
+netcat-openbsd                                            1.228.1-r0        apk       
-System.Net.Http                                    6.0.3524.45918                                                                           dotnet    
+nghttp2-libs                                              1.65.0-r0         apk       
-System.Net.Http.Json                               6.0.3524.45918                                                                           dotnet    
+oniguruma                                                 6.9.10-r0         apk       
-System.Net.HttpListener                            6.0.3524.45918                                                                           dotnet    
+pcre2                                                     10.43-r1          apk       
-System.Net.IPNetwork                               2.5.235                                                                                  dotnet    
+procps-ng                                                 4.0.4-r2          apk       
-System.Net.Mail                                    6.0.3524.45918                                                                           dotnet    
+pyc                                                       3.12.10-r0        apk       
-System.Net.NameResolution                          6.0.3524.45918                                                                           dotnet    
+python3                                                   3.12.10-r0        apk       
-System.Net.NetworkInformation                      6.0.3524.45918                                                                           dotnet    
+python3-pyc                                               3.12.10-r0        apk       
-System.Net.Ping                                    6.0.3524.45918                                                                           dotnet    
+python3-pycache-pyc0                                      3.12.10-r0        apk       
-System.Net.Primitives                              6.0.3524.45918                                                                           dotnet    
+qbittorrent-nox                                           5.0.4-r0          apk       
-System.Net.Quic                                    6.0.3524.45918                                                                           dotnet    
+qbt                                                       1.8.24285.1       dotnet    
-System.Net.Requests                                6.0.3524.45918                                                                           dotnet    
+qt6-qtbase                                                6.8.2-r1          apk       
-System.Net.Security                                6.0.3524.45918                                                                           dotnet    
+qt6-qtbase-sqlite                                         6.8.2-r1          apk       
-System.Net.ServicePoint                            6.0.3524.45918                                                                           dotnet    
+readline                                                  8.2.13-r0         apk       
-System.Net.Sockets                                 6.0.3524.45918                                                                           dotnet    
+runtimepack.Microsoft.NETCore.App.Runtime.linux-musl-x64  6.0.35            dotnet    
-System.Net.WebClient                               6.0.3524.45918                                                                           dotnet    
+scanelf                                                   1.3.8-r1          apk       
-System.Net.WebHeaderCollection                     6.0.3524.45918                                                                           dotnet    
+shadow                                                    4.17.3-r0         apk       
-System.Net.WebProxy                                6.0.3524.45918                                                                           dotnet    
+skalibs-libs                                              2.14.3.0-r0       apk       
-System.Net.WebSockets                              6.0.3524.45918                                                                           dotnet    
+sqlite-libs                                               3.49.1-r0         apk       
-System.Net.WebSockets.Client                       6.0.3524.45918                                                                           dotnet    
+ssl_client                                                1.37.0-r16        apk       
-System.Numerics                                    6.0.3524.45918                                                                           dotnet    
+tzdata                                                    2025b-r0          apk       
-System.Numerics.Vectors                            6.0.3524.45918                                                                           dotnet    
+utmps-libs                                                0.1.2.3-r2        apk       
-System.ObjectModel                                 6.0.3524.45918                                                                           dotnet    
+xz-libs                                                   5.8.1-r0          apk       
-System.Private.CoreLib                             6.0.3524.45918                                                                           dotnet    
+zlib                                                      1.3.1-r2          apk       
-System.Private.DataContractSerialization           6.0.3524.45918                                                                           dotnet    
+zstd-libs                                                 1.5.7-r0          apk       
 System.Private.Uri                                 6.0.3524.45918                                                                           dotnet    
 System.Private.Xml                                 6.0.3524.45918                                                                           dotnet    
 System.Private.Xml.Linq                            6.0.3524.45918                                                                           dotnet    
 System.Reflection                                  6.0.3524.45918                                                                           dotnet    
 System.Reflection.DispatchProxy                    6.0.3524.45918                                                                           dotnet    
 System.Reflection.Emit                             6.0.3524.45918                                                                           dotnet    
 System.Reflection.Emit.ILGeneration                6.0.3524.45918                                                                           dotnet    
 System.Reflection.Emit.Lightweight                 6.0.3524.45918                                                                           dotnet    
 System.Reflection.Extensions                       6.0.3524.45918                                                                           dotnet    
 System.Reflection.Metadata                         6.0.3524.45918                                                                           dotnet    
 System.Reflection.Primitives                       6.0.3524.45918                                                                           dotnet    
 System.Reflection.TypeExtensions                   6.0.3524.45918                                                                           dotnet    
 System.Resources.Reader                            6.0.3524.45918                                                                           dotnet    
 System.Resources.ResourceManager                   6.0.3524.45918                                                                           dotnet    
 System.Resources.Writer                            6.0.3524.45918                                                                           dotnet    
 System.Runtime                                     6.0.3524.45918                                                                           dotnet    
 System.Runtime.CompilerServices.VisualC            6.0.3524.45918                                                                           dotnet    
 System.Runtime.Extensions                          6.0.3524.45918                                                                           dotnet    
 System.Runtime.Handles                             6.0.3524.45918                                                                           dotnet    
 System.Runtime.InteropServices                     6.0.3524.45918                                                                           dotnet    
 System.Runtime.InteropServices.RuntimeInformation  6.0.3524.45918                                                                           dotnet    
 System.Runtime.Intrinsics                          6.0.3524.45918                                                                           dotnet    
 System.Runtime.Loader                              6.0.3524.45918                                                                           dotnet    
 System.Runtime.Numerics                            6.0.3524.45918                                                                           dotnet    
 System.Runtime.Serialization                       6.0.3524.45918                                                                           dotnet    
 System.Runtime.Serialization.Formatters            6.0.3524.45918                                                                           dotnet    
 System.Runtime.Serialization.Json                  6.0.3524.45918                                                                           dotnet    
 System.Runtime.Serialization.Primitives            6.0.3524.45918                                                                           dotnet    
 System.Runtime.Serialization.Xml                   6.0.3524.45918                                                                           dotnet    
 System.Security                                    6.0.3524.45918                                                                           dotnet    
 System.Security.AccessControl                      6.0.3524.45918                                                                           dotnet    
 System.Security.Claims                             6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.Algorithms            6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.Cng                   6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.Csp                   6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.Encoding              6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.OpenSsl               6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.Primitives            6.0.3524.45918                                                                           dotnet    
 System.Security.Cryptography.ProtectedData         5.0.20.51904                                                                             dotnet    
 System.Security.Cryptography.X509Certificates      6.0.3524.45918                                                                           dotnet    
 System.Security.Principal                          6.0.3524.45918                                                                           dotnet    
 System.Security.Principal.Windows                  6.0.3524.45918                                                                           dotnet    
 System.Security.SecureString                       6.0.3524.45918                                                                           dotnet    
 System.ServiceModel.Web                            6.0.3524.45918                                                                           dotnet    
 System.ServiceProcess                              6.0.3524.45918                                                                           dotnet    
 System.Text.Encoding                               6.0.3524.45918                                                                           dotnet    
 System.Text.Encoding.CodePages                     6.0.3524.45918                                                                           dotnet    
 System.Text.Encoding.Extensions                    6.0.3524.45918                                                                           dotnet    
 System.Text.Encodings.Web                          6.0.3524.45918                                                                           dotnet    
 System.Text.Json                                   6.0.3524.45918                                                                           dotnet    
 System.Text.RegularExpressions                     6.0.3524.45918                                                                           dotnet    
 System.Threading                                   6.0.3524.45918                                                                           dotnet    
 System.Threading.Channels                          6.0.3524.45918                                                                           dotnet    
 System.Threading.Overlapped                        6.0.3524.45918                                                                           dotnet    
 System.Threading.Tasks                             6.0.3524.45918                                                                           dotnet    
 System.Threading.Tasks.Dataflow                    6.0.3524.45918                                                                           dotnet    
 System.Threading.Tasks.Extensions                  6.0.3524.45918                                                                           dotnet    
 System.Threading.Tasks.Parallel                    6.0.3524.45918                                                                           dotnet    
 System.Threading.Thread                            6.0.3524.45918                                                                           dotnet    
 System.Threading.ThreadPool                        6.0.3524.45918                                                                           dotnet    
 System.Threading.Timer                             6.0.3524.45918                                                                           dotnet    
 System.Transactions                                6.0.3524.45918                                                                           dotnet    
 System.Transactions.Local                          6.0.3524.45918                                                                           dotnet    
 System.ValueTuple                                  6.0.3524.45918                                                                           dotnet    
 System.Web                                         6.0.3524.45918                                                                           dotnet    
 System.Web.HttpUtility                             6.0.3524.45918                                                                           dotnet    
 System.Windows                                     6.0.3524.45918                                                                           dotnet    
 System.Xml                                         6.0.3524.45918                                                                           dotnet    
 System.Xml.Linq                                    6.0.3524.45918                                                                           dotnet    
 System.Xml.ReaderWriter                            6.0.3524.45918                                                                           dotnet    
 System.Xml.Serialization                           6.0.3524.45918                                                                           dotnet    
 System.Xml.XDocument                               6.0.3524.45918                                                                           dotnet    
 System.Xml.XPath                                   6.0.3524.45918                                                                           dotnet    
 System.Xml.XPath.XDocument                         6.0.3524.45918                                                                           dotnet    
 System.Xml.XmlDocument                             6.0.3524.45918                                                                           dotnet    
 System.Xml.XmlSerializer                           6.0.3524.45918                                                                           dotnet    
 WindowsBase                                        6.0.3524.45918                                                                           dotnet    
 alpine-baselayout                                  3.6.5-r0                                                                                 apk       
 alpine-baselayout-data                             3.6.5-r0                                                                                 apk       
 alpine-keys                                        2.4-r1                                                                                   apk       
 alpine-release                                     3.20.3-r0                                                                                apk       
 apk-tools                                          2.14.4-r1                                                                                apk       
 bash                                               5.2.26-r0                                                                                apk       
 brotli-libs                                        1.1.0-r2                                                                                 apk       
 busybox                                            1.36.1-r29                                                                               apk       
 busybox-binsh                                      1.36.1-r29                                                                               apk       
 c-ares                                             1.33.1-r0                                                                                apk       
 ca-certificates                                    20240705-r0                                                                              apk       
 ca-certificates-bundle                             20240705-r0                                                                              apk       
 catatonit                                          0.2.0-r0                                                                                 apk       
 coreutils                                          9.5-r1                                                                                   apk       
 coreutils-env                                      9.5-r1                                                                                   apk       
 coreutils-fmt                                      9.5-r1                                                                                   apk       
 coreutils-sha512sum                                9.5-r1                                                                                   apk       
 curl                                               8.11.1-r0                                                                                apk       
 dbus-libs                                          1.14.10-r1                                                                               apk       
 double-conversion                                  3.3.0-r0                                                                                 apk       
 duktape                                            2.7.0-r1                                                                                 apk       
 findutils                                          4.9.0-r5                                                                                 apk       
 gdbm                                               1.23-r1                                                                                  apk       
 glib                                               2.80.5-r0                                                                                apk       
 grep                                               3.11-r0                                                                                  apk       
 icu-data-en                                        74.2-r0                                                                                  apk       
 icu-libs                                           74.2-r0                                                                                  apk       
 jq                                                 1.7.1-r0                                                                                 apk       
 libacl                                             2.3.2-r0                                                                                 apk       
 libattr                                            2.5.2-r0                                                                                 apk       
 libb2                                              0.98.1-r3                                                                                apk       
 libblkid                                           2.40.1-r1                                                                                apk       
 libbsd                                             0.12.2-r0                                                                                apk       
 libbz2                                             1.0.8-r6                                                                                 apk       
 libcrypto3                                         3.3.2-r1                                                                                 apk       
 libcurl                                            8.11.1-r0                                                                                apk       
 libeconf                                           0.6.3-r0                                                                                 apk       
 libexpat                                           2.6.4-r0                                                                                 apk       
 libffi                                             3.4.6-r0                                                                                 apk       
 libgcc                                             13.2.1_git20240309-r0                                                                    apk       
 libgomp                                            13.2.1_git20240309-r0                                                                    apk       
 libidn2                                            2.3.7-r0                                                                                 apk       
 libintl                                            0.22.5-r0                                                                                apk       
 libmd                                              1.1.0-r0                                                                                 apk       
 libmount                                           2.40.1-r1                                                                                apk       
 libncursesw                                        6.4_p20240420-r2                                                                         apk       
 libpanelw                                          6.4_p20240420-r2                                                                         apk       
 libpcre2-16                                        10.43-r0                                                                                 apk       
 libproc2                                           4.0.4-r0                                                                                 apk       
 libproxy                                           0.5.6-r0                                                                                 apk       
 libpsl                                             0.21.5-r1                                                                                apk       
 libssl3                                            3.3.2-r1                                                                                 apk       
 libstdc++                                          13.2.1_git20240309-r0                                                                    apk       
 libunistring                                       1.2-r0                                                                                   apk       
 linux-pam                                          1.6.0-r0                                                                                 apk       
 mpdecimal                                          4.0.0-r0                                                                                 apk       
 mscorlib                                           6.0.3524.45918                                                                           dotnet    
 musl                                               1.2.5-r0                                                                                 apk       
 musl-utils                                         1.2.5-r0                                                                                 apk       
 ncurses-terminfo-base                              6.4_p20240420-r2                                                                         apk       
 netcat-openbsd                                     1.226-r0                                                                                 apk       
 netstandard                                        6.0.3524.45918                                                                           dotnet    
 nghttp2-libs                                       1.62.1-r0                                                                                apk       
 oniguruma                                          6.9.9-r0                                                                                 apk       
 pcre2                                              10.43-r0                                                                                 apk       
 procps-ng                                          4.0.4-r0                                                                                 apk       
 pyc                                                3.12.8-r1                                                                                apk       
 python3                                            3.12.8-r1                                                                                apk       
 python3-pyc                                        3.12.8-r1                                                                                apk       
 python3-pycache-pyc0                               3.12.8-r1                                                                                apk       
 qbt                                                1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2                                     dotnet    
 qt6-qtbase                                         6.6.3-r1                                                                                 apk       
 qt6-qtbase-sqlite                                  6.6.3-r1                                                                                 apk       
 readline                                           8.2.10-r0                                                                                apk       
 scanelf                                            1.3.7-r2                                                                                 apk       
 shadow                                             4.15.1-r0                                                                                apk       
 skalibs                                            2.14.1.1-r0                                                                              apk       
 sqlite-libs                                        3.45.3-r1                                                                                apk       
 ssl_client                                         1.36.1-r29                                                                               apk       
 tzdata                                             2024b-r0                                                                                 apk       
 utmps-libs                                         0.1.2.2-r1                                                                               apk       
 xz-libs                                            5.6.2-r0                                                                                 apk       
 zlib                                               1.3.1-r1                                                                                 apk       
 zstd-libs                                          1.5.6-r0                                                                                 apk       
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -6,6 +6,7 @@ project_url: "https://www.qbittorrent.org/"
 project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/qbittorrent-icon.png"
 project_blurb: "The [{{ project_name|capitalize }}]({{ project_url }}) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 project_categories: "Downloaders"
 # supported architectures
 available_architectures:
  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -34,6 +35,7 @@ opt_param_usage_include_vols: true
 opt_param_volumes:
  - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk."}
 readonly_supported: true
 nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -47,7 +49,7 @@ app_setup_block: |
  Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
-  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090
+  For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
  ### TORRENTING_PORT
@@ -56,7 +58,7 @@ app_setup_block: |
  Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:6887, -p 6887:6887/udp and -e TORRENTING_PORT=6887 arguments to Docker.
 # init diagram
 init_diagram: |
-  "qbittorrent:libtorrentv1": {
+  "qbittorrent:latest": {
    docker-mods
    base {
      fix-attr +\nlegacy cont-init
@@ -71,48 +73,43 @@ init_diagram: |
    init-migrations -> init-adduser
    init-os-end -> init-config
    init-config -> init-config-end
    init-crontab-config -> init-config-end
    init-qbittorrent-config -> init-config-end
-    init-os-end -> init-crontab-config
+    init-config -> init-crontab-config
    init-mods-end -> init-custom-files
    base -> init-envfile
    base -> init-migrations
    base -> init-mods
    init-config-end -> init-mods
    init-mods -> init-mods-end
    init-mods-package-install -> init-mods-end
    init-mods -> init-mods-package-install
    base -> init-os-end
    init-adduser -> init-os-end
    init-envfile -> init-os-end
    init-migrations -> init-os-end
    init-config -> init-qbittorrent-config
    init-custom-files -> init-services
    init-mods-end -> init-services
    init-services -> svc-cron
    svc-cron -> legacy-services
    init-services -> svc-qbittorrent
    svc-qbittorrent -> legacy-services
  }
  Base Images: {
-    "baseimage-alpine:3.20"
+    "baseimage-alpine:edge"
  }
-  "qbittorrent:libtorrentv1" <- Base Images
+  "qbittorrent:latest" <- Base Images
 # changelog
 changelogs:
  - {date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3."}
-  - {date: "25.05.24:", desc: "Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
+  - {date: "25.05.24:", desc: "Remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
  - {date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set."}
  - {date: "14.02.24:", desc: "Add torrenting port support."}
-  - {date: "31.01.24:", desc: "Rebase to Alpine 3.19."}
+  - {date: "31.01.24:", desc: "Remove obsolete compat packages."}
  - {date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
  - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
  - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
-  - {date: "17.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)."}
+  - {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: "25.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
+  - {date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
-  - {date: "15.01.23:", desc: "Rebase to Alpine 3.17, add openssl1.1-compat."}
+  - {date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli."}
-  - {date: "29.11.22:", desc: "Add icu-libs to support qbittorrent-cli."}
+  - {date: "31.10.22:", desc: "Add libtorrentv1 branch."}
  - {date: "30.10.22:", desc: "Add libtorrent v1 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."}
--- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
@@ -9,11 +9,13 @@ 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 [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-if grep -qe ' /downloads ' /proc/mounts; then
+    # chown download directory if currently not set to abc
-    lsiown abc:abc /downloads
+    if grep -qe ' /downloads ' /proc/mounts; then
-fi
+        lsiown abc:abc /downloads
    fi
-# permissions
+    # permissions
-lsiown -R abc:abc \
+    lsiown -R abc:abc \
-    /config
+        /config
 fi
--- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
@@ -11,6 +11,11 @@ if [[ -z ${WEBUI_ADDRESS} ]] || [[ ${WEBUI_ADDRESS} == "*" ]]; then
    WEBUI_ADDRESS="localhost"
 fi
 if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 exec \
    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
-        s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
+        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
 else
    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
        /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
 fi