diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4f5a86a..65ae3c1 100755
--- 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://linuxserver.io/discord)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
 
 ## Common files
 
@@ -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-sonarr/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-sonarr/edit/develop/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-sonarr)
@@ -105,17 +105,17 @@ docker build \
   -t linuxserver/sonarr:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-sonarr/tree/master/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-sonarr/tree/develop/root), add an entry to the changelog
 
 ```yml
 changelogs:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a238662..45bce79 100755
--- 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://linuxserver.io/discord
+    url: https://discord.gg/YWrKVTn
     about: Realtime support / chat with the community and the team.
 
   - name: Discourse discussion forum
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 875a50c..6b95032 100644
--- 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-sonarr/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-sonarr/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 7bfa9c8..b66577a 100755
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -4,39 +4,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-develop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
-        env:
-          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
+        if: github.ref == 'refs/heads/develop'
         run: |
-          printf "# External trigger for docker-sonarr\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^sonarr_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`sonarr_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
-          elif grep -q "^sonarr_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`sonarr_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of master branch. To disable this trigger, add \`sonarr_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 -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel=="v4-stable") | .version')
-          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^sonarr_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
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
+          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP\". ****"
+          echo "External trigger running off of develop branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving external version ****"
+          EXT_RELEASE=$(curl -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel=="v4-nightly") | .version')
           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 sonarr branch master"
+            echo "**** Can't retrieve external version, exiting ****"
+            FAILURE_REASON="Can't retrieve external version for sonarr branch develop"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-sonarr/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"}],
@@ -44,42 +31,24 @@ jobs:
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
-          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
+          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving last pushed version ****"
           image="linuxserver/sonarr"
-          tag="latest"
+          tag="develop"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fsonarr%3Apull" \
             | jq -r '.token')
-          multidigest=$(curl -s \
-            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Accept: application/vnd.oci.image.index.v1+json" \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/manifests/${tag}")
-          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-            # If there's a layer element it's a single-arch manifest so just get that digest
-            digest=$(jq -r '.config.digest' <<< "${multidigest}")
-          else
-            # Otherwise it's multi-arch or has manifest annotations
-            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-              # Check for manifest annotations and delete if found
-              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
-            fi
-            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
-              # If there's still more than one digest, it's multi-arch
-              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
-            else
-              # Otherwise it's single arch
-              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
-            fi
-            if digest=$(curl -s \
+            multidigest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
-              digest=$(jq -r '.config.digest' <<< "${digest}");
-            fi
-          fi
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
+              | jq -r 'first(.manifests[].digest)')
+            digest=$(curl -s \
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Authorization: Bearer ${token}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+              | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -91,54 +60,45 @@ jobs:
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for sonarr tag latest"
+            echo "**** Can't retrieve last pushed version, exiting ****"
+            FAILURE_REASON="Can't retrieve last pushed version for sonarr tag develop"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            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-sonarr/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
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
-            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 sonarr 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 }}
-            else
-              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-              if [[ "${artifacts_found}" == "true" ]]; then
-                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-sonarr/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
-              sleep 10
-              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-              buildurl="${buildurl%$'\r'}"
-              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-              curl -iX POST \
-                "${buildurl}submitDescription" \
-                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                --data-urlencode "Submit=Submit"
-              echo "**** Notifying Discord ****"
-              TRIGGER_REASON="A version change was detected for sonarr tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            fi
+            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
+            response=$(curl -iX POST \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/develop/buildWithParameters?PACKAGE_CHECK=false \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+            echo "**** Sleeping 10 seconds until job starts ****"
+            sleep 10
+            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+            buildurl="${buildurl%$'\r'}"
+            echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+            echo "**** Attempting to change the Jenkins job description ****"
+            curl -iX POST \
+              "${buildurl}submitDescription" \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+              --data-urlencode "Submit=Submit"
+            echo "**** Notifying Discord ****"
+            TRIGGER_REASON="A version change was detected for sonarr tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
           fi
diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml
index 37068e9..88f4c1b 100755
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -15,31 +15,31 @@ jobs:
 
       - name: External Trigger Scheduler
         run: |
-          printf "# External trigger scheduler for docker-sonarr\n\n" >> $GITHUB_STEP_SUMMARY
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-              continue
-            fi
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
             ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/jenkins-vars.yml)
             ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
             ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
             if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
+              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
                   -d "{\"ref\":\"refs/heads/${br}\"}" \
                   https://api.github.com/repos/linuxserver/docker-sonarr/actions/workflows/external_trigger.yml/dispatches
               else
-                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
-              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
index 42fbc6f..4e0cd92 100755
--- 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-sonarr/blob/master/.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-sonarr/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml
new file mode 100755
index 0000000..aabe3ea
--- /dev/null
+++ b/.github/workflows/package_trigger.yml
@@ -0,0 +1,42 @@
+name: Package Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package-trigger-develop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+
+      - name: Package Trigger
+        if: github.ref == 'refs/heads/develop'
+        run: |
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_SONARR_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_SONARR_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_SONARR_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          echo "**** Package trigger running off of develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_SONARR_DEVELOP\". ****"
+          echo "Package trigger running off of develop branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_SONARR_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
+          response=$(curl -iX POST \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/develop/buildWithParameters?PACKAGE_CHECK=true \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+          echo "**** Sleeping 10 seconds until job starts ****"
+          sleep 10
+          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+          buildurl="${buildurl%$'\r'}"
+          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Attempting to change the Jenkins job description ****"
+          curl -iX POST \
+            "${buildurl}submitDescription" \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+            --data-urlencode "Submit=Submit"
diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml
index 1248c25..c18d3ca 100755
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -14,87 +14,37 @@ jobs:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
-        env:
-          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          printf "# Package trigger scheduler for docker-sonarr\n\n" >> $GITHUB_STEP_SUMMARY
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-              continue
-            fi
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/jenkins-vars.yml)
-            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/Jenkinsfile >/dev/null 2>&1; then
-              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-              skipped_branches="${skipped_branches}${br} "
-            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/readme-vars.yml)
-              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif grep -q "^sonarr_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`sonarr_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              else
-                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                printf "> To disable, add \`sonarr_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+            if [ "${br}" == "${ls_branch}" ]; then
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-sonarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 triggered_branches="${triggered_branches}${br} "
-                response=$(curl -iX POST \
-                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
-                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-                if [[ -z "${response}" ]]; then
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  echo "> Jenkins build could not be triggered. Skipping branch."
-                  continue
-                fi
-                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-                sleep 10
-                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-                buildurl="${buildurl%$'\r'}"
-                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-                if ! curl -ifX POST \
-                  "${buildurl}submitDescription" \
-                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                  --data-urlencode "Submit=Submit"; then
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  echo "> Unable to change the Jenkins job description."
-                fi
-                sleep 20
+                curl -iX POST \
+                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                  https://api.github.com/repos/linuxserver/docker-sonarr/actions/workflows/package_trigger.yml/dispatches
+                sleep 30
+              else
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
               echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done
-          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
-            if [[ -n "${triggered_branches}" ]]; then
-              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-sonarr/activity/ \n"
-              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-            fi
-            if [[ -n "${skipped_branches}" ]]; then
-              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
-            fi
-            echo "**** Notifying Discord ****"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Package Check Build(s) for sonarr** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-          fi
+          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+          echo "**** Notifying Discord ****"
+          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+            "description": "**Package Check Build(s) Triggered for sonarr** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-sonarr/activity/"' \n"}],
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
diff --git a/Dockerfile b/Dockerfile
index 02043e3..829259a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.21
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -11,8 +11,8 @@ LABEL maintainer="thespad"
 
 # set environment variables
 ENV XDG_CONFIG_HOME="/config/xdg" \
-  SONARR_CHANNEL="v4-stable" \
-  SONARR_BRANCH="main" \
+  SONARR_BRANCH="develop" \
+  SONARR_CHANNEL="v4-nightly" \
   COMPlus_EnableDiagnostics=0 \
   TMPDIR=/run/sonarr-temp
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 1bc311f..bb485a2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -11,8 +11,8 @@ LABEL maintainer="thespad"
 
 # set environment variables
 ENV XDG_CONFIG_HOME="/config/xdg" \
-  SONARR_CHANNEL="v4-stable" \
-  SONARR_BRANCH="main" \
+  SONARR_BRANCH="develop" \
+  SONARR_CHANNEL="v4-nightly" \
   COMPlus_EnableDiagnostics=0 \
   TMPDIR=/run/sonarr-temp
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 84db39d..de1e56b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
   }
   // Input to determine if this is a package check
   parameters {
-    string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
   }
   // Configuration for the variables used for this specific repo
   environment {
@@ -17,8 +17,6 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
-    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
-    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     BUILD_VERSION_ARG = 'SONARR_VERSION'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-sonarr'
@@ -26,57 +24,31 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/sonarr'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr'
     PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr'
-    DIST_IMAGE = 'ubuntu'
+    DIST_IMAGE = 'alpine'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
     CI_PORT='8989'
     CI_SSL='false'
-    CI_DELAY='240'
+    CI_DELAY='120'
     CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH='/system/status'
   }
   stages {
-    stage("Set git config"){
-      steps{
-        sh '''#!/bin/bash
-              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
-              chmod 600 /config/.ssh/id_sign
-              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
-              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
-              git config --global gpg.format ssh
-              git config --global user.signingkey /config/.ssh/id_sign
-              git config --global commit.gpgsign true
-        '''
-      }
-    }
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
-        echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
-              echo "Pruning builder"
-              docker builder prune -f --builder container || :
-              containers=$(docker ps -q)
+              containers=$(docker ps -aq)
               if [[ -n "${containers}" ]]; then
-                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
+                docker stop ${containers}
               fi
-              docker system prune -f --volumes || :
-              docker image prune -af || :
-           '''
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:develop 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 +65,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./root/donate.txt'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         sh '''#! /bin/bash
               echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -105,7 +77,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 develop-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -143,7 +115,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel=="v4-stable") | .version' ''',
+            script: ''' curl -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel=="v4-nightly") | .version' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -183,10 +155,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a develop build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -196,21 +168,20 @@ 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-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
-          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'
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "develop"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -220,15 +191,14 @@ 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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'develop-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'
         }
       }
     }
@@ -244,16 +214,15 @@ 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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'develop-' + 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 = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'develop-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'
         }
       }
     }
@@ -288,7 +257,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -300,24 +269,24 @@ pipeline {
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
               # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch develop of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch develop 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 master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch develop --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 master
+                git checkout -f develop
                 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 master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -326,7 +295,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               echo "Starting Stage 2 - Delete old templates"
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -336,13 +305,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 master
+                git checkout -f develop
                 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 master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 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}
@@ -350,35 +319,6 @@ pipeline {
               else
                 echo "No templates to delete"
               fi
-              echo "Starting Stage 2.5 - Update init diagram"
-              if ! grep -q 'init_diagram:' readme-vars.yml; then
-                echo "Adding the key 'init_diagram' to readme-vars.yml"
-                sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
-                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}:latest
-              ls -al ${TEMPDIR}/d2
-              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 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 master
-                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}
-                exit 0
-              else
-                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Init diagram is unchanged"
-              fi
               echo "Starting Stage 3 - Update templates"
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
@@ -387,7 +327,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 master
+                git checkout -f develop
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -400,8 +340,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 master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -441,9 +381,9 @@ pipeline {
                 echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
                   echo "Image is on the ignore list, and already in the deprecation folder."
-                elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -502,7 +442,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -515,10 +455,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build check the S6 service file perms
+    // If this is a develop build check the S6 service file perms
     stage("Check S6 Service file Permissions"){
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -536,10 +476,10 @@ pipeline {
       }
     }
     /* #######################
-       GitLab Mirroring and Quay.io Repo Visibility
+           GitLab Mirroring
        ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
-    stage("GitLab Mirror and Quay.io Visibility"){
+    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    stage("GitLab Mirror"){
       when {
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -555,8 +495,6 @@ pipeline {
             "visibility":"public"}' '''
         sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
           -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
-        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
-          -d '{"visibility":"public"}' ||: '''
       } 
     }
     /* ###############
@@ -587,42 +525,8 @@ pipeline {
           --label \"org.opencontainers.image.title=Sonarr\" \
           --label \"org.opencontainers.image.description=[Sonarr](https://sonarr.tv/) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.  \" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=true --sbom=true --builder=container --load \
+          --provenance=false --sbom=false \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-        sh '''#! /bin/bash
-              set -e
-              IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-              for i in "${CACHE[@]}"; do
-                docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-              done
-           '''
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry_backoff(5,5) {
-              sh '''#! /bin/bash
-                    set -e
-                    echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                    echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                    echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                    echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                    if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                      for i in "${CACHE[@]}"; do
-                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                      done
-                      for p in $(jobs -p); do
-                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                      done
-                    fi
-                '''
-          }
-        }
       }
     }
     // Build MultiArch Docker containers for push to LS Repo
@@ -653,42 +557,8 @@ pipeline {
               --label \"org.opencontainers.image.title=Sonarr\" \
               --label \"org.opencontainers.image.description=[Sonarr](https://sonarr.tv/) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.  \" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=true --sbom=true --builder=container --load \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh '''#! /bin/bash
-                  set -e
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                  done
-               '''
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: 'Quay.io-Robot',
-                usernameVariable: 'QUAYUSER',
-                passwordVariable: 'QUAYPASS'
-              ]
-            ]) {
-              retry_backoff(5,5) {
-                  sh '''#! /bin/bash
-                        set -e
-                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                          done
-                          for p in $(jobs -p); do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                          done
-                        fi
-                    '''
-              }
-            }
           }
         }
         stage('Build ARM64') {
@@ -697,6 +567,10 @@ pipeline {
           }
           steps {
             echo "Running on node: ${NODE_NAME}"
+            echo 'Logging into Github'
+            sh '''#! /bin/bash
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+               '''
             sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
             sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
@@ -712,50 +586,18 @@ pipeline {
               --label \"org.opencontainers.image.title=Sonarr\" \
               --label \"org.opencontainers.image.description=[Sonarr](https://sonarr.tv/) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.  \" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=true --sbom=true --builder=container --load \
+              --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh '''#! /bin/bash
-                  set -e
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  done
-               '''
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: 'Quay.io-Robot',
-                usernameVariable: 'QUAYUSER',
-                passwordVariable: 'QUAYPASS'
-              ]
-            ]) {
-              retry_backoff(5,5) {
-                  sh '''#! /bin/bash
-                        set -e
-                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
-                          done
-                          for p in $(jobs -p); do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
-                          done
-                        fi
-                    '''
-              }
+            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            retry(5) {
+              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
             sh '''#! /bin/bash
                   containers=$(docker ps -aq)
                   if [[ -n "${containers}" ]]; then
                     docker stop ${containers}
                   fi
-                  docker system prune -f --volumes || :
-                  docker image prune -af || :
-               '''
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -763,7 +605,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -786,14 +628,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 master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f develop
                 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 master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -811,7 +653,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -825,7 +667,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -859,14 +701,6 @@ pipeline {
           }
           sh '''#! /bin/bash
                 set -e
-                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
-                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
-                  if [ -n "${CI_DOCKERENV}" ]; then
-                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
-                  else
-                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
-                  fi
-                fi
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
                   docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -879,7 +713,6 @@ pipeline {
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
-                -e RELEASE_TAG=\"latest\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -889,7 +722,6 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e NODE_NAME=\"${NODE_NAME}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -905,23 +737,37 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        retry_backoff(5,5) {
-          sh '''#! /bin/bash
-                set -e
-                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                          CACHEIMAGE=${i}
-                      fi
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:develop
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
+                    docker push ${PUSHIMAGE}:develop
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                     docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                   done
-                  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
-                done
-              '''
+               '''
+          }
         }
       }
     }
@@ -932,41 +778,64 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        retry_backoff(5,5) {
-          sh '''#! /bin/bash
-                set -e
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                  for i in "${CACHE[@]}"; do
-                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                          CACHEIMAGE=${i}
-                      fi
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  if [ "${CI}" == "false" ]; then
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  fi
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-develop
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-develop
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-develop
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-develop
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                   done
-                  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-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}: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}
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                  fi
-                done
-              '''
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
+                    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}
+                    if [ -n "${SEMVER}" ]; then
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                  done
+               '''
+          }
         }
       }
     }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "develop"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -978,17 +847,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 master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to develop",\
              "type": "commit",\
-             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "develop",\
                      "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": false}' >> releasebody.json
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
@@ -996,14 +865,14 @@ pipeline {
     // Add protection to the release branch
     stage('Github-Release-Branch-Protection') {
       when {
-        branch "master"
+        branch "develop"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Setting up protection for release branch master"
+        echo "Setting up protection for release branch develop"
         sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/develop/protection \
           -d $(jq -c .  << EOF
             {
               "required_status_checks": null,
@@ -1112,94 +981,32 @@ EOF
      ###################### */
   post {
     always {
-      sh '''#!/bin/bash
-            rm -rf /config/.ssh/id_sign
-            rm -rf /config/.ssh/id_sign.pub
-            git config --global --unset gpg.format
-            git config --global --unset user.signingkey
-            git config --global --unset commit.gpgsign
-        '''
       script{
-        env.JOB_DATE = sh(
-            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
-            returnStdout: true).trim()
         if (env.EXIT_STATUS == "ABORTED"){
           sh 'echo "build aborted"'
-        }else{
-          if (currentBuild.currentResult == "SUCCESS"){
-            if (env.GITHUBIMAGE =~ /lspipepr/){
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=3957028
-              env.JOB_WEBHOOK_FOOTER='PR Build'
-            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=3957028
-              env.JOB_WEBHOOK_FOOTER='Dev Build'
-            }else{
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=1681177
-              env.JOB_WEBHOOK_FOOTER='Live Build'
-            }
-          }else{
-            if (env.GITHUBIMAGE =~ /lspipepr/){
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=12669523
-              env.JOB_WEBHOOK_FOOTER='PR Build'
-            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=12669523
-              env.JOB_WEBHOOK_FOOTER='Dev Build'
-            }else{
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=16711680
-              env.JOB_WEBHOOK_FOOTER='Live Build'
-            }
-          }
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
-                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
-                 "timestamp": "'${JOB_DATE}'",\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+        }
+        else if (currentBuild.currentResult == "SUCCESS"){
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+        }
+        else {
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
     cleanup {
       sh '''#! /bin/bash
-            echo "Pruning builder!!"
-            docker builder prune -f --builder container || :
-            containers=$(docker ps -q)
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
             if [[ -n "${containers}" ]]; then
-              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
+              docker stop ${containers}
             fi
-            docker system prune -f --volumes || :
-            docker image prune -af || :
+            docker system prune -af --volumes || :
          '''
       cleanWs()
     }
   }
 }
-
-def retry_backoff(int max_attempts, int power_base, Closure c) {
-  int n = 0
-  while (n < max_attempts) {
-    try {
-      c()
-      return
-    } catch (err) {
-      if ((n + 1) >= max_attempts) {
-        throw err
-      }
-      sleep(power_base ** n)
-      n++
-    }
-  }
-  return
-}
diff --git a/README.md b/README.md
index 609ece6..03a95f9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-sonarr/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-sonarr/blob/develop/.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://linuxserver.io/discord "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://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
 [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
@@ -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://linuxserver.io/discord) - realtime support / chat with the community and the team.
+* [Discord](https://discord.gg/YWrKVTn) - 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,7 +36,7 @@ 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/sonarr)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/sonarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/sonarr)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/sonarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/sonarr)
-[![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-sonarr%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/master/)
+[![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-sonarr%2Fjob%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-sonarr/job/develop/)
 [![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%2Fsonarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/sonarr/latest/index.html)
 
 [Sonarr](https://sonarr.tv/) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
@@ -47,7 +47,7 @@ Find us at:
 
 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/sonarr:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/sonarr:develop` 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:
 
@@ -63,8 +63,8 @@ This image provides various versions that are available via tags. Please read th
 
 | Tag | Available | Description |
 | :----: | :----: |--- |
-| latest | ✅ | Stable releases from Sonarr |
-| develop | ✅ | Development releases from Sonarr |
+| latest | ✅ | Stable releases from Sonarr (currently v4) |
+| develop | ✅ | Development releases from Sonarr (currently v4) |
 
 ## Application Setup
 
@@ -82,24 +82,18 @@ The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/D
 
 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.
 
->[!NOTE]
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
-
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
 services:
   sonarr:
-    image: lscr.io/linuxserver/sonarr:latest
+    image: lscr.io/linuxserver/sonarr:develop
     container_name: sonarr
     environment:
       - PUID=1000
@@ -107,8 +101,8 @@ services:
       - TZ=Etc/UTC
     volumes:
       - /path/to/sonarr/data:/config
-      - /path/to/tvseries:/tv #optional
-      - /path/to/downloadclient-downloads:/downloads #optional
+      - /path/to/tv:/tv #optional
+      - /path/to/download-client-downloads:/downloads #optional
     ports:
       - 8989:8989
     restart: unless-stopped
@@ -124,10 +118,10 @@ docker run -d \
   -e TZ=Etc/UTC \
   -p 8989:8989 \
   -v /path/to/sonarr/data:/config \
-  -v /path/to/tvseries:/tv `#optional` \
-  -v /path/to/downloadclient-downloads:/downloads `#optional` \
+  -v /path/to/tv:/tv `#optional` \
+  -v /path/to/download-client-downloads:/downloads `#optional` \
   --restart unless-stopped \
-  lscr.io/linuxserver/sonarr:latest
+  lscr.io/linuxserver/sonarr:develop
 ```
 
 ## Parameters
@@ -136,15 +130,14 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8989:8989` | The port for the Sonarr web interface |
+| `-p 8989` | The port for the Sonarr web interface |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Database and sonarr configs |
-| `-v /tv` | Location of TV library on disk (See note in Application setup) |
-| `-v /downloads` | Location of download managers output directory (See note in Application setup) |
+| `-v /config` | Database and Sonarr configs |
+| `-v /tv` | Location of TV library on disk |
+| `-v /downloads` | Location of download managers output directory |
 | `--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)
 
@@ -210,7 +203,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/sonarr:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/sonarr:develop
     ```
 
 ## Updating Info
@@ -258,7 +251,7 @@ Below are the instructions for updating containers:
 * Update the image:
 
     ```bash
-    docker pull lscr.io/linuxserver/sonarr:latest
+    docker pull lscr.io/linuxserver/sonarr:develop
     ```
 
 * Stop the running container:
@@ -282,8 +275,7 @@ Below are the instructions for updating containers:
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
->[!TIP]
->We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -295,34 +287,30 @@ cd docker-sonarr
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/sonarr:latest .
+  -t lscr.io/linuxserver/sonarr:develop .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Versions
 
-* **09.01.25:** - Fix rootless entrypoint.
-* **23.12.24:** - Rebase Alpine 3.21.
-* **31.05.24:** - Rebase Alpine 3.20.
+* **25.05.24:** - Rebase to Alpine 3.20.
 * **12.01.24:** - Update download url.
-* **30.12.23:** - Rebase master branch to Alpine 3.19.
-* **15.02.23:** - Rebase master branch to Jammy.
-* **19.12.22:** - Rebase develop branch Alpine 3.17.
-* **24.11.22:** - Bump develop branch to v4, rebase to Alpine 3.16.
+* **30.12.23:** - Rebase to Alpine 3.19.
+* **30.05.23:** - Rebase to Alpine 3.18.
+* **19.12.22:** - Rebase develop branch to Alpine 3.17.
+* **24.11.22:** - Bump develop branch to v4, rebase to Alpine.
 * **03.08.22:** - Deprecate armhf.
-* **02.08.22:** - Add armhf deprecation warning.
-* **28.04.22:** - Rebase master branch to mono 6.12 base (focal).
-* **20.02.22:** - Rebase develop branch to Alpine, deprecate develop-alpine branch.
-* **28.12.21:** - Add develop-alpine branch.
-* **11.05.21:** - Make the paths clearer to the user.
-* **10.03.21:** - Upgrade to Sonarr v3. Existing users are highly recommended to make a backup prior to update.
+* **02.08.22:** - Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine.
+* **20.02.22:** - Rebase develop branch to Alpine.
+* **13.12.21:** - Switch strategy for mediainfo
+* **10.02.21:** - Rebase to mono focal baseimage. Switch to v3 nightlies.
 * **18.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **05.04.20:** - Move app to /app.
 * **01.08.19:** - Rebase to Linuxserver LTS mono version.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 56c2f2c..1ca5f5f 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-sonarr
 external_type: na
-custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel==\"v4-stable\") | .version'"
-release_type: stable
-release_tag: latest
-ls_branch: master
+custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/releases | jq -r '.[] | select(.releaseChannel==\"v4-nightly\") | .version'"
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
 repo_vars:
   - BUILD_VERSION_ARG = 'SONARR_VERSION'
   - LS_USER = 'linuxserver'
@@ -15,13 +15,13 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/sonarr'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr'
-  - DIST_IMAGE = 'ubuntu'
+  - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='true'
   - CI_PORT='8989'
   - CI_SSL='false'
-  - CI_DELAY='240'
+  - CI_DELAY='120'
   - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH='/system/status'
diff --git a/package_versions.txt b/package_versions.txt
index 7b91038..f5278a8 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,184 +1,416 @@
-NAME                                                         VERSION              TYPE                    
-BouncyCastle.Cryptography                                    2.4.0                dotnet  (+5 duplicates)  
-Dapper                                                       2.0.123              dotnet  (+5 duplicates)  
-Diacritical.Net                                              1.0.4                dotnet  (+5 duplicates)  
-DryIoc.Microsoft.DependencyInjection                         6.2.0                dotnet  (+1 duplicate)   
-DryIoc.dll                                                   5.4.3                dotnet  (+7 duplicates)  
-Dynamitey                                                    2.0.9.136            dotnet  (+3 duplicates)  
-Equ                                                          2.3.0                dotnet  (+5 duplicates)  
-FluentValidation                                             9.5.4                dotnet  (+5 duplicates)  
-IPAddressRange                                               6.1.0                dotnet  (+7 duplicates)  
-Ical.Net                                                     4.3.1                dotnet  (+2 duplicates)  
-ImpromptuInterface                                           7.0.1                dotnet  (+3 duplicates)  
-Instances                                                    1.6.1                dotnet  (+5 duplicates)  
-Lib.Harmony                                                  2.3.3                dotnet  (+1 duplicate)   
-MailKit                                                      4.8.0                dotnet  (+5 duplicates)  
-Microsoft.AspNetCore.Cryptography.Internal                   6.0.21               dotnet  (+5 duplicates)  
-Microsoft.AspNetCore.Cryptography.KeyDerivation              6.0.21               dotnet  (+5 duplicates)  
-Microsoft.AspNetCore.Owin                                    6.0.21               dotnet  (+1 duplicate)   
-Microsoft.Bcl.AsyncInterfaces                                6.0.0                dotnet  (+5 duplicates)  
-Microsoft.Bcl.TimeProvider                                   8.0.0                dotnet  (+5 duplicates)  
-Microsoft.Data.SqlClient                                     2.1.7                dotnet  (+5 duplicates)  
-Microsoft.Extensions.Configuration                           6.0.0                dotnet  (+1 duplicate)   
-Microsoft.Extensions.Configuration                           6.0.1                dotnet  (+4 duplicates)  
-Microsoft.Extensions.Configuration.Abstractions              6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Configuration.Binder                    6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Configuration.CommandLine               6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Configuration.EnvironmentVariables      6.0.1                dotnet  (+6 duplicates)  
-Microsoft.Extensions.Configuration.FileExtensions            6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Configuration.Json                      6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Configuration.UserSecrets               6.0.1                dotnet  (+6 duplicates)  
-Microsoft.Extensions.DependencyInjection                     6.0.1                dotnet  (+6 duplicates)  
-Microsoft.Extensions.DependencyInjection.Abstractions        6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.DependencyInjection.Abstractions        7.0.0                dotnet  (+1 duplicate)   
-Microsoft.Extensions.FileProviders.Abstractions              6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.FileProviders.Physical                  6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.FileSystemGlobbing                      6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Hosting                                 6.0.1                dotnet  (+6 duplicates)  
-Microsoft.Extensions.Hosting.Abstractions                    6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Hosting.WindowsServices                 6.0.2                dotnet  (+7 duplicates)  
-Microsoft.Extensions.Logging                                 6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.Abstractions                    6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.Configuration                   6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.Console                         6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.Debug                           6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.EventLog                        6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Logging.EventSource                     6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Options                                 6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Options.ConfigurationExtensions         6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Extensions.Primitives                              6.0.0                dotnet  (+2 duplicates)  
-Microsoft.Identity.Client                                    4.21.1               dotnet  (+5 duplicates)  
-Microsoft.IdentityModel.JsonWebTokens                        6.8.0                dotnet  (+5 duplicates)  
-Microsoft.IdentityModel.Logging                              6.8.0                dotnet  (+5 duplicates)  
-Microsoft.IdentityModel.Protocols                            6.8.0                dotnet  (+5 duplicates)  
-Microsoft.IdentityModel.Protocols.OpenIdConnect              6.8.0                dotnet  (+5 duplicates)  
-Microsoft.IdentityModel.Tokens                               6.8.0                dotnet  (+5 duplicates)  
-Microsoft.OpenApi                                            1.6.14               dotnet  (+2 duplicates)  
-Microsoft.Win32.SystemEvents                                 6.0.0                dotnet  (+7 duplicates)  
-MimeKit                                                      4.8.0                dotnet  (+5 duplicates)  
-Mono.Nat                                                     3.0.1                dotnet  (+5 duplicates)  
-Mono.Posix.NETStandard                                       5.20.1.34-servarr24  dotnet                   
-MonoTorrent                                                  2.0.7                dotnet  (+5 duplicates)  
-NLog                                                         5.3.4                dotnet  (+7 duplicates)  
-NLog.Extensions.Logging                                      5.3.15               dotnet  (+7 duplicates)  
-NLog.Layouts.ClefJsonLayout                                  1.0.2                dotnet  (+7 duplicates)  
-NLog.Targets.Syslog                                          7.0.0                dotnet  (+7 duplicates)  
-Newtonsoft.Json                                              13.0.3               dotnet  (+7 duplicates)  
-NodaTime                                                     3.2.0                dotnet  (+2 duplicates)  
-Npgsql                                                       7.0.9                dotnet  (+5 duplicates)  
-Polly                                                        8.5.0                dotnet  (+5 duplicates)  
-Polly.Contrib.WaitAndRetry                                   1.1.1                dotnet  (+7 duplicates)  
-Polly.Core                                                   8.5.0                dotnet  (+5 duplicates)  
-ReusableTasks                                                2.0.0                dotnet  (+5 duplicates)  
-Sentry                                                       4.0.2                dotnet  (+7 duplicates)  
-Servarr.FFMpegCore                                           4.7.0-26             dotnet  (+5 duplicates)  
-Servarr.FluentMigrator                                       3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Abstractions                          3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Extensions.Oracle                     3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Extensions.Postgres                   3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Extensions.SqlAnywhere                3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Extensions.SqlServer                  3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner                                3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Core                           3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Db2                            3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Firebird                       3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Hana                           3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.MySql                          3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Oracle                         3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Postgres                       3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.Redshift                       3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.SQLite                         3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.SqlAnywhere                    3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.SqlServer                      3.3.2.9              dotnet  (+5 duplicates)  
-Servarr.FluentMigrator.Runner.SqlServerCe                    3.3.2.9              dotnet  (+5 duplicates)  
-SharpZipLib                                                  1.4.2                dotnet  (+7 duplicates)  
-SixLabors.ImageSharp                                         3.1.7                dotnet  (+5 duplicates)  
-Sonarr                                                       4.0.14               dotnet                   
-Sonarr.Api.V3                                                4.0.14               dotnet  (+2 duplicates)  
-Sonarr.Common                                                4.0.14               dotnet  (+7 duplicates)  
-Sonarr.Core                                                  4.0.14               dotnet  (+5 duplicates)  
-Sonarr.Host                                                  4.0.14               dotnet  (+1 duplicate)   
-Sonarr.Http                                                  4.0.14               dotnet  (+3 duplicates)  
-Sonarr.Mono                                                  4.0.14               dotnet                   
-Sonarr.RuntimePatches                                        4.0.14               dotnet  (+1 duplicate)   
-Sonarr.SignalR                                               4.0.14               dotnet  (+4 duplicates)  
-Swashbuckle.AspNetCore.Annotations                           6.6.2                dotnet  (+2 duplicates)  
-Swashbuckle.AspNetCore.Swagger                               6.6.2                dotnet  (+2 duplicates)  
-Swashbuckle.AspNetCore.SwaggerGen                            6.6.2                dotnet  (+2 duplicates)  
-System.Configuration.ConfigurationManager                    6.0.1                dotnet  (+7 duplicates)  
-System.Data.SQLite.Core.Servarr                              1.0.115.5-18         dotnet  (+7 duplicates)  
-System.Diagnostics.EventLog                                  6.0.0                dotnet  (+2 duplicates)  
-System.Drawing.Common                                        6.0.0                dotnet  (+7 duplicates)  
-System.Formats.Asn1                                          8.0.1                dotnet  (+5 duplicates)  
-System.IdentityModel.Tokens.Jwt                              6.8.0                dotnet  (+5 duplicates)  
-System.Runtime.Caching                                       4.7.0                dotnet  (+5 duplicates)  
-System.Security.Cryptography.Pkcs                            8.0.0                dotnet  (+5 duplicates)  
-System.Security.Cryptography.ProtectedData                   6.0.0                dotnet  (+7 duplicates)  
-System.Security.Permissions                                  6.0.0                dotnet  (+7 duplicates)  
-System.ServiceProcess.ServiceController                      6.0.1                dotnet  (+7 duplicates)  
-System.Text.Json                                             6.0.10               dotnet  (+7 duplicates)  
-System.Text.Json                                             6.0.9                dotnet                   
-System.Windows.Extensions                                    6.0.0                dotnet  (+7 duplicates)  
-acl-libs                                                     2.3.2-r1             apk                      
-alpine-baselayout                                            3.6.8-r1             apk                      
-alpine-baselayout-data                                       3.6.8-r1             apk                      
-alpine-keys                                                  2.5-r0               apk                      
-alpine-release                                               3.21.3-r0            apk                      
-apk-tools                                                    2.14.6-r3            apk                      
-bash                                                         5.2.37-r0            apk                      
-brotli-libs                                                  1.1.0-r2             apk                      
-busybox                                                      1.37.0-r12           apk                      
-busybox-binsh                                                1.37.0-r12           apk                      
-c-ares                                                       1.34.5-r0            apk                      
-ca-certificates                                              20241121-r1          apk                      
-ca-certificates-bundle                                       20241121-r1          apk                      
-catatonit                                                    0.2.0-r0             apk                      
-coreutils                                                    9.5-r2               apk                      
-coreutils-env                                                9.5-r2               apk                      
-coreutils-fmt                                                9.5-r2               apk                      
-coreutils-sha512sum                                          9.5-r2               apk                      
-curl                                                         8.12.1-r1            apk                      
-findutils                                                    4.10.0-r0            apk                      
-icu-data-en                                                  74.2-r0              apk                      
-icu-libs                                                     74.2-r0              apk                      
-jq                                                           1.7.1-r0             apk                      
-libattr                                                      2.5.2-r2             apk                      
-libbsd                                                       0.12.2-r0            apk                      
-libcrypto3                                                   3.3.3-r0             apk                      
-libcurl                                                      8.12.1-r1            apk                      
-libgcc                                                       14.2.0-r4            apk                      
-libgcrypt                                                    1.10.3-r1            apk                      
-libgpg-error                                                 1.51-r0              apk                      
-libidn2                                                      2.3.7-r0             apk                      
-libintl                                                      0.22.5-r0            apk                      
-libmd                                                        1.1.0-r0             apk                      
-libncursesw                                                  6.5_p20241006-r3     apk                      
-libproc2                                                     4.0.4-r2             apk                      
-libpsl                                                       0.21.5-r3            apk                      
-libssl3                                                      3.3.3-r0             apk                      
-libstdc++                                                    14.2.0-r4            apk                      
-libunistring                                                 1.2-r0               apk                      
-libxml2                                                      2.13.4-r5            apk                      
-libxslt                                                      1.1.42-r2            apk                      
-linux-pam                                                    1.6.1-r1             apk                      
-musl                                                         1.2.5-r9             apk                      
-musl-utils                                                   1.2.5-r9             apk                      
-ncurses-terminfo-base                                        6.5_p20241006-r3     apk                      
-netcat-openbsd                                               1.226.1.1-r0         apk                      
-nghttp2-libs                                                 1.64.0-r0            apk                      
-oniguruma                                                    6.9.9-r0             apk                      
-procps-ng                                                    4.0.4-r2             apk                      
-readline                                                     8.2.13-r0            apk                      
-runtimepack.Microsoft.AspNetCore.App.Runtime.linux-musl-x64  6.0.13               dotnet                   
-runtimepack.Microsoft.NETCore.App.Runtime.linux-musl-x64     6.0.13               dotnet                   
-scanelf                                                      1.3.8-r1             apk                      
-shadow                                                       4.16.0-r1            apk                      
-skalibs-libs                                                 2.14.3.0-r0          apk                      
-sqlite-libs                                                  3.48.0-r1            apk                      
-ssl_client                                                   1.37.0-r12           apk                      
-tzdata                                                       2025b-r0             apk                      
-utmps-libs                                                   0.1.2.3-r2           apk                      
-xmlstarlet                                                   1.6.1-r2             apk                      
-xz-libs                                                      5.6.3-r1             apk                      
-zlib                                                         1.3.1-r2             apk                      
-zstd-libs                                                    1.5.6-r2             apk                      
+NAME                                                        VERSION                                                     TYPE                     
+Bouncy Castle for .NET (netstandard2.0)                     1.9.0.1                                                     dotnet                    
+Dapper                                                      2.0.123.33578                                               dotnet                    
+Diacritical                                                 1.0.4.0                                                     dotnet                    
+DryIoc                                                      5.4.3.0                                                     dotnet                    
+DryIoc.Microsoft.DependencyInjection net6.0                 6.2.0.0                                                     dotnet                    
+Dynamitey                                                   2.0.9.136                                                   dotnet                    
+Equ                                                         2.3.0                                                       dotnet                    
+FFMpegCore                                                  4.0.0.0                                                     dotnet                    
+FluentMigrator                                              3.3.2.9                                                     dotnet  (+19 duplicates)  
+FluentValidation                                            9.5.4.0                                                     dotnet                    
+Harmony                                                     2.0.1.0                                                     dotnet                    
+ICSharpCode.SharpZipLib                                     1.4.2.13                                                    dotnet                    
+Ical.Net                                                    1.0.0.0                                                     dotnet                    
+ImpromptuInterface                                          7.0.1.0                                                     dotnet                    
+Instances                                                   1.0.0.0                                                     dotnet                    
+Json.NET                                                    13.0.3.27908                                                dotnet                    
+MailKit                                                     3.6.0.0                                                     dotnet                    
+Microsoft.AspNetCore                                        6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Antiforgery                            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authentication                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authentication.Abstractions            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authentication.Cookies                 6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authentication.Core                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authentication.OAuth                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authorization                          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Authorization.Policy                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Components                             6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Components.Authorization               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Components.Forms                       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Components.Server                      6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Components.Web                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Connections.Abstractions               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.CookiePolicy                           6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Cors                                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Cryptography.Internal                  6.0.2123.36438                                              dotnet                    
+Microsoft.AspNetCore.Cryptography.KeyDerivation             6.0.2123.36438                                              dotnet                    
+Microsoft.AspNetCore.DataProtection                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.DataProtection.Abstractions            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.DataProtection.Extensions              6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Diagnostics                            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Diagnostics.Abstractions               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Diagnostics.HealthChecks               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.HostFiltering                          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Hosting                                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Hosting.Abstractions                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Hosting.Server.Abstractions            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Html.Abstractions                      6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http                                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Abstractions                      6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Connections                       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Connections.Common                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Extensions                        6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Features                          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Http.Results                           6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.HttpLogging                            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.HttpOverrides                          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.HttpsPolicy                            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Identity                               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Localization                           6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Localization.Routing                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Metadata                               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc                                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Abstractions                       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.ApiExplorer                        6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Core                               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Cors                               6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.DataAnnotations                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Formatters.Json                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Formatters.Xml                     6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Localization                       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.Razor                              6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.RazorPages                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.TagHelpers                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Mvc.ViewFeatures                       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Owin                                   6.0.2123.36438                                              dotnet                    
+Microsoft.AspNetCore.Razor                                  6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Razor.Runtime                          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.ResponseCaching                        6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.ResponseCaching.Abstractions           6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.ResponseCompression                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Rewrite                                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Routing                                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Routing.Abstractions                   6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.HttpSys                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.IIS                             6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.IISIntegration                  6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.Kestrel                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.Kestrel.Core                    6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.Kestrel.Transport.Quic          6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets       6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.Session                                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.SignalR                                6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.SignalR.Common                         6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.SignalR.Core                           6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.SignalR.Protocols.Json                 6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.StaticFiles                            6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.WebSockets                             6.0.1322.58013                                              dotnet                    
+Microsoft.AspNetCore.WebUtilities                           6.0.1322.58013                                              dotnet                    
+Microsoft.Bcl.AsyncInterfaces                               6.0.21.52210                                                dotnet                    
+Microsoft.Bcl.TimeProvider                                  8.0.23.53103                                                dotnet                    
+Microsoft.CSharp                                            6.0.1322.58009                                              dotnet                    
+Microsoft.Data.SqlClient                                    2.1.2+2a61e8301e9d21ada2338a9279cf27653e781757              dotnet                    
+Microsoft.Extensions.Caching.Abstractions                   6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Caching.Memory                         6.0.222.6406                                                dotnet                    
+Microsoft.Extensions.Configuration                          6.0.322.12309                                               dotnet                    
+Microsoft.Extensions.Configuration.Abstractions             6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.Binder                   6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.CommandLine              6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.EnvironmentVariables     6.0.222.6406                                                dotnet                    
+Microsoft.Extensions.Configuration.FileExtensions           6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.Ini                      6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.Json                     6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Configuration.KeyPerFile               6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Configuration.UserSecrets              6.0.222.6406                                                dotnet                    
+Microsoft.Extensions.Configuration.Xml                      6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.DependencyInjection                    6.0.1022.47605                                              dotnet                    
+Microsoft.Extensions.DependencyInjection.Abstractions       7.0.22.51805                                                dotnet                    
+Microsoft.Extensions.Diagnostics.HealthChecks               6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions  6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Features                               6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.FileProviders.Abstractions             6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.FileProviders.Composite                6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.FileProviders.Embedded                 6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.FileProviders.Physical                 6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.FileSystemGlobbing                     6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Hosting                                6.0.222.6406                                                dotnet                    
+Microsoft.Extensions.Hosting.Abstractions                   6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Hosting.WindowsServices                6.0.1823.26907                                              dotnet                    
+Microsoft.Extensions.Http                                   6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Identity.Core                          6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Identity.Stores                        6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Localization                           6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Localization.Abstractions              6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Logging                                6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.Abstractions                   6.0.1122.52304                                              dotnet                    
+Microsoft.Extensions.Logging.Configuration                  6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.Console                        6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.Debug                          6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.EventLog                       6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.EventSource                    6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Logging.TraceSource                    6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.ObjectPool                             6.0.1322.58013                                              dotnet                    
+Microsoft.Extensions.Options                                6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Options.ConfigurationExtensions        6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Options.DataAnnotations                6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.Primitives                             6.0.21.52210                                                dotnet                    
+Microsoft.Extensions.WebEncoders                            6.0.1322.58013                                              dotnet                    
+Microsoft.Identity.Client                                   4.21.1.0                                                    dotnet                    
+Microsoft.IdentityModel.JsonWebTokens                       6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+Microsoft.IdentityModel.Logging                             6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+Microsoft.IdentityModel.Protocols                           6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+Microsoft.IdentityModel.Protocols.OpenIdConnect             6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+Microsoft.IdentityModel.Tokens                              6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+Microsoft.JSInterop                                         6.0.1322.58013                                              dotnet                    
+Microsoft.Net.Http.Headers                                  6.0.1322.58013                                              dotnet                    
+Microsoft.OpenApi                                           1.6.14.0                                                    dotnet                    
+Microsoft.VisualBasic                                       6.0.1322.58009                                              dotnet                    
+Microsoft.VisualBasic.Core                                  11.100.1322.58009                                           dotnet                    
+Microsoft.Win32.Primitives                                  6.0.1322.58009                                              dotnet                    
+Microsoft.Win32.Registry                                    6.0.1322.58009                                              dotnet                    
+Microsoft.Win32.SystemEvents                                6.0.21.52210                                                dotnet                    
+MimeKit                                                     3.6.0.0                                                     dotnet                    
+Mono.Cecil                                                  0.11.2.0                                                    dotnet  (+3 duplicates)   
+Mono.Nat                                                    3.0.1                                                       dotnet                    
+Mono.Posix.NETStandard                                      1.0.0.0                                                     dotnet                    
+MonoMod.Common                                              20.05.07.01+b18b2bddebe81992d218ea7e1f41aa1923459652        dotnet                    
+MonoTorrent                                                 2.0.7                                                       dotnet                    
+NLog v4.7.14                                                4.7.14.740                                                  dotnet                    
+NLog.Extensions.Logging v1.7.4                              1.7.4.1610                                                  dotnet                    
+NLog.Targets.Syslog                                         6.0.3.0                                                     dotnet                    
+NodaTime                                                    3.0.0.0                                                     dotnet                    
+Npgsql                                                      7.0.7.0                                                     dotnet                    
+Polly                                                       8.3.1.3207                                                  dotnet                    
+Polly.Core                                                  8.3.1.3207                                                  dotnet                    
+ReusableTasks                                               2.0.0                                                       dotnet                    
+Sentry                                                      4.0.2.0                                                     dotnet                    
+SixLabors.ImageSharp                                        3.1.4.0                                                     dotnet                    
+Sonarr                                                      4.0.8.1893                                                  dotnet  (+8 duplicates)   
+Swashbuckle.AspNetCore.Annotations                          6.6.2.401                                                   dotnet                    
+Swashbuckle.AspNetCore.Swagger                              6.6.2.401                                                   dotnet                    
+Swashbuckle.AspNetCore.SwaggerGen                           6.6.2.401                                                   dotnet                    
+System                                                      6.0.1322.58009                                              dotnet                    
+System.AppContext                                           6.0.1322.58009                                              dotnet                    
+System.Buffers                                              6.0.1322.58009                                              dotnet                    
+System.Collections                                          6.0.1322.58009                                              dotnet                    
+System.Collections.Concurrent                               6.0.1322.58009                                              dotnet                    
+System.Collections.Immutable                                6.0.1322.58009                                              dotnet                    
+System.Collections.NonGeneric                               6.0.1322.58009                                              dotnet                    
+System.Collections.Specialized                              6.0.1322.58009                                              dotnet                    
+System.ComponentModel                                       6.0.1322.58009                                              dotnet                    
+System.ComponentModel.Annotations                           6.0.1322.58009                                              dotnet                    
+System.ComponentModel.DataAnnotations                       6.0.1322.58009                                              dotnet                    
+System.ComponentModel.EventBasedAsync                       6.0.1322.58009                                              dotnet                    
+System.ComponentModel.Primitives                            6.0.1322.58009                                              dotnet                    
+System.ComponentModel.TypeConverter                         6.0.1322.58009                                              dotnet                    
+System.Configuration                                        6.0.1322.58009                                              dotnet                    
+System.Configuration.ConfigurationManager                   6.0.922.41905                                               dotnet                    
+System.Console                                              6.0.1322.58009                                              dotnet                    
+System.Core                                                 6.0.1322.58009                                              dotnet                    
+System.Data                                                 6.0.1322.58009                                              dotnet                    
+System.Data.Common                                          6.0.1322.58009                                              dotnet                    
+System.Data.DataSetExtensions                               6.0.1322.58009                                              dotnet                    
+System.Data.SQLite                                          1.0.115.5                                                   dotnet                    
+System.Data.SqlServerCe                                     4.0.8876.1                                                  dotnet                    
+System.Diagnostics.Contracts                                6.0.1322.58009                                              dotnet                    
+System.Diagnostics.Debug                                    6.0.1322.58009                                              dotnet                    
+System.Diagnostics.DiagnosticSource                         6.0.1322.58009                                              dotnet                    
+System.Diagnostics.EventLog                                 6.0.21.52210                                                dotnet                    
+System.Diagnostics.FileVersionInfo                          6.0.1322.58009                                              dotnet                    
+System.Diagnostics.Process                                  6.0.1322.58009                                              dotnet                    
+System.Diagnostics.StackTrace                               6.0.1322.58009                                              dotnet                    
+System.Diagnostics.TextWriterTraceListener                  6.0.1322.58009                                              dotnet                    
+System.Diagnostics.Tools                                    6.0.1322.58009                                              dotnet                    
+System.Diagnostics.TraceSource                              6.0.1322.58009                                              dotnet                    
+System.Diagnostics.Tracing                                  6.0.1322.58009                                              dotnet                    
+System.Drawing                                              6.0.1322.58009                                              dotnet                    
+System.Drawing.Common                                       6.0.21.52210                                                dotnet                    
+System.Drawing.Primitives                                   6.0.1322.58009                                              dotnet                    
+System.Dynamic.Runtime                                      6.0.1322.58009                                              dotnet                    
+System.Formats.Asn1                                         6.0.1322.58009                                              dotnet                    
+System.Globalization                                        6.0.1322.58009                                              dotnet                    
+System.Globalization.Calendars                              6.0.1322.58009                                              dotnet                    
+System.Globalization.Extensions                             6.0.1322.58009                                              dotnet                    
+System.IO                                                   6.0.1322.58009                                              dotnet                    
+System.IO.Compression                                       6.0.1322.58009                                              dotnet                    
+System.IO.Compression.Brotli                                6.0.1322.58009                                              dotnet                    
+System.IO.Compression.FileSystem                            6.0.1322.58009                                              dotnet                    
+System.IO.Compression.ZipFile                               6.0.1322.58009                                              dotnet                    
+System.IO.FileSystem                                        6.0.1322.58009                                              dotnet                    
+System.IO.FileSystem.AccessControl                          6.0.1322.58009                                              dotnet                    
+System.IO.FileSystem.DriveInfo                              6.0.1322.58009                                              dotnet                    
+System.IO.FileSystem.Primitives                             6.0.1322.58009                                              dotnet                    
+System.IO.FileSystem.Watcher                                6.0.1322.58009                                              dotnet                    
+System.IO.IsolatedStorage                                   6.0.1322.58009                                              dotnet                    
+System.IO.MemoryMappedFiles                                 6.0.1322.58009                                              dotnet                    
+System.IO.Pipelines                                         6.0.522.21309                                               dotnet                    
+System.IO.Pipes                                             6.0.1322.58009                                              dotnet                    
+System.IO.Pipes.AccessControl                               6.0.1322.58009                                              dotnet                    
+System.IO.UnmanagedMemoryStream                             6.0.1322.58009                                              dotnet                    
+System.IdentityModel.Tokens.Jwt                             6.8.0.11012235604.824068adaeb7b158df2b36d8787f689646e715e0  dotnet                    
+System.Linq                                                 6.0.1322.58009                                              dotnet                    
+System.Linq.Expressions                                     6.0.1322.58009                                              dotnet                    
+System.Linq.Parallel                                        6.0.1322.58009                                              dotnet                    
+System.Linq.Queryable                                       6.0.1322.58009                                              dotnet                    
+System.Memory                                               6.0.1322.58009                                              dotnet                    
+System.Net                                                  6.0.1322.58009                                              dotnet                    
+System.Net.Http                                             6.0.1322.58009                                              dotnet                    
+System.Net.Http.Json                                        6.0.1322.58009                                              dotnet                    
+System.Net.HttpListener                                     6.0.1322.58009                                              dotnet                    
+System.Net.Mail                                             6.0.1322.58009                                              dotnet                    
+System.Net.NameResolution                                   6.0.1322.58009                                              dotnet                    
+System.Net.NetworkInformation                               6.0.1322.58009                                              dotnet                    
+System.Net.Ping                                             6.0.1322.58009                                              dotnet                    
+System.Net.Primitives                                       6.0.1322.58009                                              dotnet                    
+System.Net.Quic                                             6.0.1322.58009                                              dotnet                    
+System.Net.Requests                                         6.0.1322.58009                                              dotnet                    
+System.Net.Security                                         6.0.1322.58009                                              dotnet                    
+System.Net.ServicePoint                                     6.0.1322.58009                                              dotnet                    
+System.Net.Sockets                                          6.0.1322.58009                                              dotnet                    
+System.Net.WebClient                                        6.0.1322.58009                                              dotnet                    
+System.Net.WebHeaderCollection                              6.0.1322.58009                                              dotnet                    
+System.Net.WebProxy                                         6.0.1322.58009                                              dotnet                    
+System.Net.WebSockets                                       6.0.1322.58009                                              dotnet                    
+System.Net.WebSockets.Client                                6.0.1322.58009                                              dotnet                    
+System.Numerics                                             6.0.1322.58009                                              dotnet                    
+System.Numerics.Vectors                                     6.0.1322.58009                                              dotnet                    
+System.ObjectModel                                          6.0.1322.58009                                              dotnet                    
+System.Private.CoreLib                                      6.0.1322.58009                                              dotnet                    
+System.Private.DataContractSerialization                    6.0.1322.58009                                              dotnet                    
+System.Private.Uri                                          6.0.1322.58009                                              dotnet                    
+System.Private.Xml                                          6.0.1322.58009                                              dotnet                    
+System.Private.Xml.Linq                                     6.0.1322.58009                                              dotnet                    
+System.Reflection                                           6.0.1322.58009                                              dotnet                    
+System.Reflection.DispatchProxy                             6.0.1322.58009                                              dotnet                    
+System.Reflection.Emit                                      6.0.1322.58009                                              dotnet                    
+System.Reflection.Emit.ILGeneration                         6.0.1322.58009                                              dotnet                    
+System.Reflection.Emit.Lightweight                          6.0.1322.58009                                              dotnet                    
+System.Reflection.Extensions                                6.0.1322.58009                                              dotnet                    
+System.Reflection.Metadata                                  6.0.1322.58009                                              dotnet                    
+System.Reflection.Primitives                                6.0.1322.58009                                              dotnet                    
+System.Reflection.TypeExtensions                            6.0.1322.58009                                              dotnet                    
+System.Resources.Reader                                     6.0.1322.58009                                              dotnet                    
+System.Resources.ResourceManager                            6.0.1322.58009                                              dotnet                    
+System.Resources.Writer                                     6.0.1322.58009                                              dotnet                    
+System.Runtime                                              6.0.1322.58009                                              dotnet                    
+System.Runtime.Caching                                      4.700.19.56404                                              dotnet                    
+System.Runtime.CompilerServices.VisualC                     6.0.1322.58009                                              dotnet                    
+System.Runtime.Extensions                                   6.0.1322.58009                                              dotnet                    
+System.Runtime.Handles                                      6.0.1322.58009                                              dotnet                    
+System.Runtime.InteropServices                              6.0.1322.58009                                              dotnet                    
+System.Runtime.InteropServices.RuntimeInformation           6.0.1322.58009                                              dotnet                    
+System.Runtime.Intrinsics                                   6.0.1322.58009                                              dotnet                    
+System.Runtime.Loader                                       6.0.1322.58009                                              dotnet                    
+System.Runtime.Numerics                                     6.0.1322.58009                                              dotnet                    
+System.Runtime.Serialization                                6.0.1322.58009                                              dotnet                    
+System.Runtime.Serialization.Formatters                     6.0.1322.58009                                              dotnet                    
+System.Runtime.Serialization.Json                           6.0.1322.58009                                              dotnet                    
+System.Runtime.Serialization.Primitives                     6.0.1322.58009                                              dotnet                    
+System.Runtime.Serialization.Xml                            6.0.1322.58009                                              dotnet                    
+System.Security                                             6.0.1322.58009                                              dotnet                    
+System.Security.AccessControl                               6.0.1322.58009                                              dotnet                    
+System.Security.Claims                                      6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Algorithms                     6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Cng                            6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Csp                            6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Encoding                       6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.OpenSsl                        6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Pkcs                           6.0.522.21309                                               dotnet                    
+System.Security.Cryptography.Primitives                     6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.ProtectedData                  6.0.21.52210                                                dotnet                    
+System.Security.Cryptography.X509Certificates               6.0.1322.58009                                              dotnet                    
+System.Security.Cryptography.Xml                            6.0.822.36306                                               dotnet                    
+System.Security.Permissions                                 6.0.21.52210                                                dotnet                    
+System.Security.Principal                                   6.0.1322.58009                                              dotnet                    
+System.Security.Principal.Windows                           6.0.1322.58009                                              dotnet                    
+System.Security.SecureString                                6.0.1322.58009                                              dotnet                    
+System.ServiceModel.Web                                     6.0.1322.58009                                              dotnet                    
+System.ServiceProcess                                       6.0.1322.58009                                              dotnet                    
+System.ServiceProcess.ServiceController                     6.0.1823.26907                                              dotnet                    
+System.Text.Encoding                                        6.0.1322.58009                                              dotnet                    
+System.Text.Encoding.CodePages                              6.0.1322.58009                                              dotnet                    
+System.Text.Encoding.Extensions                             6.0.1322.58009                                              dotnet                    
+System.Text.Encodings.Web                                   6.0.1322.58009                                              dotnet                    
+System.Text.Json                                            6.0.2523.51912                                              dotnet                    
+System.Text.RegularExpressions                              6.0.1322.58009                                              dotnet                    
+System.Threading                                            6.0.1322.58009                                              dotnet                    
+System.Threading.Channels                                   6.0.1322.58009                                              dotnet                    
+System.Threading.Overlapped                                 6.0.1322.58009                                              dotnet                    
+System.Threading.Tasks                                      6.0.1322.58009                                              dotnet                    
+System.Threading.Tasks.Dataflow                             6.0.1322.58009                                              dotnet                    
+System.Threading.Tasks.Extensions                           6.0.1322.58009                                              dotnet                    
+System.Threading.Tasks.Parallel                             6.0.1322.58009                                              dotnet                    
+System.Threading.Thread                                     6.0.1322.58009                                              dotnet                    
+System.Threading.ThreadPool                                 6.0.1322.58009                                              dotnet                    
+System.Threading.Timer                                      6.0.1322.58009                                              dotnet                    
+System.Transactions                                         6.0.1322.58009                                              dotnet                    
+System.Transactions.Local                                   6.0.1322.58009                                              dotnet                    
+System.ValueTuple                                           6.0.1322.58009                                              dotnet                    
+System.Web                                                  6.0.1322.58009                                              dotnet                    
+System.Web.HttpUtility                                      6.0.1322.58009                                              dotnet                    
+System.Windows                                              6.0.1322.58009                                              dotnet                    
+System.Windows.Extensions                                   6.0.21.52210                                                dotnet                    
+System.Xml                                                  6.0.1322.58009                                              dotnet                    
+System.Xml.Linq                                             6.0.1322.58009                                              dotnet                    
+System.Xml.ReaderWriter                                     6.0.1322.58009                                              dotnet                    
+System.Xml.Serialization                                    6.0.1322.58009                                              dotnet                    
+System.Xml.XDocument                                        6.0.1322.58009                                              dotnet                    
+System.Xml.XPath                                            6.0.1322.58009                                              dotnet                    
+System.Xml.XPath.XDocument                                  6.0.1322.58009                                              dotnet                    
+System.Xml.XmlDocument                                      6.0.1322.58009                                              dotnet                    
+System.Xml.XmlSerializer                                    6.0.1322.58009                                              dotnet                    
+WindowsBase                                                 6.0.1322.58009                                              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.1-r0                                                   apk                       
+apk-tools                                                   2.14.4-r0                                                   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.28.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.8.0-r0                                                    apk                       
+findutils                                                   4.9.0-r5                                                    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                       
+libbsd                                                      0.12.2-r0                                                   apk                       
+libcrypto3                                                  3.3.1-r3                                                    apk                       
+libcurl                                                     8.8.0-r0                                                    apk                       
+libgcc                                                      13.2.1_git20240309-r0                                       apk                       
+libgcrypt                                                   1.10.3-r0                                                   apk                       
+libgpg-error                                                1.49-r0                                                     apk                       
+libidn2                                                     2.3.7-r0                                                    apk                       
+libintl                                                     0.22.5-r0                                                   apk                       
+libmd                                                       1.1.0-r0                                                    apk                       
+libncursesw                                                 6.4_p20240420-r0                                            apk                       
+libproc2                                                    4.0.4-r0                                                    apk                       
+libpsl                                                      0.21.5-r1                                                   apk                       
+libssl3                                                     3.3.1-r3                                                    apk                       
+libstdc++                                                   13.2.1_git20240309-r0                                       apk                       
+libunistring                                                1.2-r0                                                      apk                       
+libxml2                                                     2.12.7-r0                                                   apk                       
+libxslt                                                     1.1.39-r1                                                   apk                       
+linux-pam                                                   1.6.0-r0                                                    apk                       
+mscorlib                                                    6.0.1322.58009                                              dotnet                    
+musl                                                        1.2.5-r0                                                    apk                       
+musl-utils                                                  1.2.5-r0                                                    apk                       
+ncurses-terminfo-base                                       6.4_p20240420-r0                                            apk                       
+netcat-openbsd                                              1.226-r0                                                    apk                       
+netstandard                                                 6.0.1322.58009                                              dotnet                    
+nghttp2-libs                                                1.62.1-r0                                                   apk                       
+oniguruma                                                   6.9.9-r0                                                    apk                       
+procps-ng                                                   4.0.4-r0                                                    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                                                      2024a-r1                                                    apk                       
+utmps-libs                                                  0.1.2.2-r1                                                  apk                       
+xmlstarlet                                                  1.6.1-r2                                                    apk                       
+xz-libs                                                     5.6.1-r3                                                    apk                       
+zlib                                                        1.3.1-r1                                                    apk                       
+zstd-libs                                                   1.5.6-r0                                                    apk                       
diff --git a/readme-vars.yml b/readme-vars.yml
index 76cdc0a..fd2ee37 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -7,30 +7,35 @@ project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/ma
 project_blurb: |
   [{{ project_name|capitalize }}]({{ project_url }}) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_categories: "Media Management"
+
 # supported architectures
 available_architectures:
-  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+
 # development version
 development_versions: true
 development_versions_items:
-  - {tag: "latest", desc: "Stable releases from Sonarr"}
-  - {tag: "develop", desc: "Development releases from Sonarr"}
+  - { tag: "latest", desc: "Stable releases from Sonarr (currently v4)" }
+  - { tag: "develop", desc: "Development releases from Sonarr (currently v4)" }
+
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and sonarr configs"}
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and Sonarr configs" }
+
 opt_param_usage_include_vols: true
 opt_param_volumes:
-  - {vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Location of TV library on disk (See note in Application setup)"}
-  - {vol_path: "/downloads", vol_host_path: "/path/to/downloadclient-downloads", desc: "Location of download managers output directory (See note in Application setup)"}
+  - { vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of TV library on disk" }
+  - { vol_path: "/downloads", vol_host_path: "/path/to/download-client-downloads", desc: "Location of download managers output directory" }
+
 param_usage_include_ports: true
 param_ports:
-  - {external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr web interface"}
+  - { external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr web interface" }
+
 readonly_supported: true
-nonroot_supported: true
+
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -43,78 +48,36 @@ app_setup_block: |
   Use the optional paths if you don't understand, or don't want hardlinks/atomic moves.
 
   The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this.
-# init diagram
-init_diagram: |
-  "sonarr:latest": {
-    docker-mods
-    base {
-      fix-attr +\nlegacy cont-init
-    }
-    docker-mods -> base
-    legacy-services
-    custom services
-    init-services -> legacy-services
-    init-services -> custom services
-    custom services -> legacy-services
-    legacy-services -> ci-service-check
-    init-migrations -> init-adduser
-    init-os-end -> init-config
-    init-config -> init-config-end
-    init-crontab-config -> init-config-end
-    init-sonarr-config -> init-config-end
-    init-config -> init-crontab-config
-    init-mods-end -> init-custom-files
-    base -> init-envfile
-    base -> init-migrations
-    init-config-end -> init-mods
-    init-mods-package-install -> init-mods-end
-    init-mods -> init-mods-package-install
-    init-adduser -> init-os-end
-    init-envfile -> init-os-end
-    init-custom-files -> init-services
-    init-config -> init-sonarr-config
-    init-services -> svc-cron
-    svc-cron -> legacy-services
-    init-services -> svc-sonarr
-    svc-sonarr -> legacy-services
-  }
-  Base Images: {
-    "baseimage-alpine:3.21"
-  }
-  "sonarr:latest" <- Base Images
+
 # changelog
 changelogs:
-  - {date: "09.01.25:", desc: "Fix rootless entrypoint."}
-  - {date: "23.12.24:", desc: "Rebase Alpine 3.21."}
-  - {date: "31.05.24:", desc: "Rebase Alpine 3.20."}
-  - {date: "12.01.24:", desc: "Update download url."}
-  - {date: "30.12.23:", desc: "Rebase master branch to Alpine 3.19."}
-  - {date: "15.02.23:", desc: "Rebase master branch to Jammy."}
-  - {date: "19.12.22:", desc: "Rebase develop branch Alpine 3.17."}
-  - {date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine 3.16."}
-  - {date: "03.08.22:", desc: "Deprecate armhf."}
-  - {date: "02.08.22:", desc: "Add armhf deprecation warning."}
-  - {date: "28.04.22:", desc: "Rebase master branch to mono 6.12 base (focal)."}
-  - {date: "20.02.22:", desc: "Rebase develop branch to Alpine, deprecate develop-alpine branch."}
-  - {date: "28.12.21:", desc: "Add develop-alpine branch."}
-  - {date: "11.05.21:", desc: "Make the paths clearer to the user."}
-  - {date: "10.03.21:", desc: "Upgrade to Sonarr v3. Existing users are highly recommended to make a backup prior to update."}
-  - {date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."}
-  - {date: "05.04.20:", desc: "Move app to /app."}
-  - {date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version."}
-  - {date: "13.06.19:", desc: "Add env variable for setting umask."}
-  - {date: "10.05.19:", desc: "Rebase to Bionic."}
-  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - {date: "01.02.19:", desc: "Multi arch images and pipeline build logic"}
-  - {date: "15.12.17:", desc: "Fix continuation lines."}
-  - {date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push."}
-  - {date: "17.04.17:", desc: "Switch to using inhouse mono baseimage, adds python also."}
-  - {date: "14.04.17:", desc: "Change to mount /etc/localtime in README, thanks cbgj."}
-  - {date: "13.04.17:", desc: "Switch to official mono repository."}
-  - {date: "30.09.16:", desc: "Fix umask"}
-  - {date: "23.09.16:", desc: "Add cd to /opt fixes redirects with althub (issue #25), make XDG config environment variable"}
-  - {date: "15.09.16:", desc: "Add libcurl3 package."}
-  - {date: "09.09.16:", desc: "Add layer badges to README."}
-  - {date: "27.08.16:", desc: "Add badges to README."}
-  - {date: "20.07.16:", desc: "Rebase to xenial."}
-  - {date: "31.08.15:", desc: "Cleanup, changed sources to fetch binarys from. also a new baseimage."}
+  - { date: "25.05.24:", desc: "Rebase to Alpine 3.20." }
+  - { date: "12.01.24:", desc: "Update download url." }
+  - { date: "30.12.23:", desc: "Rebase to Alpine 3.19." }
+  - { date: "30.05.23:", desc: "Rebase to Alpine 3.18." }
+  - { date: "19.12.22:", desc: "Rebase develop branch to Alpine 3.17." }
+  - { date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine." }
+  - { date: "03.08.22:", desc: "Deprecate armhf." }
+  - { date: "02.08.22:", desc: "Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine." }
+  - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
+  - { date: "13.12.21:", desc: "Switch strategy for mediainfo" }
+  - { date: "10.02.21:", desc: "Rebase to mono focal baseimage. Switch to v3 nightlies." }
+  - { date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
+  - { date: "05.04.20:", desc: "Move app to /app." }
+  - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
+  - { date: "13.06.19:", desc: "Add env variable for setting umask." }
+  - { date: "10.05.19:", desc: "Rebase to Bionic." }
+  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
+  - { date: "01.02.19:", desc: "Multi arch images and pipeline build logic" }
+  - { date: "15.12.17:", desc: "Fix continuation lines." }
+  - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." }
+  - { date: "17.04.17:", desc: "Switch to using inhouse mono baseimage, adds python also." }
+  - { date: "14.04.17:", desc: "Change to mount /etc/localtime in README, thanks cbgj." }
+  - { date: "13.04.17:", desc: "Switch to official mono repository." }
+  - { date: "30.09.16:", desc: "Fix umask" }
+  - { date: "23.09.16:", desc: "Add cd to /opt fixes redirects with althub (issue #25), make XDG config environment variable" }
+  - { date: "15.09.16:", desc: "Add libcurl3 package." }
+  - { date: "09.09.16:", desc: "Add layer badges to README." }
+  - { date: "27.08.16:", desc: "Add badges to README." }
+  - { date: "20.07.16:", desc: "Rebase to xenial." }
+  - { date: "31.08.15:", desc: "Cleanup, changed sources to fetch binarys from. also a new baseimage." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
index 8bb2504..1272a88 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
@@ -3,8 +3,7 @@
 
 mkdir -p /run/sonarr-temp
 
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    lsiown -R abc:abc \
-        /config \
-        /run/sonarr-temp
-fi
+# permissions
+lsiown -R abc:abc \
+    /config \
+    /run/sonarr-temp
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run
index 530c188..9dd8c24 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run
@@ -1,14 +1,7 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    exec \
-        s6-notifyoncheck -d -n 300 -w 1000 \
-            cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
-            -nobrowser -data=/config
-else
-    exec \
-        s6-notifyoncheck -d -n 300 -w 1000 \
-            cd /app/sonarr/bin /app/sonarr/bin/Sonarr \
-            -nobrowser -data=/config
-fi
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 \
+        cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
+        -nobrowser -data=/config