2026-02-20 04:56:23 +08:00
22 changed files with 736 additions and 1432 deletions
--- a/.editorconfig
+++ b/.editorconfig
--- 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

@ -105,10 +105,10 @@ docker build \
  -t linuxserver/ffmpeg: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`.
--- 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
--- a/.github/ISSUE_TEMPLATE/issue.bug.yml
+++ b/.github/ISSUE_TEMPLATE/issue.bug.yml
--- a/.github/ISSUE_TEMPLATE/issue.feature.yml
+++ b/.github/ISSUE_TEMPLATE/issue.feature.yml
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@ -8,9 +8,6 @@ on:
  pull_request_review:
    types: [submitted,edited,dismissed]

-permissions:
-  contents: read
-
 jobs:
  manage-project:
    permissions:
--- a/.github/workflows/call_issues_cron.yml
+++ b/.github/workflows/call_issues_cron.yml
@ -4,9 +4,6 @@ on:
    - cron:  '15 0 * * *'
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  stale:
    permissions:
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -3,9 +3,6 @@ name: External Trigger Main
 on:
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  external-trigger-master:
    runs-on: ubuntu-latest
@ -14,31 +11,18 @@ jobs:

      - name: External Trigger
        if: github.ref == 'refs/heads/master'
-        env:
-          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
-          printf "# External trigger for docker-ffmpeg\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^ffmpeg_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`ffmpeg_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
-          elif grep -q "^ffmpeg_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`ffmpeg_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 \`ffmpeg_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
-          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(echo 8.0.1-cli)
-          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^ffmpeg_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_FFMPEG_MASTER }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
+          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\". ****"
+          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving external version ****"
+          EXT_RELEASE=$(echo 6.1.1-cli)
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve external version, exiting ****"
            FAILURE_REASON="Can't retrieve external version for ffmpeg branch master"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-ffmpeg/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,
@ -46,43 +30,25 @@ jobs:
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
-          EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
-          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
+          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
+          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving last pushed version ****"
          image="linuxserver/ffmpeg"
          tag="latest"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fffmpeg%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}")
@ -94,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
+            echo "**** Can't retrieve last pushed version, exiting ****"
            FAILURE_REASON="Can't retrieve last pushed version for ffmpeg tag latest"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
-          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
-          if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
-            echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $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 ****"
+            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-ffmpeg/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
+            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 ffmpeg 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 sanitized version \`${EXT_RELEASE_SANITIZED}\` 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-ffmpeg/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 ffmpeg tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
-              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-ffmpeg/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+            echo "**** Sleeping 10 seconds until job starts ****"
+            sleep 10
+            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+            buildurl="${buildurl%$'\r'}"
+            echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+            echo "**** Attempting to change the Jenkins job description ****"
+            curl -iX POST \
+              "${buildurl}submitDescription" \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+              --data-urlencode "Submit=Submit"
+            echo "**** Notifying Discord ****"
+            TRIGGER_REASON="A version change was detected for ffmpeg tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
          fi
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@ -5,9 +5,6 @@ on:
    - cron:  '1 * * * *'
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
@ -18,31 +15,31 @@ jobs:

      - name: External Trigger Scheduler
        run: |
-          printf "# External trigger scheduler for docker-ffmpeg\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-ffmpeg/${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-ffmpeg/${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-ffmpeg/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
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@ -2,14 +2,8 @@ name: Greetings

 on: [pull_request_target, issues]

-permissions:
-  contents: read
-
 jobs:
  greeting:
-    permissions:
-      issues: write
-      pull-requests: write
    runs-on: ubuntu-latest
    steps:
    - uses: actions/first-interaction@v1
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@ -0,0 +1,42 @@
+name: Package Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package-trigger-master:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+
+      - name: Package Trigger
+        if: github.ref == 'refs/heads/master'
+        run: |
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_FFMPEG_MASTER }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_FFMPEG_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_FFMPEG_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_FFMPEG_MASTER\". ****"
+          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_FFMPEG_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          response=$(curl -iX POST \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/buildWithParameters?PACKAGE_CHECK=true \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+          echo "**** Sleeping 10 seconds until job starts ****"
+          sleep 10
+          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+          buildurl="${buildurl%$'\r'}"
+          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Attempting to change the Jenkins job description ****"
+          curl -iX POST \
+            "${buildurl}submitDescription" \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@ -5,9 +5,6 @@ on:
    - cron:  '59 21 * * 4'
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
@ -17,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-ffmpeg\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-ffmpeg/${br}/jenkins-vars.yml)
-            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-ffmpeg/${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-ffmpeg/${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 "^ffmpeg_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`ffmpeg_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/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 \`ffmpeg_%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-ffmpeg/${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-ffmpeg/${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-ffmpeg/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-ffmpeg/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-ffmpeg/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 ffmpeg** \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 ffmpeg** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-ffmpeg/activity/"' \n"}],
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@ -5,8 +5,6 @@ on:
      - '**/run'
      - '**/finish'
      - '**/check'
-      - 'root/migrations/*'
-
 jobs:
  permission_check:
    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
--- a/385
+++ b/385
@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1

 # build stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:noble AS buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage

 # set version label
 ARG FFMPEG_VERSION
@ -9,136 +9,110 @@ ARG FFMPEG_VERSION
 # common env
 ENV \
  DEBIAN_FRONTEND="noninteractive" \
-  MAKEFLAGS="-j4" \
-  CMAKE_POLICY_VERSION_MINIMUM="3.5" \
-  PATH="/root/.cargo/bin:${PATH}"
+  MAKEFLAGS="-j4"

 # versions
 ENV \
-  AOM=v3.13.1 \
+  AOM=v3.8.2 \
  FDKAAC=2.0.3 \
-  FFMPEG_HARD=8.0.1 \
-  FONTCONFIG=2.16.0 \
-  FREETYPE=2.14.1 \
-  FRIBIDI=1.0.16 \
-  GMMLIB=22.8.2 \
-  HARFBUZZ=12.3.0 \
-  IHD=25.3.4 \
-  KVAZAAR=2.3.2 \
+  FFMPEG_HARD=6.1.1 \
+  FONTCONFIG=2.15.0 \
+  FREETYPE=2.13.2 \
+  FRIBIDI=1.0.13 \
+  GMMLIB=22.3.15 \
+  IHD=23.4.3 \
+  KVAZAAR=2.2.0 \
  LAME=3.100 \
-  LIBASS=0.17.4 \
-  LIBDAV1D=1.5.3 \
-  LIBDOVI=2.3.1 \
-  LIBDRM=2.4.131 \
-  LIBGL=1.7.0 \
-  LIBLC3=1.1.3 \
+  LIBASS=0.17.1 \
+  LIBDOVI=2.1.0 \
+  LIBDRM=2.4.120 \
  LIBMFX=22.5.4 \
-  LIBPLACEBO=7.351.0 \
-  LIBPNG=1.6.53 \
-  LIBVA=2.23.0 \
+  LIBPLACEBO=6.338.2 \
+  LIBVA=2.20.0 \
  LIBVDPAU=1.5 \
  LIBVIDSTAB=1.1.1 \
  LIBVMAF=3.0.0 \
-  LIBVPL=2.16.0 \
-  MESA=25.3.3 \
-  NVCODEC=n13.0.19.0 \
-  OGG=1.3.6 \
+  LIBVPL=2.10.1 \
+  MESA=24.0.3 \
+  NVCODEC=n12.1.14.0 \
+  OGG=1.3.5 \
+  ONEVPL=23.4.3 \
  OPENCOREAMR=0.1.6 \
-  OPENJPEG=2.5.4 \
-  OPUS=1.6 \
-  RAV1E=0.8.1 \
-  RIST=0.2.11 \
-  SHADERC=v2025.5 \
-  SRT=1.5.4 \
-  SVTAV1=3.1.2 \
-  THEORA=1.2.0 \
+  OPENJPEG=2.5.2 \
+  OPUS=1.5.1 \
+  RAV1E=0.7.1 \
+  SHADERC=v2024.0 \
+  SVTAV1=2.0.0 \
+  THEORA=1.1.1 \
  VORBIS=1.3.7 \
-  VPLGPURT=25.3.4 \
-  VPX=1.15.2 \
-  VULKANSDK=vulkan-sdk-1.4.335.0 \
-  VVENC=1.13.1 \
-  WEBP=1.6.0 \
-  X265=4.1 \
+  VPX=1.14.0 \
+  VULKANSDK=vulkan-sdk-1.3.275.0 \
+  WEBP=1.3.2 \
+  X265=3.5 \
  XVID=1.3.7 \
-  ZIMG=3.0.6 \
-  ZMQ=v4.3.5
+  ZIMG=3.0.5

 RUN \
  echo "**** install build packages ****" && \
-  apt-get update && \
-  apt-get install --no-install-recommends -y \
+  apt-get update && \ 
+  apt-get install -y \
    autoconf \
    automake \
-    bindgen \
-    bison \
-    build-essential \
    bzip2 \
    cmake \
    clang \
    diffutils \
    doxygen \
-    flex \
    g++ \
    gcc \
    git \
    gperf \
    i965-va-driver-shaders \
    libasound2-dev \
-    libcairo2-dev \
-    libclang-18-dev \
-    libclang-cpp18-dev \
-    libclc-18 \
-    libclc-18-dev \
-    libelf-dev \
    libexpat1-dev \
    libgcc-10-dev \
-    libglib2.0-dev \
    libgomp1 \
-    libllvmspirvlib-18-dev \
+    libharfbuzz-dev \
    libpciaccess-dev \
    libssl-dev \
    libtool \
    libv4l-dev \
    libwayland-dev \
-    libwayland-egl-backend-dev \
    libx11-dev \
    libx11-xcb-dev \
-    libxcb-dri2-0-dev \
    libxcb-dri3-dev \
-    libxcb-glx0-dev \
    libxcb-present-dev \
    libxext-dev \
    libxfixes-dev \
    libxml2-dev \
    libxrandr-dev \
-    libxshmfence-dev \
-    libxxf86vm-dev \
-    llvm-18-dev \
-    llvm-spirv-18 \
    make \
    nasm \
+    ninja-build \
    ocl-icd-opencl-dev \
    perl \
    pkg-config \
    python3-venv \
-    x11proto-gl-dev \
+    wayland-protocols \
    x11proto-xext-dev \
+    xserver-xorg-dev \
    xxd \
    yasm \
    zlib1g-dev && \
+  apt-get build-dep mesa -y && \
  mkdir -p /tmp/rust && \
  RUST_VERSION=$(curl -fsX GET https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r '.tag_name') && \
  curl -fo /tmp/rust.tar.gz -L "https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz" && \
  tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \
  cd /tmp/rust && \
  ./install.sh && \
-  cargo install bindgen-cli cargo-c cbindgen --locked && \
+  cargo install cargo-c && \
  python3 -m venv /lsiopy && \
  pip install -U --no-cache-dir \
    pip \
    setuptools \
    wheel && \
-  pip install --no-cache-dir cmake==3.31.6 mako meson ninja packaging ply pyyaml
+  pip install --no-cache-dir meson cmake mako

 # compile 3rd party libs
 RUN \
@ -175,14 +149,13 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libfdk-aac.so
+  make install
 RUN \
  echo "**** grabbing ffnvcodec ****" && \
  mkdir -p /tmp/ffnvcodec && \
  git clone \
    --branch ${NVCODEC} \
-    --depth 1 https://github.com/FFmpeg/nv-codec-headers.git \
+    --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git \
    /tmp/ffnvcodec
 RUN \
  echo "**** compiling ffnvcodec ****" && \
@ -201,14 +174,13 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libfreetype.so
+  make install
 RUN \
  echo "**** grabbing fontconfig ****" && \
  mkdir -p /tmp/fontconfig && \
  curl -Lf \
-    https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.xz | \
-    tar -xJ --strip-components=1 -C /tmp/fontconfig
+    https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fontconfig
 RUN \
  echo "**** compiling fontconfig ****" && \
  cd /tmp/fontconfig && \
@ -216,8 +188,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libfontconfig.so
+  make install 
 RUN \
  echo "**** grabbing fribidi ****" && \
  mkdir -p /tmp/fribidi && \
@ -232,20 +203,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make -j 1 && \
-  make install && \
-  strip -d /usr/local/lib/libfribidi.so
-RUN \
-  echo "**** grabbing harfbuzz ****" && \
-  mkdir -p /tmp/harfbuzz && \
-  curl -Lf \
-    https://github.com/harfbuzz/harfbuzz/archive/${HARFBUZZ}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/harfbuzz
-RUN \
-  echo "**** compiling harfbuzz ****" && \
-  cd /tmp/harfbuzz && \
-  meson build && \
-  ninja -C build install && \
-  strip -d /usr/local/lib/x86_64-linux-gnu/libharfbuzz*.so
+  make install
 RUN \
  echo "**** grabbing kvazaar ****" && \
  mkdir -p /tmp/kvazaar && \
@ -260,8 +218,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libkvazaar.so
+  make install
 RUN \
  echo "**** grabbing lame ****" && \
  mkdir -p /tmp/lame && \
@ -298,42 +255,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libass.so
-RUN \
-  echo "**** grabbing libdav1d ****" && \
-  mkdir -p /tmp/libdav1d && \
-  git clone \
-    --branch ${LIBDAV1D} \
-    https://code.videolan.org/videolan/dav1d \
-    /tmp/libdav1d
-RUN \
-  echo "**** compiling libdav1d ****" && \
-  mkdir -p /tmp/libdav1d/build && \
-  cd /tmp/libdav1d/build && \
-  meson setup .. && \
-  ninja install
-RUN \
-  echo "**** grabbing libgl ****" && \
-  mkdir -p /tmp/libgl && \
-  curl -Lf \
-  https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${LIBGL}/libglvnd-v${LIBGL}.tar.gz | \
-    tar -xz --strip-components=1 -C /tmp/libgl
-RUN \
-  echo "**** compiling libgl ****" && \
-  cd /tmp/libgl && \
-  meson setup \
-    --buildtype=release \
-    build && \
-  ninja -C build install && \
-  strip -d \
-    /usr/local/lib/x86_64-linux-gnu/libEGL.so \
-    /usr/local/lib/x86_64-linux-gnu/libGLdispatch.so \
-    /usr/local/lib/x86_64-linux-gnu/libGLESv1_CM.so \
-    /usr/local/lib/x86_64-linux-gnu/libGLESv2.so \
-    /usr/local/lib/x86_64-linux-gnu/libGL.so \
-    /usr/local/lib/x86_64-linux-gnu/libGLX.so \
-    /usr/local/lib/x86_64-linux-gnu/libOpenGL.so
+  make install
 RUN \
  echo "**** grabbing libdrm ****" && \
  mkdir -p /tmp/libdrm && \
@ -350,19 +272,6 @@ RUN \
  ninja -C build && \
  ninja -C build install && \
  strip -d /usr/local/lib/x86_64-linux-gnu/libdrm*.so
-RUN \
-  echo "**** grabbing liblc3 ****" && \
-  mkdir -p /tmp/liblc3 && \
-  git clone \
-    --branch v${LIBLC3} \
-    --depth 1 \
-    https://github.com/google/liblc3.git \
-    /tmp/liblc3
-RUN \
-    echo "**** compiling liblc3 ****" && \
-    cd /tmp/liblc3 && \
-    meson setup build && \
-    meson install -C build --strip
 RUN \
  echo "**** grabbing libva ****" && \
  mkdir -p /tmp/libva && \
@ -400,24 +309,6 @@ RUN \
    build && \
  ninja -C build install && \
  strip -d /usr/local/lib/libvdpau.so
-RUN \
-    echo "**** grabbing shaderc ****" && \
-    mkdir -p /tmp/shaderc && \
-    git clone \
-      --branch ${SHADERC} \
-      --depth 1 https://github.com/google/shaderc.git \
-      /tmp/shaderc
-RUN \
-    echo "**** compiling shaderc ****" && \
-    cd /tmp/shaderc && \
-    ./utils/git-sync-deps && \
-    mkdir -p build && \
-    cd build && \
-    cmake -GNinja \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr/local \
-      .. && \
-    ninja install
 RUN \
  echo "**** grabbing mesa ****" && \
  mkdir -p /tmp/mesa && \
@ -470,30 +361,30 @@ RUN \
  echo "**** grabbing libvpl ****" && \
  mkdir -p /tmp/libvpl && \
  curl -Lf \
-    https://github.com/intel/libvpl/archive/refs/tags/v${LIBVPL}.tar.gz | \
+    https://github.com/oneapi-src/oneVPL/archive/refs/tags/v${LIBVPL}.tar.gz | \
    tar -zx --strip-components=1 -C /tmp/libvpl
 RUN \
  echo "**** compiling libvpl ****" && \
  mkdir -p /tmp/libvpl/build && \
  cd /tmp/libvpl/build && \
-  cmake .. && \
+  cmake .. && \ 
  cmake --build . --config Release && \
  cmake --build . --config Release --target install && \
  strip -d /usr/local/lib/libvpl.so
 RUN \
-  echo "**** grabbing vpl-gpu-rt ****" && \
-  mkdir -p /tmp/vpl-gpu-rt && \
+  echo "**** grabbing onevpl ****" && \
+  mkdir -p /tmp/onevpl && \
  curl -Lf \
-    https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${VPLGPURT}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/vpl-gpu-rt
+    https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${ONEVPL}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/onevpl
 RUN \
-  echo "**** compiling vpl-gpu-rt ****" && \
-  mkdir -p /tmp/vpl-gpu-rt/build && \
-  cd /tmp/vpl-gpu-rt/build && \
+  echo "**** compiling onevpl ****" && \
+  mkdir -p /tmp/onevpl/build && \
+  cd /tmp/onevpl/build && \
  cmake \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_INSTALL_LIBDIR=/usr/local/lib \
-    .. && \
+    .. && \ 
  make && \
  make install && \
  strip -d /usr/local/lib/libmfx-gen.so
@ -514,7 +405,7 @@ RUN \
    -DENABLE_X11_DRI3=ON \
    -DBUILD_DISPATCHER=OFF \
    -DBUILD_TUTORIALS=OFF \
-    .. && \
+    .. && \ 
  make && \
  make install && \
  strip -d \
@ -562,8 +453,7 @@ RUN \
    --disable-static \
    --enable-shared  && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libopencore-amr*.so
+  make install
 RUN \
  echo "**** grabbing openjpeg ****" && \
  mkdir -p /tmp/openjpeg && \
@ -576,7 +466,7 @@ RUN \
  rm -Rf \
    thirdparty/libpng/* && \
  curl -Lf \
-    https://download.sourceforge.net/libpng/libpng-${LIBPNG}.tar.gz | \
+    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
    tar -zx --strip-components=1 -C thirdparty/libpng/ && \
  cmake \
    -DBUILD_STATIC_LIBS=0 \
@ -597,8 +487,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libopus.so
+  make install
 RUN \
  echo "**** grabbing rav1e ****" && \
  mkdir -p /tmp/rav1e && \
@ -610,7 +499,25 @@ RUN \
  echo "**** compiling rav1e ****" && \
  cd /tmp/rav1e && \
  cargo cinstall --release && \
-  strip -d /usr/local/lib/x86_64-linux-gnu/librav1e.so
+  strip -d /usr/local/lib/librav1e.so
+RUN \
+  echo "**** grabbing shaderc ****" && \
+  mkdir -p /tmp/shaderc && \
+  git clone \
+    --branch ${SHADERC} \
+    --depth 1 https://github.com/google/shaderc.git \
+    /tmp/shaderc
+RUN \
+  echo "**** compiling shaderc ****" && \
+  cd /tmp/shaderc && \
+  ./utils/git-sync-deps && \
+  mkdir -p build && \
+  cd build && \
+  cmake -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    .. && \
+  ninja install
 RUN \
  echo "**** grabbing libdovi ****" && \
  mkdir -p /tmp/libdovi && \
@ -622,7 +529,7 @@ RUN \
  echo "**** compiling libdovi ****" && \
  cd /tmp/libdovi/dolby_vision && \
  cargo cinstall --release && \
-  strip -d /usr/local/lib/x86_64-linux-gnu/libdovi.so
+  strip -d /usr/local/lib/libdovi.so
 RUN \
  echo "**** grabbing libplacebo ****" && \
  mkdir -p /tmp/libplacebo && \
@ -635,42 +542,6 @@ RUN \
  cd /tmp/libplacebo && \
  meson build --buildtype release && \
  ninja -C build install
-RUN \
-  echo "**** grabbing rist ****" && \
-  mkdir -p /tmp/rist && \
-  git clone \
-    --branch v${RIST} \
-    --depth 1 https://code.videolan.org/rist/librist.git \
-    /tmp/rist
-RUN \
-  echo "**** compiling rist ****" && \
-  cd /tmp/rist && \
-  mkdir -p \
-    rist_build && \
-  cd rist_build && \
-  meson setup \
-    --default-library=shared .. && \
-  ninja && \
-  ninja install && \
-  strip -d /usr/local/lib/librist.so
-RUN \
-  echo "**** grabbing srt ****" && \
-  mkdir -p /tmp/srt && \
-  git clone \
-    --branch v${SRT} \
-    --depth 1 https://github.com/Haivision/srt.git \
-    /tmp/srt
-RUN \
-  echo "**** compiling srt ****" && \
-  cd /tmp/srt && \
-  mkdir -p \
-    srt_build && \
-  cd srt_build && \
-  cmake \
-    -DBUILD_SHARED_LIBS:BOOL=on .. && \
-  make && \
-  make install && \
-  strip -d /usr/local/lib/libsrt.so
 RUN \
  echo "**** grabbing SVT-AV1 ****" && \
  mkdir -p /tmp/svt-av1 && \
@ -692,6 +563,16 @@ RUN \
 RUN \
  echo "**** compiling theora ****" && \
  cd /tmp/theora && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  curl -fL \
+    'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
+    > png.patch && \
+  patch ./examples/png2theora.c < png.patch && \
  ./configure \
    --disable-static \
    --enable-shared && \
@ -778,18 +659,6 @@ RUN \
    .. && \
  make && \
  make install
-RUN \
-  echo "**** grabbing vvenc ****" && \
-  mkdir -p /tmp/vvenc && \
-  git clone \
-    --branch v${VVENC} \
-    --depth 1 https://github.com/fraunhoferhhi/vvenc.git \
-    /tmp/vvenc
-RUN \
-  echo "**** compiling vvenc ****" && \
-  cd /tmp/vvenc && \
-  make install install-prefix=/usr/local && \
-  strip -d /usr/local/lib/libvvenc.so
 RUN \
  echo "**** grabbing webp ****" && \
  mkdir -p /tmp/webp && \
@ -801,8 +670,7 @@ RUN \
  cd /tmp/webp && \
  ./configure && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libweb*.so
+  make install
 RUN \
  echo "**** grabbing x264 ****" && \
  mkdir -p /tmp/x264 && \
@ -839,7 +707,7 @@ RUN \
 RUN \
  echo "**** compiling xvid ****" && \
  cd /tmp/xvid/build/generic && \
-  ./configure && \
+  ./configure && \ 
  make && \
  make install
 RUN \
@ -858,22 +726,6 @@ RUN \
    --enable-shared && \
  make && \
  make install
-RUN \
-  echo "**** grabbing zmq ****" && \
-  mkdir -p /tmp/zmq && \
-  git clone \
-    --branch ${ZMQ} --depth 1 \
-    https://github.com/zeromq/libzmq.git \
-    /tmp/zmq
-RUN \
-  echo "**** compiling zmq ****" && \
-  cd /tmp/zmq && \
-  ./autogen.sh && \
-  ./configure \
-    --disable-static \
-    --enable-shared && \
-  make && \
-  make install-strip

 # main ffmpeg build
 RUN \
@ -889,29 +741,22 @@ RUN \
  curl -Lf \
    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
    tar -jx --strip-components=1 -C /tmp/ffmpeg
-
 RUN \
  echo "**** compiling ffmpeg ****" && \
  cd /tmp/ffmpeg && \
-  ./configure \
+    ./configure \
    --disable-debug \
    --disable-doc \
    --disable-ffplay \
    --enable-alsa \
-    --enable-cuda-llvm \
    --enable-cuvid \
    --enable-ffprobe \
    --enable-gpl \
    --enable-libaom \
    --enable-libass \
-    --enable-libdav1d \
    --enable-libfdk_aac \
-    --enable-libfontconfig \
    --enable-libfreetype \
-    --enable-libfribidi \
-    --enable-libharfbuzz \
    --enable-libkvazaar \
-    --enable-liblc3 \
    --enable-libmp3lame \
    --enable-libopencore-amrnb \
    --enable-libopencore-amrwb \
@ -919,9 +764,7 @@ RUN \
    --enable-libopus \
    --enable-libplacebo \
    --enable-librav1e \
-    --enable-librist \
    --enable-libshaderc \
-    --enable-libsrt \
    --enable-libsvtav1 \
    --enable-libtheora \
    --enable-libv4l2 \
@ -930,25 +773,23 @@ RUN \
    --enable-libvorbis \
    --enable-libvpl \
    --enable-libvpx \
-    --enable-libvvenc \
    --enable-libwebp \
    --enable-libx264 \
    --enable-libx265 \
    --enable-libxml2 \
    --enable-libxvid \
    --enable-libzimg \
-    --enable-libzmq \
    --enable-nonfree \
    --enable-nvdec \
    --enable-nvenc \
+    --enable-cuda-llvm \
    --enable-opencl \
    --enable-openssl \
    --enable-stripping \
    --enable-vaapi \
    --enable-vdpau \
    --enable-version3 \
-    --enable-vulkan \
-    && \
+    --enable-vulkan && \
  make

 RUN \
@ -957,12 +798,12 @@ RUN \
  ldconfig && \
  mkdir -p \
    /buildout/usr/local/bin \
-    /buildout/usr/local/etc/fonts \
    /buildout/usr/local/lib/libmfx-gen \
    /buildout/usr/local/lib/mfx \
+    /buildout/usr/local/lib/vpl \
    /buildout/usr/local/lib/x86_64-linux-gnu/dri \
+    /buildout/usr/local/lib/x86_64-linux-gnu/vdpau \
    /buildout/usr/local/share/vulkan \
-    /buildout/usr/share/fonts \
    /buildout/usr/share/libdrm \
    /buildout/etc/OpenCL/vendors && \
  cp \
@ -971,9 +812,6 @@ RUN \
  cp \
    /tmp/ffmpeg/ffprobe \
    /buildout/usr/local/bin && \
-  cp -a \
-    /usr/local/etc/fonts/* \
-    /buildout/usr/local/etc/fonts/ && \
  cp -a \
    /usr/local/lib/lib*so* \
    /buildout/usr/local/lib/ && \
@ -983,21 +821,24 @@ RUN \
  cp -a \
    /usr/local/lib/mfx/*.so \
    /buildout/usr/local/lib/mfx/ && \
+  cp -a \
+    /usr/local/lib/vpl/*.so \
+    /buildout/usr/local/lib/vpl/ && \
  cp -a \
    /usr/local/lib/x86_64-linux-gnu/lib*so* \
    /buildout/usr/local/lib/x86_64-linux-gnu/ && \
  cp -a \
    /usr/local/lib/x86_64-linux-gnu/dri/*.so \
    /buildout/usr/local/lib/x86_64-linux-gnu/dri/ && \
+  cp -a \
+    /usr/local/lib/x86_64-linux-gnu/vdpau/*.so \
+    /buildout/usr/local/lib/x86_64-linux-gnu/vdpau/ && \
  cp -a \
    /usr/lib/x86_64-linux-gnu/dri/i965* \
    /buildout/usr/local/lib/x86_64-linux-gnu/dri/ && \
  cp -a \
    /usr/share/libdrm/amdgpu.ids \
    /buildout/usr/share/libdrm/ && \
-  cp -a \
-    /usr/share/fonts/* \
-    /buildout/usr/share/fonts/ && \
  cp -a \
    /usr/local/share/vulkan/* \
    /buildout/usr/local/share/vulkan/ && \
@ -1006,7 +847,7 @@ RUN \
    /buildout/etc/OpenCL/vendors/nvidia.icd

 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy

 # Add files from binstage
 COPY --from=buildstage /buildout/ /
@ -1030,13 +871,15 @@ RUN \
  echo "**** install runtime ****" && \
    apt-get update && \
    apt-get install -y \
-    libasound2t64 \
+    libasound2 \
    libedit2 \
    libelf1 \
    libexpat1 \
    libglib2.0-0 \
    libgomp1 \
-    libllvm18 \
+    libharfbuzz0b \
+    libllvm15 \
+    libmpdec3 \
    libpciaccess0 \
    libv4l-0 \
    libwayland-client0 \
@ -1056,14 +899,10 @@ RUN \
    libxshmfence1 \
    libxml2 \
    ocl-icd-libopencl1 && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** clean up ****" && \
  rm -rf \
    /var/lib/apt/lists/* \
-    /var/tmp/* && \
-  echo "**** quick test ffmpeg ****" && \
-  ldd /usr/local/bin/ffmpeg && \
-  /usr/local/bin/ffmpeg -version
+    /var/tmp/*

 COPY /root /

--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1

 # build stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble AS buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage

 # set version label
 ARG FFMPEG_VERSION
@ -9,69 +9,55 @@ ARG FFMPEG_VERSION
 # common env
 ENV \
  DEBIAN_FRONTEND="noninteractive" \
-  MAKEFLAGS="-j4" \
-  CMAKE_POLICY_VERSION_MINIMUM="3.5" \
-  PATH="/root/.cargo/bin:${PATH}"
+  MAKEFLAGS="-j4"

 # versions
 ENV \
-  AOM=v3.13.1 \
+  AOM=v3.8.2 \
  FDKAAC=2.0.3 \
-  FFMPEG_HARD=8.0.1 \
-  FONTCONFIG=2.16.0 \
-  FREETYPE=2.14.1 \
-  FRIBIDI=1.0.16 \
-  HARFBUZZ=12.3.0 \
-  KVAZAAR=2.3.2 \
+  FFMPEG_HARD=6.1.1 \
+  FREETYPE=2.13.2 \
+  FRIBIDI=1.0.13 \
+  KVAZAAR=2.2.0 \
  LAME=3.100 \
-  LIBASS=0.17.4 \
-  LIBDAV1D=1.5.3 \
-  LIBDRM=2.4.131 \
-  LIBLC3=1.1.3 \
-  LIBPNG=1.6.53 \
-  LIBVA=2.23.0 \
+  LIBASS=0.17.1 \
+  LIBDRM=2.4.120 \
+  LIBVA=2.20.0 \
  LIBVDPAU=1.5 \
  LIBVIDSTAB=1.1.1 \
-  LIBVMAF=3.0.0 \
-  NVCODEC=n13.0.19.0 \
-  OGG=1.3.6 \
+  NVCODEC=n12.1.14.0 \
+  OGG=1.3.5 \
  OPENCOREAMR=0.1.6 \
-  OPENJPEG=2.5.4 \
-  OPUS=1.6 \
-  RAV1E=0.8.1 \
-  RIST=0.2.11 \
-  SRT=1.5.4 \
-  SVTAV1=3.1.2 \
-  THEORA=1.2.0 \
+  OPENJPEG=2.5.2 \
+  OPUS=1.5.1 \
+  RAV1E=0.7.1 \
+  SVTAV1=2.0.0 \
+  THEORA=1.1.1 \
  VORBIS=1.3.7 \
-  VPX=1.15.2 \
-  VVENC=1.13.1 \
-  WEBP=1.6.0 \
-  X265=4.1 \
+  VPX=1.14.0 \
+  WEBP=1.3.2 \
+  X265=master \
  XVID=1.3.7 \
-  ZIMG=3.0.6 \
-  ZMQ=v4.3.5
+  ZIMG=3.0.5
+# x265 aarch64 build fixes not in a release yet https://bitbucket.org/multicoreware/x265_git/issues/604/linux-arm-aarch64-build-failing-for-high

 RUN \
  echo "**** install build packages ****" && \
-  apt-get update && \
+  apt-get update && \ 
  apt-get install -y \
    autoconf \
    automake \
-    build-essential \
    bzip2 \
    cmake \
-    clang \
    diffutils \
    g++ \
    gcc \
    git \
    gperf \
    libasound2-dev \
-    libcairo2-dev \
    libexpat1-dev \
+    libfontconfig1-dev \
    libgcc-10-dev \
-    libglib2.0-dev \
    libgomp1 \
    libharfbuzz-dev \
    libpciaccess-dev \
@ -81,13 +67,13 @@ RUN \
    libx11-dev \
    libxext-dev \
    libxml2-dev \
-    llvm-18-dev \
    make \
    nasm \
    perl \
    pkg-config \
    python3-venv \
    x11proto-xext-dev \
+    xserver-xorg-dev \
    xxd \
    yasm \
    zlib1g-dev && \
@ -97,13 +83,13 @@ RUN \
  tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \
  cd /tmp/rust && \
  ./install.sh && \
-  cargo install cargo-c --locked && \
+  cargo install cargo-c && \
  python3 -m venv /lsiopy && \
  pip install -U --no-cache-dir \
    pip \
    setuptools \
    wheel && \
-  pip install --no-cache-dir cmake==3.31.6 meson ninja
+  pip install --no-cache-dir cmake

 # compile 3rd party libs
 RUN \
@ -140,18 +126,6 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libfdk-aac.so
-RUN \
-  echo "**** grabbing ffnvcodec ****" && \
-  mkdir -p /tmp/ffnvcodec && \
-  git clone \
-    --branch ${NVCODEC} \
-    --depth 1 https://github.com/FFmpeg/nv-codec-headers.git \
-    /tmp/ffnvcodec
-RUN \
-  echo "**** compiling ffnvcodec ****" && \
-  cd /tmp/ffnvcodec && \
  make install
 RUN \
  echo "**** grabbing freetype ****" && \
@ -166,23 +140,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libfreetype.so
-RUN \
-  echo "**** grabbing fontconfig ****" && \
-  mkdir -p /tmp/fontconfig && \
-  curl -Lf \
-    https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.xz | \
-    tar -xJ --strip-components=1 -C /tmp/fontconfig
-RUN \
-  echo "**** compiling fontconfig ****" && \
-  cd /tmp/fontconfig && \
-  ./configure \
-    --disable-static \
-    --enable-shared && \
-  make && \
-  make install && \
-  strip -d /usr/local/lib/libfontconfig.so
+  make install
 RUN \
  echo "**** grabbing fribidi ****" && \
  mkdir -p /tmp/fribidi && \
@ -197,20 +155,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make -j 1 && \
-  make install && \
-  strip -d /usr/local/lib/libfribidi.so
-RUN \
-  echo "**** grabbing harfbuzz ****" && \
-  mkdir -p /tmp/harfbuzz && \
-  curl -Lf \
-    https://github.com/harfbuzz/harfbuzz/archive/${HARFBUZZ}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/harfbuzz
-RUN \
-  echo "**** compiling harfbuzz ****" && \
-  cd /tmp/harfbuzz && \
-  meson build && \
-  ninja -C build install && \
-  strip -d /usr/local/lib/aarch64-linux-gnu/libharfbuzz*.so
+  make install
 RUN \
  echo "**** grabbing kvazaar ****" && \
  mkdir -p /tmp/kvazaar && \
@ -225,8 +170,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libkvazaar.so
+  make install
 RUN \
  echo "**** grabbing lame ****" && \
  mkdir -p /tmp/lame && \
@ -263,65 +207,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libass.so
-RUN \
-  echo "**** grabbing libdav1d ****" && \
-  mkdir -p /tmp/libdav1d && \
-  git clone \
-    --branch ${LIBDAV1D} \
-    https://code.videolan.org/videolan/dav1d \
-    /tmp/libdav1d
-RUN \
-  echo "**** compiling libdav1d ****" && \
-  mkdir -p /tmp/libdav1d/build && \
-  cd /tmp/libdav1d/build && \
-  meson setup .. && \
-  ninja install
-RUN \
-  echo "**** grabbing libdrm ****" && \
-  mkdir -p /tmp/libdrm && \
-  curl -Lf \
-    https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.xz | \
-    tar -xJ --strip-components=1 -C /tmp/libdrm
-RUN \
-  echo "**** compiling libdrm ****" && \
-  cd /tmp/libdrm && \
-  meson setup \
-    --prefix=/usr --libdir=/usr/local/lib/aarch64-linux-gnu \
-    -Dvalgrind=disabled \
-    . build && \
-  ninja -C build && \
-  ninja -C build install && \
-  strip -d /usr/local/lib/aarch64-linux-gnu/libdrm*.so
-RUN \
-  echo "**** grabbing liblc3 ****" && \
-  mkdir -p /tmp/liblc3 && \
-  git clone \
-    --branch v${LIBLC3} \
-    --depth 1 \
-    https://github.com/google/liblc3.git \
-    /tmp/liblc3
-RUN \
-    echo "**** compiling liblc3 ****" && \
-    cd /tmp/liblc3 && \
-    meson setup build && \
-    meson install -C build --strip
-RUN \
-  echo "**** grabbing vmaf ****" && \
-  mkdir -p /tmp/vmaf && \
-  curl -Lf \
-    https://github.com/Netflix/vmaf/archive/refs/tags/v${LIBVMAF}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/vmaf
-RUN \
-  echo "**** compiling libvmaf ****" && \
-  cd /tmp/vmaf/libvmaf && \
-  meson setup \
-    --prefix=/usr --libdir=/usr/local/lib \
-    --buildtype release \
-    build && \
-  ninja -vC build && \
-  ninja -vC build install
+  make install
 RUN \
  echo "**** grabbing ogg ****" && \
  mkdir -p /tmp/ogg && \
@ -349,8 +235,7 @@ RUN \
    --disable-static \
    --enable-shared  && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libopencore-amr*.so
+  make install
 RUN \
  echo "**** grabbing openjpeg ****" && \
  mkdir -p /tmp/openjpeg && \
@ -363,7 +248,7 @@ RUN \
  rm -Rf \
    thirdparty/libpng/* && \
  curl -Lf \
-    https://download.sourceforge.net/libpng/libpng-${LIBPNG}.tar.gz | \
+    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
    tar -zx --strip-components=1 -C thirdparty/libpng/ && \
  cmake \
    -DBUILD_STATIC_LIBS=0 \
@ -384,8 +269,7 @@ RUN \
    --disable-static \
    --enable-shared && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libopus.so
+  make install
 RUN \
  echo "**** grabbing rav1e ****" && \
  mkdir -p /tmp/rav1e && \
@ -397,43 +281,7 @@ RUN \
  echo "**** compiling rav1e ****" && \
  cd /tmp/rav1e && \
  cargo cinstall --release && \
-  strip -d /usr/local/lib/aarch64-linux-gnu/librav1e.so
-RUN \
-  echo "**** grabbing rist ****" && \
-  mkdir -p /tmp/rist && \
-  git clone \
-    --branch v${RIST} \
-    --depth 1 https://code.videolan.org/rist/librist.git \
-    /tmp/rist
-RUN \
-  echo "**** compiling rist ****" && \
-  cd /tmp/rist && \
-  mkdir -p \
-    rist_build && \
-  cd rist_build && \
-  meson setup \
-    --default-library=shared .. && \
-  ninja && \
-  ninja install && \
-  strip -d /usr/local/lib/librist.so
-RUN \
-  echo "**** grabbing srt ****" && \
-  mkdir -p /tmp/srt && \
-  git clone \
-    --branch v${SRT} \
-    --depth 1 https://github.com/Haivision/srt.git \
-    /tmp/srt
-RUN \
-  echo "**** compiling srt ****" && \
-  cd /tmp/srt && \
-  mkdir -p \
-    srt_build && \
-  cd srt_build && \
-  cmake \
-    -DBUILD_SHARED_LIBS:BOOL=on .. && \
-  make && \
-  make install && \
-  strip -d /usr/local/lib/libsrt.so
+  strip -d /usr/local/lib/librav1e.so
 RUN \
  echo "**** grabbing SVT-AV1 ****" && \
  mkdir -p /tmp/svt-av1 && \
@ -455,6 +303,16 @@ RUN \
 RUN \
  echo "**** compiling theora ****" && \
  cd /tmp/theora && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  curl -fL \
+    'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
+    > png.patch && \
+  patch ./examples/png2theora.c < png.patch && \
  ./configure \
    --disable-static \
    --enable-shared && \
@ -511,18 +369,6 @@ RUN \
    --enable-vp9-highbitdepth && \
  make && \
  make install
-RUN \
-  echo "**** grabbing vvenc ****" && \
-  mkdir -p /tmp/vvenc && \
-  git clone \
-    --branch v${VVENC} \
-    --depth 1 https://github.com/fraunhoferhhi/vvenc.git \
-    /tmp/vvenc
-RUN \
-  echo "**** compiling vvenc ****" && \
-  cd /tmp/vvenc && \
-  make install install-prefix=/usr/local && \
-  strip -d /usr/local/lib/libvvenc.so
 RUN \
  echo "**** grabbing webp ****" && \
  mkdir -p /tmp/webp && \
@ -534,8 +380,7 @@ RUN \
  cd /tmp/webp && \
  ./configure && \
  make && \
-  make install && \
-  strip -d /usr/local/lib/libweb*.so
+  make install
 RUN \
  echo "**** grabbing x264 ****" && \
  mkdir -p /tmp/x264 && \
@ -555,9 +400,10 @@ RUN \
 RUN \
  echo "**** grabbing x265 ****" && \
  mkdir -p /tmp/x265 && \
-  curl -Lf \
-    https://bitbucket.org/multicoreware/x265_git/downloads/x265_${X265}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/x265
+  git clone \
+    --branch ${X265} \
+    https://bitbucket.org/multicoreware/x265_git.git \
+    /tmp/x265
 RUN \
  echo "**** compiling x265 ****" && \
  cd /tmp/x265/build/linux && \
@ -573,7 +419,7 @@ RUN \
 RUN \
  echo "**** compiling xvid ****" && \
  cd /tmp/xvid/build/generic && \
-  ./configure && \
+  ./configure && \ 
  make && \
  make install
 RUN \
@ -592,22 +438,6 @@ RUN \
    --enable-shared && \
  make && \
  make install
-RUN \
-  echo "**** grabbing zmq ****" && \
-  mkdir -p /tmp/zmq && \
-  git clone \
-    --branch ${ZMQ} --depth 1 \
-    https://github.com/zeromq/libzmq.git \
-    /tmp/zmq
-RUN \
-  echo "**** compiling zmq ****" && \
-  cd /tmp/zmq && \
-  ./autogen.sh && \
-  ./configure \
-    --disable-static \
-    --enable-shared && \
-  make && \
-  make install-strip

 # main ffmpeg build
 RUN \
@ -623,59 +453,43 @@ RUN \
  curl -Lf \
    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
    tar -jx --strip-components=1 -C /tmp/ffmpeg
-  
-  RUN \
-    echo "**** compiling ffmpeg ****" && \
-    cd /tmp/ffmpeg && \
-    ./configure \
+RUN \
+  echo "**** compiling ffmpeg ****" && \
+  cd /tmp/ffmpeg && \
+  ./configure \
    --disable-debug \
    --disable-doc \
    --disable-ffplay \
    --enable-alsa \
-    --enable-cuda-llvm \
-    --enable-cuvid \
    --enable-ffprobe \
    --enable-gpl \
    --enable-libaom \
    --enable-libass \
-    --enable-libdav1d \
    --enable-libfdk_aac \
-    --enable-libfontconfig \
    --enable-libfreetype \
-    --enable-libfribidi \
-    --enable-libharfbuzz \
    --enable-libkvazaar \
-    --enable-liblc3 \
    --enable-libmp3lame \
    --enable-libopencore-amrnb \
    --enable-libopencore-amrwb \
    --enable-libopenjpeg \
    --enable-libopus \
    --enable-librav1e \
-    --enable-librist \
-    --enable-libsrt \
    --enable-libsvtav1 \
    --enable-libtheora \
    --enable-libv4l2 \
    --enable-libvidstab \
-    --enable-libvmaf \
    --enable-libvorbis \
    --enable-libvpx \
-    --enable-libvvenc \
    --enable-libwebp \
+    --enable-libxml2 \
    --enable-libx264 \
    --enable-libx265 \
-    --enable-libxml2 \
    --enable-libxvid \
    --enable-libzimg \
-    --enable-libzmq \
    --enable-nonfree \
-    --enable-nvdec \
-    --enable-nvenc \
    --enable-openssl \
    --enable-stripping \
-    --enable-version3 \
-    && \
+    --enable-version3 && \
  make

 RUN \
@ -684,30 +498,19 @@ RUN \
  ldconfig && \
  mkdir -p \
    /buildout/usr/local/bin \
-    /buildout/usr/local/etc/fonts \
-    /buildout/usr/local/lib/aarch64-linux-gnu \
-    /buildout/usr/share/fonts && \
+    /buildout/usr/local/lib && \
  cp \
    /tmp/ffmpeg/ffmpeg \
    /buildout/usr/local/bin && \
  cp \
    /tmp/ffmpeg/ffprobe \
    /buildout/usr/local/bin && \
-  cp -a \
-    /usr/local/etc/fonts/* \
-    /buildout/usr/local/etc/fonts/ && \
  cp -a \
    /usr/local/lib/lib*so* \
-    /buildout/usr/local/lib/ && \
-  cp -a \
-    /usr/local/lib/aarch64-linux-gnu/lib*so* \
-    /buildout/usr/local/lib/aarch64-linux-gnu/ && \
-  cp -a \
-    /usr/share/fonts/* \
-    /buildout/usr/share/fonts/
+    /buildout/usr/local/lib/

 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy

 # Add files from binstage
 COPY --from=buildstage /buildout/ /
@ -720,34 +523,25 @@ LABEL maintainer="thelamer"

 ARG DEBIAN_FRONTEND="noninteractive"

-ENV \
-  NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" \
-  NVIDIA_VISIBLE_DEVICES="all"
-
 RUN \
  echo "**** install runtime ****" && \
  apt-get update && \
  apt-get install -y \
-    libasound2t64 \
+    libasound2 \
    libexpat1 \
+    libfontconfig1 \
    libglib2.0-0 \
    libgomp1 \
-    libllvm18 \
+    libharfbuzz0b \
    libv4l-0 \
    libx11-6 \
    libxcb1 \
-    libxcb-shm0 \
    libxext6 \
-    libxml2 \
-    ocl-icd-libopencl1 && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+    libxml2 && \
  echo "**** clean up ****" && \
  rm -rf \
    /var/lib/apt/lists/* \
-    /var/tmp/* && \
-  echo "**** quick test ffmpeg ****" && \
-  ldd /usr/local/bin/ffmpeg && \
-  /usr/local/bin/ffmpeg -version
+    /var/tmp/*

 COPY /root /

--- a/509
+++ b/509
@ -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 = 'FFMPEG_VERSION'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-ffmpeg'
@ -31,41 +29,15 @@ pipeline {
    CI='false'
  }
  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(
@ -86,12 +58,8 @@ 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'
-          if ( env.SYFT_IMAGE_TAG == null ) {
-            env.SYFT_IMAGE_TAG = 'latest'
-          }
+          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'
        }
-        echo "Using syft image tag ${SYFT_IMAGE_TAG}"
        sh '''#! /bin/bash
              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
@ -140,7 +108,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' echo 8.0.1-cli ''',
+            script: ''' echo 6.1.1-cli ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
@ -200,8 +168,6 @@ pipeline {
          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.CITEST_IMAGETAG = 'latest'
        }
      }
    }
@ -226,8 +192,6 @@ pipeline {
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
-          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.CITEST_IMAGETAG = 'develop'
        }
      }
    }
@ -252,8 +216,6 @@ pipeline {
          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
-          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
-          env.CITEST_IMAGETAG = 'develop'
        }
      }
    }
@ -276,7 +238,7 @@ pipeline {
                  -v ${WORKSPACE}:/mnt \
                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
                    apk add --no-cache python3 && \
                    python3 -m venv /lsiopy && \
                    pip install --no-cache-dir -U pip && \
@ -306,7 +268,7 @@ pipeline {
              # ${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}
-              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 
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true 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
@ -326,7 +288,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 Dockerfile.armhf"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@ -383,7 +345,7 @@ pipeline {
              fi
              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
              mkdir -p ${TEMPDIR}/docs
-              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                cd ${TEMPDIR}/docs/docker-documentation
@ -473,10 +435,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: ''
      }
@ -492,8 +454,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"}' ||: '''
      } 
    }
    /* ###############
@ -522,47 +482,9 @@ pipeline {
          --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
          --label \"org.opencontainers.image.title=Ffmpeg\" \
-          --label \"org.opencontainers.image.description=A complete, cross-platform solution to record, convert and stream audio and video.\" \
+          --label \"org.opencontainers.image.description=ffmpeg image by linuxserver.io\" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=true --sbom=true --builder=container --load \
          --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
-                      declare -A pids
-                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                      for i in "${CACHE[@]}"; do
-                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                        pids[$!]="$i"
-                      done
-                      for p in "${!pids[@]}"; do
-                        wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
-                      done
-                    fi
-                '''
-          }
-        }
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
@ -591,47 +513,9 @@ pipeline {
              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Ffmpeg\" \
-              --label \"org.opencontainers.image.description=A complete, cross-platform solution to record, convert and stream audio and video.\" \
+              --label \"org.opencontainers.image.description=ffmpeg image by linuxserver.io\" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=true --sbom=true --builder=container --load \
              --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
-                          declare -A pids
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
-                            pids[$!]="$i"
-                          done
-                          for p in "${!pids[@]}"; do
-                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
-                          done
-                        fi
-                    '''
-              }
-            }
          }
        }
        stage('Build ARM64') {
@ -640,6 +524,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}\" \
@ -653,54 +541,19 @@ pipeline {
              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Ffmpeg\" \
-              --label \"org.opencontainers.image.description=A complete, cross-platform solution to record, convert and stream audio and video.\" \
+              --label \"org.opencontainers.image.description=ffmpeg image by linuxserver.io\" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=true --sbom=true --builder=container --load \
              --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
-                          declare -A pids
-                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                          for i in "${CACHE[@]}"; do
-                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
-                            pids[$!]="$i"
-                          done
-                          for p in "${!pids[@]}"; do
-                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && 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 || : '''
          }
        }
      }
@ -716,7 +569,7 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@ -725,7 +578,7 @@ pipeline {
              docker run --rm \
                -v /var/run/docker.sock:/var/run/docker.sock:ro \
                -v ${TEMPDIR}:/tmp \
-                ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
+                ghcr.io/anchore/syft:latest \
                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@ -804,26 +657,18 @@ 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:${CITEST_IMAGETAG}
+                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
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
                --shm-size=1gb \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -e IMAGE=\"${IMAGE}\" \
+                -e DELAY_START=\"${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}\" \
@ -833,11 +678,7 @@ pipeline {
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e NODE_NAME=\"${NODE_NAME}\" \
-                -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
-                -e COMMIT_SHA=\"${COMMIT_SHA}\" \
-                -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
-                -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
+                -t ghcr.io/linuxserver/ci:latest \
                python3 test_build.py'''
        }
      }
@ -852,25 +693,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}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
+                    docker push ${PUSHIMAGE}:latest
+                    docker 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 [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                      { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  fi
-                done
-              '''
+               '''
+          }
        }
      }
    }
@ -881,41 +734,79 @@ 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}
+                    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-latest
+                    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-latest
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
+                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    fi
+                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
+                    digest=$(curl -s \
+                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+                      --header "Authorization: Bearer ${token}" \
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
+                    fi
+                    docker manifest push --purge ${MANIFESTIMAGE}:latest
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${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} || \
-                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  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 [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  fi
-                done
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
-                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
-                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
-                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
-                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  fi
-                done
-              '''
+               '''
+          }
        }
      }
    }
@ -930,41 +821,23 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
+        echo "Pushing New tag for current commit ${META_TAG}"
+        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",\
+             "type": "commit",\
+             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
-              echo "Auto-generating release notes"
-              if [ "$(git tag --points-at HEAD)" != "" ]; then
-                echo "Existing tag points to current commit, suggesting no new LS changes"
-                AUTO_RELEASE_NOTES="No changes"
-              else
-                AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes  \
-                  -d '{"tag_name":"'${META_TAG}'",\
-                      "target_commitish": "master"}' \
-                  | jq -r '.body' | sed 's|## What.s Changed||')
-              fi
-              echo "Pushing New tag for current commit ${META_TAG}"
-              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",\
-                  "type": "commit",\
-                  "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
-              echo "Pushing New release for Tag"
              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
-              jq -n \
-                --arg tag_name "$META_TAG" \
-                --arg target_commitish "master" \
-                --arg ci_url "${CI_URL:-N/A}" \
-                --arg ls_notes "$AUTO_RELEASE_NOTES" \
-                --arg remote_notes "$(cat releasebody.json)" \
-                '{
-                  "tag_name": $tag_name,
-                  "target_commitish": $target_commitish,
-                  "name": $tag_name,
-                  "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
-                  "draft": false,
-                  "prerelease": false                }' > 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
-        '''
+              echo '{"tag_name":"'${META_TAG}'",\
+                     "target_commitish": "master",\
+                     "name": "'${META_TAG}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              paste -d'\\0' start releasebody.json > releasebody.json.done
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
    }
    // Add protection to the release branch
@ -1086,94 +959,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
-}
--- a/README.md
+++ b/README.md
@ -9,26 +9,22 @@
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
 [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")

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

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

 Find us at:
-
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [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.
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget

-# [linuxserver/ffmpeg](https://github.com/linuxserver/docker-ffmpeg)
-
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-ffmpeg/packages)
@ -40,11 +36,12 @@ Find us at:

 [FFmpeg](https://ffmpeg.org) - A complete, cross-platform solution to record, convert and stream audio and video.

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

 ## Supported Architectures

-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/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

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

@ -54,7 +51,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ❌ | |
+| armhf| ❌ | arm32v7-\<version tag\> |

 ## Usage

@ -64,19 +61,17 @@ If an input file is detected we will run FFmpeg as that user/group so the output
 The image supports Hardware acceleration on x86 pay close attention to the variables for the examples below.

 ### Included Intel Drivers (latest versions compiled):
-
-* iHD Driver: Supports gen8+ (default for Intel)
-* i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
-* Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
-* Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
-* Qsv Runtime:
-
-    * OneVPL: Supports gen12+
-    * MSDK (libmfx): Supports gen8 - gen12
+- iHD Driver: Supports gen8+ (default for Intel)
+- i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
+- Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
+- Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
+- Qsv Runtime:
+  - OneVPL: Supports gen12+
+  - MSDK (libmfx): Supports gen8 - gen12

 ### Basic Transcode

-```bash
+```
 docker run --rm -it \
  -v $(pwd):/config \
  linuxserver/ffmpeg \
@ -90,7 +85,7 @@ docker run --rm -it \

 ### Hardware accelerated (VAAPI) ([click for more info](https://trac.ffmpeg.org/wiki/Hardware/VAAPI))

-```bash
+```
 docker run --rm -it \
  --device=/dev/dri:/dev/dri \
  -v $(pwd):/config \
@ -106,7 +101,7 @@ docker run --rm -it \

 ### Hardware accelerated (QSV) ([click for more info](https://trac.ffmpeg.org/wiki/Hardware/QuickSync))

-```bash
+```
 docker run --rm -it \
  --device=/dev/dri:/dev/dri \
  -v $(pwd):/config \
@ -121,9 +116,7 @@ docker run --rm -it \

 ### Nvidia Hardware accelerated ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC))

-Nvidia support __requires__ [Nvidia container toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) and the Nvidia drivers installed on the host.
-
-```bash
+```
 docker run --rm -it \
  --runtime=nvidia \
  -v $(pwd):/config \
@ -141,7 +134,7 @@ docker run --rm -it \

 Vulkan support has been added to x86_64 (tested with Intel and AMD iGPU) ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#Vulkan)).

-```bash
+```
 docker run --rm -it \
  --device=/dev/dri:/dev/dri \
  -v $(pwd):/config \
@ -154,28 +147,25 @@ docker run --rm -it \
  -f null - -benchmark
 ```

-#### Vulkan supports three drivers
-
-* ANV: To enable for Intel, set the env var `ANV_VIDEO_DECODE=1`
-* RADV: To enable on AMD, set the env var `RADV_PERFTEST=video_decode`
-* NVIDIA: To enable on Nvidia, install Nvidia Vulkan Beta drivers on the host per [this article](https://lynne.ee/vulkan-video-decoding.html#driver-support)
+**Note:** Vulkan supports three drivers:
+  - ANV: To enable for Intel, set the env var `ANV_VIDEO_DECODE=1`
+  - RADV: To enable on AMD, set the env var `RADV_PERFTEST=video_decode`
+  - NVIDIA: To enable on Nvidia, install Nvidia Vulkan Beta drivers on the host per [this article](https://lynne.ee/vulkan-video-decoding.html#driver-support)

 ## Building locally

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

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

@ -183,34 +173,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk.
-* **01.12.25:** - Bump ffmpeg to 8.0.1.
-* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
-* **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.
-* **06.08.25:** - Bump svt-av1.
-* **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
-* **04.06.25:** - Add libdrm and rkmpp to arm64 image.
-* **21.04.25:** - Bump aom, Intel drivers and libs, harfbuzz, mesa, svt-av1, libvpx, libtheora, vulkan-sdk and vvenc.
-* **07.03.25:** - Bump ffmpeg to 7.1.1, Bump aom, fontconfig, Intel drivers and libs, harfbuzz, libdav1d, libdovi, libdrm, liblc3, libpng, mesa, openjpeg, shaderc, svt-av1, vulkan-sdk, vvenc and webp.
-* **26.11.24:** - Bump libaom, mesa, rist, srt and libx265.
-* **07.11.24:** - Bump harfbuzz, Intel drivers and libs, libdav1d, mesa, svtav1, vpx, vulkan sdk and vvenc.
-* **05.10.24:** - Add support for libvvenc on aarch64. Bump mesa.
-* **30.09.24:** - Bump ffmpeg for 7.1. Add support for libvvenc (amd64 only) and liblc3. Bump libfribidi and libharfbuzz.
-* **24.09.24:** - Let ffmpeg terminate gracefully on docker stop/restart. Bump libharfbuzz, libpng, mesa, shaderc and libx265.
-* **09.09.24:** - Add libzmq.
-* **31.08.24:** - Bump libaom, libdrm, libvpl, mesa and svtav1. Enable nvdec/nvenc on arm64 (untested).
-* **17.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.
-* **14.08.24:** - Add SRT and libRIST.
-* **01.08.24:** - Add libdav1d. Bump libharfbuzz, various Intel drivers and libs, libass, libdrm, libplacebo, libva, mesa, svtav1, and vulkan sdk.
-* **21.06.24:** - Bump mesa and libaom. Update lib path for rav1e.
-* **08.06.24:** - Bump ffmpeg, fribidi, libdrm, mesa and vpx.
-* **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.
-* **22.05.24:** - Bump Mesa to 24.1.0.
-* **20.05.24:** - Bump libsvtav1.
-* **09.05.24:** - Bump libaom, fribidi, kvazaar, various Intel drivers and libs, Mesa, opus, shaderc, webp and x265.
-* **11.04.24:** - Explicitly disable libdrm on aarch64, add new lib `libxcb-shm0`. Add quick test at the end of build.
-* **10.04.24:** - Compile ffmpeg with `libfribidi`, `libharfbuzz` and `libfontconfig`, compile libharfbuzz.
-* **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
 * **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.
 * **11.02.24:** - Add Zimg support.
 * **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,10 +3,11 @@
 # jenkins variables
 project_name: docker-ffmpeg
 external_type: na
-custom_version_command: "echo 8.0.1-cli"
+custom_version_command: "echo 6.1.1-cli"
 release_type: stable
 release_tag: latest
 ls_branch: master
+build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'FFMPEG_VERSION'
  - LS_USER = 'linuxserver'
--- a/package_versions.txt
+++ b/package_versions.txt
@ -1,181 +1,190 @@
-NAME                         VERSION                            TYPE   
-adduser                      3.137ubuntu1                       deb     
-alsa-topology-conf           1.2.5.1-2                          deb     
-alsa-ucm-conf                1.2.10-1ubuntu5.9                  deb     
-apt                          2.8.3                              deb     
-apt-utils                    2.8.3                              deb     
-base-files                   13ubuntu10.4                       deb     
-base-passwd                  3.6.3build1                        deb     
-bash                         5.2.21-2ubuntu4                    deb     
-bsdutils                     1:2.39.3-9ubuntu6.4                deb     
-ca-certificates              20240203                           deb     
-catatonit                    0.1.7-1                            deb     
-coreutils                    9.4-3ubuntu6.1                     deb     
-cron                         3.0pl1-184ubuntu2                  deb     
-cron-daemon-common           3.0pl1-184ubuntu2                  deb     
-curl                         8.5.0-2ubuntu10.6                  deb     
-dash                         0.5.12-6ubuntu5                    deb     
-debconf                      1.5.86ubuntu1                      deb     
-debianutils                  5.17build1                         deb     
-diffutils                    1:3.10-1build1                     deb     
-dirmngr                      2.4.4-2ubuntu17.4                  deb     
-dpkg                         1.22.6ubuntu6.5                    deb     
-e2fsprogs                    1.47.0-2.4~exp1ubuntu4.1           deb     
-findutils                    4.9.0-5build1                      deb     
-gcc-14-base                  14.2.0-4ubuntu2~24.04              deb     
-gnupg                        2.4.4-2ubuntu17.4                  deb     
-gnupg-l10n                   2.4.4-2ubuntu17.4                  deb     
-gnupg-utils                  2.4.4-2ubuntu17.4                  deb     
-gpg                          2.4.4-2ubuntu17.4                  deb     
-gpg-agent                    2.4.4-2ubuntu17.4                  deb     
-gpg-wks-client               2.4.4-2ubuntu17.4                  deb     
-gpgconf                      2.4.4-2ubuntu17.4                  deb     
-gpgsm                        2.4.4-2ubuntu17.4                  deb     
-gpgv                         2.4.4-2ubuntu17.4                  deb     
-grep                         3.11-4build1                       deb     
-gzip                         1.12-1ubuntu3.1                    deb     
-hostname                     3.23+nmu2ubuntu2                   deb     
-init-system-helpers          1.66ubuntu1                        deb     
-jq                           1.7.1-3ubuntu0.24.04.1             deb     
-keyboxd                      2.4.4-2ubuntu17.4                  deb     
-krb5-locales                 1.20.1-6ubuntu2.6                  deb     
-libacl1                      2.3.2-1build1.1                    deb     
-libapt-pkg6.0t64             2.8.3                              deb     
-libasound2-data              1.2.11-1ubuntu0.1                  deb     
-libasound2t64                1.2.11-1ubuntu0.1                  deb     
-libassuan0                   2.5.6-1build1                      deb     
-libattr1                     1:2.5.2-1build1.1                  deb     
-libaudit-common              1:3.1.2-2.1build1.1                deb     
-libaudit1                    1:3.1.2-2.1build1.1                deb     
-libblkid1                    2.39.3-9ubuntu6.4                  deb     
-libbrotli1                   1.1.0-2build2                      deb     
-libbsd0                      0.12.1-1build1.1                   deb     
-libbz2-1.0                   1.0.8-5.1build0.1                  deb     
-libc-bin                     2.39-0ubuntu8.7                    deb     
-libc6                        2.39-0ubuntu8.7                    deb     
-libcap-ng0                   0.8.4-2build2                      deb     
-libcap2                      1:2.66-5ubuntu2.2                  deb     
-libcom-err2                  1.47.0-2.4~exp1ubuntu4.1           deb     
-libcrypt1                    1:4.4.36-4build1                   deb     
-libcurl4t64                  8.5.0-2ubuntu10.6                  deb     
-libdb5.3t64                  5.3.28+dfsg2-7                     deb     
-libdebconfclient0            0.271ubuntu3                       deb     
-libedit2                     3.1-20230828-1build1               deb     
-libelf1t64                   0.190-1.1ubuntu0.1                 deb     
-libexpat1                    2.6.1-2ubuntu0.3                   deb     
-libext2fs2t64                1.47.0-2.4~exp1ubuntu4.1           deb     
-libffi8                      3.4.6-1build1                      deb     
-libgcc-s1                    14.2.0-4ubuntu2~24.04              deb     
-libgcrypt20                  1.10.3-2build1                     deb     
-libglib2.0-0t64              2.80.0-6ubuntu3.8                  deb     
-libglib2.0-data              2.80.0-6ubuntu3.8                  deb     
-libgmp10                     2:6.3.0+dfsg-2ubuntu6.1            deb     
-libgnutls30t64               3.8.3-1.1ubuntu3.4                 deb     
-libgomp1                     14.2.0-4ubuntu2~24.04              deb     
-libgpg-error0                1.47-3build2.1                     deb     
-libgssapi-krb5-2             1.20.1-6ubuntu2.6                  deb     
-libhogweed6t64               3.9.1-2.2build1.1                  deb     
-libicu74                     74.2-1ubuntu3.1                    deb     
-libidn2-0                    2.3.7-2build1.1                    deb     
-libjpeg-turbo8               2.1.5-2ubuntu2                     deb     
-libjpeg8                     8c-2ubuntu11                       deb     
-libjq1                       1.7.1-3ubuntu0.24.04.1             deb     
-libk5crypto3                 1.20.1-6ubuntu2.6                  deb     
-libkeyutils1                 1.6.3-3build1                      deb     
-libkrb5-3                    1.20.1-6ubuntu2.6                  deb     
-libkrb5support0              1.20.1-6ubuntu2.6                  deb     
-libksba8                     1.6.6-1build1                      deb     
-libldap-common               2.6.10+dfsg-0ubuntu0.24.04.1       deb     
-libldap2                     2.6.10+dfsg-0ubuntu0.24.04.1       deb     
-libllvm18                    1:18.1.3-1ubuntu1                  deb     
-liblz4-1                     1.9.4-1build1.1                    deb     
-liblzma5                     5.6.1+really5.4.5-1ubuntu0.2       deb     
-libmd0                       1.1.0-2build1.1                    deb     
-libmount1                    2.39.3-9ubuntu6.4                  deb     
-libncursesw6                 6.4+20240113-1ubuntu2              deb     
-libnettle8t64                3.9.1-2.2build1.1                  deb     
-libnghttp2-14                1.59.0-1ubuntu0.2                  deb     
-libnpth0t64                  1.6-3.1build1                      deb     
-libonig5                     6.9.9-1build1                      deb     
-libp11-kit0                  0.25.3-4ubuntu2.1                  deb     
-libpam-modules               1.5.3-5ubuntu5.5                   deb     
-libpam-modules-bin           1.5.3-5ubuntu5.5                   deb     
-libpam-runtime               1.5.3-5ubuntu5.5                   deb     
-libpam0g                     1.5.3-5ubuntu5.5                   deb     
-libpciaccess0                0.17-3ubuntu0.24.04.2              deb     
-libpcre2-8-0                 10.42-4ubuntu2.1                   deb     
-libproc2-0                   2:4.0.4-4ubuntu3.2                 deb     
-libpsl5t64                   0.21.2-1.1build1                   deb     
-libreadline8t64              8.2-4build1                        deb     
-librtmp1                     2.4+20151223.gitfa8646d.1-2build7  deb     
-libsasl2-2                   2.1.28+dfsg1-5ubuntu3.1            deb     
-libsasl2-modules             2.1.28+dfsg1-5ubuntu3.1            deb     
-libsasl2-modules-db          2.1.28+dfsg1-5ubuntu3.1            deb     
-libseccomp2                  2.5.5-1ubuntu3.1                   deb     
-libselinux1                  3.5-2ubuntu2.1                     deb     
-libsemanage-common           3.5-1build5                        deb     
-libsemanage2                 3.5-1build5                        deb     
-libsepol2                    3.5-2build1                        deb     
-libsmartcols1                2.39.3-9ubuntu6.4                  deb     
-libsqlite3-0                 3.45.1-1ubuntu2.5                  deb     
-libss2                       1.47.0-2.4~exp1ubuntu4.1           deb     
-libssh-4                     0.10.6-2ubuntu0.2                  deb     
-libssl3t64                   3.0.13-0ubuntu3.7                  deb     
-libstdc++6                   14.2.0-4ubuntu2~24.04              deb     
-libsystemd0                  255.4-1ubuntu8.12                  deb     
-libtasn1-6                   4.19.0-3ubuntu0.24.04.2            deb     
-libtinfo6                    6.4+20240113-1ubuntu2              deb     
-libudev1                     255.4-1ubuntu8.12                  deb     
-libunistring5                1.1-2build1.1                      deb     
-libuuid1                     2.39.3-9ubuntu6.4                  deb     
-libv4l-0t64                  1.26.1-4build3                     deb     
-libv4lconvert0t64            1.26.1-4build3                     deb     
-libwayland-client0           1.22.0-2.1build1                   deb     
-libx11-6                     2:1.8.7-1build1                    deb     
-libx11-data                  2:1.8.7-1build1                    deb     
-libx11-xcb1                  2:1.8.7-1build1                    deb     
-libxau6                      1:1.0.9-1build6                    deb     
-libxcb-dri2-0                1.15-1ubuntu2                      deb     
-libxcb-dri3-0                1.15-1ubuntu2                      deb     
-libxcb-present0              1.15-1ubuntu2                      deb     
-libxcb-randr0                1.15-1ubuntu2                      deb     
-libxcb-shape0                1.15-1ubuntu2                      deb     
-libxcb-shm0                  1.15-1ubuntu2                      deb     
-libxcb-sync1                 1.15-1ubuntu2                      deb     
-libxcb-xfixes0               1.15-1ubuntu2                      deb     
-libxcb1                      1.15-1ubuntu2                      deb     
-libxdmcp6                    1:1.1.3-0ubuntu6                   deb     
-libxext6                     2:1.3.4-1build2                    deb     
-libxfixes3                   1:6.0.0-2build1                    deb     
-libxml2                      2.9.14+dfsg-1.3ubuntu3.7           deb     
-libxshmfence1                1.3-1build5                        deb     
-libxxhash0                   0.8.2-2build1                      deb     
-libzstd1                     1.5.5+dfsg2-2build1.1              deb     
-locales                      2.39-0ubuntu8.7                    deb     
-login                        1:4.13+dfsg1-4ubuntu3.2            deb     
-logsave                      1.47.0-2.4~exp1ubuntu4.1           deb     
-mawk                         1.3.4.20240123-1build1             deb     
-mount                        2.39.3-9ubuntu6.4                  deb     
-ncurses-base                 6.4+20240113-1ubuntu2              deb     
-ncurses-bin                  6.4+20240113-1ubuntu2              deb     
-netcat-openbsd               1.226-1ubuntu2                     deb     
-ocl-icd-libopencl1           2.3.2-1build1                      deb     
-openssl                      3.0.13-0ubuntu3.7                  deb     
-passwd                       1:4.13+dfsg1-4ubuntu3.2            deb     
-perl-base                    5.38.2-3.2ubuntu0.2                deb     
-pinentry-curses              1.2.1-3ubuntu5                     deb     
-procps                       2:4.0.4-4ubuntu3.2                 deb     
-publicsuffix                 20231001.0357-0.1                  deb     
-readline-common              8.2-4build1                        deb     
-sed                          4.9-2build1                        deb     
-sensible-utils               0.0.22                             deb     
-shared-mime-info             2.4-4                              deb     
-systemd-standalone-sysusers  255.4-1ubuntu8.12                  deb     
-sysvinit-utils               3.08-6ubuntu3                      deb     
-tar                          1.35+dfsg-3build1                  deb     
-tzdata                       2025b-0ubuntu0.24.04.1             deb     
-ubuntu-keyring               2023.11.28.1                       deb     
-unminimize                   0.2.1                              deb     
-util-linux                   2.39.3-9ubuntu6.4                  deb     
-xdg-user-dirs                0.18-1build1                       deb     
-zlib1g                       1:1.3.dfsg-3.1ubuntu2.1            deb     
+NAME                 VERSION                                  TYPE     
+adduser              3.118ubuntu5                             deb       
+alsa-topology-conf   1.2.5.1-2                                deb       
+alsa-ucm-conf        1.2.6.3-1ubuntu1.11                      deb       
+apt                  2.4.11                                   deb       
+apt-utils            2.4.11                                   deb       
+base-files           12ubuntu4.6                              deb       
+base-passwd          3.5.52build1                             deb       
+bash                 5.1-6ubuntu1.1                           deb       
+bash                 5.1.16                                   binary    
+bsdutils             1:2.37.2-4ubuntu3                        deb       
+ca-certificates      20230311ubuntu0.22.04.1                  deb       
+coreutils            8.32-4.1ubuntu1.1                        deb       
+cron                 3.0pl1-137ubuntu3                        deb       
+curl                 7.81.0-1ubuntu1.15                       deb       
+dash                 0.5.11+git20210903+057cd650a4ed-3build1  deb       
+debconf              1.5.79ubuntu1                            deb       
+debianutils          5.5-1ubuntu2                             deb       
+diffutils            1:3.8-0ubuntu2                           deb       
+dirmngr              2.2.27-3ubuntu2.1                        deb       
+dpkg                 1.21.1ubuntu2.3                          deb       
+e2fsprogs            1.46.5-2ubuntu1.1                        deb       
+findutils            4.8.0-1ubuntu3                           deb       
+gcc-12-base          12.3.0-1ubuntu1~22.04                    deb       
+gnupg                2.2.27-3ubuntu2.1                        deb       
+gnupg-l10n           2.2.27-3ubuntu2.1                        deb       
+gnupg-utils          2.2.27-3ubuntu2.1                        deb       
+gpg                  2.2.27-3ubuntu2.1                        deb       
+gpg-agent            2.2.27-3ubuntu2.1                        deb       
+gpg-wks-client       2.2.27-3ubuntu2.1                        deb       
+gpg-wks-server       2.2.27-3ubuntu2.1                        deb       
+gpgconf              2.2.27-3ubuntu2.1                        deb       
+gpgsm                2.2.27-3ubuntu2.1                        deb       
+gpgv                 2.2.27-3ubuntu2.1                        deb       
+grep                 3.7-1build1                              deb       
+gzip                 1.10-4ubuntu4.1                          deb       
+hostname             3.23ubuntu2                              deb       
+init-system-helpers  1.62                                     deb       
+jq                   1.6-2.1ubuntu3                           deb       
+libacl1              2.3.1-1                                  deb       
+libapt-pkg6.0        2.4.11                                   deb       
+libasound2           1.2.6.1-1ubuntu1                         deb       
+libasound2-data      1.2.6.1-1ubuntu1                         deb       
+libassuan0           2.5.5-1build1                            deb       
+libattr1             1:2.5.1-1build1                          deb       
+libaudit-common      1:3.0.7-1build1                          deb       
+libaudit1            1:3.0.7-1build1                          deb       
+libblkid1            2.37.2-4ubuntu3                          deb       
+libbrotli1           1.0.9-2build6                            deb       
+libbsd0              0.11.5-1                                 deb       
+libbz2-1.0           1.0.8-5build1                            deb       
+libc-bin             2.35-0ubuntu3.6                          deb       
+libc6                2.35-0ubuntu3.6                          deb       
+libcap-ng0           0.7.9-2.2build3                          deb       
+libcap2              1:2.44-1ubuntu0.22.04.1                  deb       
+libcom-err2          1.46.5-2ubuntu1.1                        deb       
+libcrypt1            1:4.4.27-1                               deb       
+libcurl4             7.81.0-1ubuntu1.15                       deb       
+libdb5.3             5.3.28+dfsg1-0.8ubuntu3                  deb       
+libdebconfclient0    0.261ubuntu1                             deb       
+libedit2             3.1-20210910-1build1                     deb       
+libelf1              0.186-1build1                            deb       
+libexpat1            2.4.7-1ubuntu0.3                         deb       
+libext2fs2           1.46.5-2ubuntu1.1                        deb       
+libffi8              3.4.2-4                                  deb       
+libfreetype6         2.11.1+dfsg-1ubuntu0.2                   deb       
+libgcc-s1            12.3.0-1ubuntu1~22.04                    deb       
+libgcrypt20          1.9.4-3ubuntu3                           deb       
+libglib2.0-0         2.72.4-0ubuntu2.2                        deb       
+libglib2.0-data      2.72.4-0ubuntu2.2                        deb       
+libgmp10             2:6.2.1+dfsg-3ubuntu1                    deb       
+libgnutls30          3.7.3-4ubuntu1.4                         deb       
+libgomp1             12.3.0-1ubuntu1~22.04                    deb       
+libgpg-error0        1.43-3                                   deb       
+libgraphite2-3       1.3.14-1build2                           deb       
+libgssapi-krb5-2     1.19.2-2ubuntu0.3                        deb       
+libharfbuzz0b        2.7.4-1ubuntu3.1                         deb       
+libhogweed6          3.7.3-1build2                            deb       
+libicu70             70.1-2                                   deb       
+libidn2-0            2.3.2-2build1                            deb       
+libjpeg-turbo8       2.1.2-0ubuntu1                           deb       
+libjpeg8             8c-2ubuntu10                             deb       
+libjq1               1.6-2.1ubuntu3                           deb       
+libk5crypto3         1.19.2-2ubuntu0.3                        deb       
+libkeyutils1         1.6.1-2ubuntu3                           deb       
+libkrb5-3            1.19.2-2ubuntu0.3                        deb       
+libkrb5support0      1.19.2-2ubuntu0.3                        deb       
+libksba8             1.6.0-2ubuntu0.2                         deb       
+libldap-2.5-0        2.5.17+dfsg-0ubuntu0.22.04.1             deb       
+libldap-common       2.5.17+dfsg-0ubuntu0.22.04.1             deb       
+libllvm15            1:15.0.7-0ubuntu0.22.04.3                deb       
+liblz4-1             1.9.3-2build2                            deb       
+liblzma5             5.2.5-2ubuntu1                           deb       
+libmd0               1.0.4-1build1                            deb       
+libmount1            2.37.2-4ubuntu3                          deb       
+libmpdec3            2.5.1-2build2                            deb       
+libncurses6          6.3-2ubuntu0.1                           deb       
+libncursesw6         6.3-2ubuntu0.1                           deb       
+libnettle8           3.7.3-1build2                            deb       
+libnghttp2-14        1.43.0-1ubuntu0.1                        deb       
+libnpth0             1.6-3build2                              deb       
+libnsl2              1.3.0-2build2                            deb       
+libonig5             6.9.7.1-2build1                          deb       
+libp11-kit0          0.24.0-6build1                           deb       
+libpam-modules       1.4.0-11ubuntu2.4                        deb       
+libpam-modules-bin   1.4.0-11ubuntu2.4                        deb       
+libpam-runtime       1.4.0-11ubuntu2.4                        deb       
+libpam0g             1.4.0-11ubuntu2.4                        deb       
+libpciaccess0        0.16-3                                   deb       
+libpcre2-8-0         10.39-3ubuntu0.1                         deb       
+libpcre3             2:8.39-13ubuntu0.22.04.1                 deb       
+libpng16-16          1.6.37-3build5                           deb       
+libprocps8           2:3.3.17-6ubuntu2.1                      deb       
+libpsl5              0.21.0-1.2build2                         deb       
+libreadline8         8.1.2-1                                  deb       
+librtmp1             2.4+20151223.gitfa8646d.1-2build4        deb       
+libsasl2-2           2.1.27+dfsg2-3ubuntu1.2                  deb       
+libsasl2-modules     2.1.27+dfsg2-3ubuntu1.2                  deb       
+libsasl2-modules-db  2.1.27+dfsg2-3ubuntu1.2                  deb       
+libseccomp2          2.5.3-2ubuntu2                           deb       
+libselinux1          3.3-1build2                              deb       
+libsemanage-common   3.3-1build2                              deb       
+libsemanage2         3.3-1build2                              deb       
+libsepol2            3.3-1build1                              deb       
+libsmartcols1        2.37.2-4ubuntu3                          deb       
+libsqlite3-0         3.37.2-2ubuntu0.3                        deb       
+libss2               1.46.5-2ubuntu1.1                        deb       
+libssh-4             0.9.6-2ubuntu0.22.04.3                   deb       
+libssl3              3.0.2-0ubuntu1.15                        deb       
+libstdc++6           12.3.0-1ubuntu1~22.04                    deb       
+libsystemd0          249.11-0ubuntu3.12                       deb       
+libtasn1-6           4.18.0-4build1                           deb       
+libtinfo6            6.3-2ubuntu0.1                           deb       
+libtirpc-common      1.3.2-2ubuntu0.1                         deb       
+libtirpc3            1.3.2-2ubuntu0.1                         deb       
+libudev1             249.11-0ubuntu3.12                       deb       
+libunistring2        1.0-1                                    deb       
+libuuid1             2.37.2-4ubuntu3                          deb       
+libv4l-0             1.22.1-2build1                           deb       
+libv4lconvert0       1.22.1-2build1                           deb       
+libwayland-client0   1.20.0-1ubuntu0.1                        deb       
+libx11-6             2:1.7.5-1ubuntu0.3                       deb       
+libx11-data          2:1.7.5-1ubuntu0.3                       deb       
+libx11-xcb1          2:1.7.5-1ubuntu0.3                       deb       
+libxau6              1:1.0.9-1build5                          deb       
+libxcb-dri2-0        1.14-3ubuntu3                            deb       
+libxcb-dri3-0        1.14-3ubuntu3                            deb       
+libxcb-present0      1.14-3ubuntu3                            deb       
+libxcb-randr0        1.14-3ubuntu3                            deb       
+libxcb-shape0        1.14-3ubuntu3                            deb       
+libxcb-shm0          1.14-3ubuntu3                            deb       
+libxcb-sync1         1.14-3ubuntu3                            deb       
+libxcb-xfixes0       1.14-3ubuntu3                            deb       
+libxcb1              1.14-3ubuntu3                            deb       
+libxdmcp6            1:1.1.3-0ubuntu5                         deb       
+libxext6             2:1.3.4-1build1                          deb       
+libxfixes3           1:6.0.0-1                                deb       
+libxml2              2.9.13+dfsg-1ubuntu0.4                   deb       
+libxshmfence1        1.3-1build4                              deb       
+libxxhash0           0.8.1-1                                  deb       
+libzstd1             1.4.8+dfsg-3build1                       deb       
+locales              2.35-0ubuntu3.6                          deb       
+login                1:4.8.1-2ubuntu2.2                       deb       
+logsave              1.46.5-2ubuntu1.1                        deb       
+lsb-base             11.1.0ubuntu4                            deb       
+mawk                 1.3.4.20200120-3                         deb       
+mount                2.37.2-4ubuntu3                          deb       
+ncurses-base         6.3-2ubuntu0.1                           deb       
+ncurses-bin          6.3-2ubuntu0.1                           deb       
+netcat               1.218-4ubuntu1                           deb       
+netcat-openbsd       1.218-4ubuntu1                           deb       
+ocl-icd-libopencl1   2.2.14-3                                 deb       
+openssl              3.0.2-0ubuntu1.15                        deb       
+passwd               1:4.8.1-2ubuntu2.2                       deb       
+perl-base            5.34.0-3ubuntu1.3                        deb       
+pinentry-curses      1.1.1-1build2                            deb       
+procps               2:3.3.17-6ubuntu2.1                      deb       
+publicsuffix         20211207.1025-1                          deb       
+readline-common      8.1.2-1                                  deb       
+sed                  4.8-1ubuntu2                             deb       
+sensible-utils       0.0.17                                   deb       
+shared-mime-info     2.1-2                                    deb       
+sysvinit-utils       3.01-1ubuntu1                            deb       
+tar                  1.34+dfsg-1ubuntu0.1.22.04.2             deb       
+tzdata               2024a-0ubuntu0.22.04                     deb       
+ubuntu-keyring       2021.03.26                               deb       
+usrmerge             25ubuntu2                                deb       
+util-linux           2.37.2-4ubuntu3                          deb       
+xdg-user-dirs        0.17-2ubuntu4                            deb       
+zlib1g               1:1.2.11.dfsg-2ubuntu9.2                 deb       
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -2,9 +2,6 @@

 # project information
 project_name: ffmpeg
-project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ffmpeg.png"
-project_blurb: A complete, cross-platform solution to record, convert and stream audio and video.
-project_categories: "Media Tools"
 full_custom_readme: |
  {% raw -%}
  [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
@ -15,27 +12,23 @@ full_custom_readme: |
  [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
  [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
  [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
-
-  The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
-
-  * regular and timely application updates
-  * easy user mappings (PGID, PUID)
-  * custom base image with s6 overlay
-  * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
-  * regular security updates
-
+  
+  The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
+  
+   * regular and timely application updates
+   * easy user mappings (PGID, PUID)
+   * custom base image with s6 overlay
+   * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+   * regular security updates
+  
  Find us at:
-
  * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
  * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
  * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
  * [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.
  * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget

-  # [linuxserver/ffmpeg](https://github.com/linuxserver/docker-ffmpeg)
-
-  [![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
+  [![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg)
  [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg)
  [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg/releases)
  [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-ffmpeg/packages)
@ -44,14 +37,15 @@ full_custom_readme: |
  [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg)
  [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg)
  [![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-ffmpeg%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/)
-
+  
  [FFmpeg](https://ffmpeg.org) - A complete, cross-platform solution to record, convert and stream audio and video.
-
+  
+  
  [![ffmpeg](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ffmpeg.png)](https://ffmpeg.org)
-
+  
  ## Supported Architectures

-  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/).
+  We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

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

@ -61,29 +55,27 @@ full_custom_readme: |
  | :----: | :----: | ---- |
  | x86-64 | ✅ | amd64-\<version tag\> |
  | arm64 | ✅ | arm64v8-\<version tag\> |
-  | armhf | ❌ | |
-
+  | armhf| ❌ | arm32v7-\<version tag\> |
+  
  ## Usage
-
+  
  Unlike most of our container library this image is meant to be run ephemerally from the command line parsing user input for a custom FFmpeg command. You will need to understand some Docker basics to use this image and be familiar with how to construct an FFmpeg command. In the commands below we will be bind mounting our current working directory from the CLI to /config, the assumption is that input.mkv is in your current working directory.

  If an input file is detected we will run FFmpeg as that user/group so the output file will match its permissions.
  The image supports Hardware acceleration on x86 pay close attention to the variables for the examples below.

  ### Included Intel Drivers (latest versions compiled):
-
-  * iHD Driver: Supports gen8+ (default for Intel)
-  * i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
-  * Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
-  * Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
-  * Qsv Runtime:
-
-      * OneVPL: Supports gen12+
-      * MSDK (libmfx): Supports gen8 - gen12
+  - iHD Driver: Supports gen8+ (default for Intel)
+  - i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
+  - Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
+  - Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
+  - Qsv Runtime:
+    - OneVPL: Supports gen12+
+    - MSDK (libmfx): Supports gen8 - gen12

  ### Basic Transcode

-  ```bash
+  ```
  docker run --rm -it \
    -v $(pwd):/config \
    linuxserver/ffmpeg \
@ -96,8 +88,8 @@ full_custom_readme: |
  ```

  ### Hardware accelerated (VAAPI) ([click for more info](https://trac.ffmpeg.org/wiki/Hardware/VAAPI))
-
-  ```bash
+  
+  ```
  docker run --rm -it \
    --device=/dev/dri:/dev/dri \
    -v $(pwd):/config \
@ -112,8 +104,8 @@ full_custom_readme: |
  ```

  ### Hardware accelerated (QSV) ([click for more info](https://trac.ffmpeg.org/wiki/Hardware/QuickSync))
-
-  ```bash
+  
+  ```
  docker run --rm -it \
    --device=/dev/dri:/dev/dri \
    -v $(pwd):/config \
@ -128,9 +120,7 @@ full_custom_readme: |

  ### Nvidia Hardware accelerated ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC))

-  Nvidia support __requires__ [Nvidia container toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) and the Nvidia drivers installed on the host.
-
-  ```bash
+  ```
  docker run --rm -it \
    --runtime=nvidia \
    -v $(pwd):/config \
@ -148,7 +138,7 @@ full_custom_readme: |

  Vulkan support has been added to x86_64 (tested with Intel and AMD iGPU) ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#Vulkan)).

-  ```bash
+  ```
  docker run --rm -it \
    --device=/dev/dri:/dev/dri \
    -v $(pwd):/config \
@ -161,28 +151,25 @@ full_custom_readme: |
    -f null - -benchmark
  ```

-  #### Vulkan supports three drivers
-
-  * ANV: To enable for Intel, set the env var `ANV_VIDEO_DECODE=1`
-  * RADV: To enable on AMD, set the env var `RADV_PERFTEST=video_decode`
-  * NVIDIA: To enable on Nvidia, install Nvidia Vulkan Beta drivers on the host per [this article](https://lynne.ee/vulkan-video-decoding.html#driver-support)
+  **Note:** Vulkan supports three drivers:
+    - ANV: To enable for Intel, set the env var `ANV_VIDEO_DECODE=1`
+    - RADV: To enable on AMD, set the env var `RADV_PERFTEST=video_decode`
+    - NVIDIA: To enable on Nvidia, install Nvidia Vulkan Beta drivers on the host per [this article](https://lynne.ee/vulkan-video-decoding.html#driver-support)

  ## Building locally
-
+  
  If you want to make local modifications to these images for development purposes or just to customize the logic:
-
-  ```bash
+  ```
  git clone https://github.com/linuxserver/docker-ffmpeg.git
  cd docker-ffmpeg
  docker build \
    --no-cache \
    --pull \
-    -t lscr.io/linuxserver/docker-ffmpeg:latest .
+    -t linuxserver/ffmpeg:latest .
  ```
-
+  
  The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-
-  ```bash
+  ```
  docker run --rm --privileged multiarch/qemu-user-static:register --reset
  ```

@ -190,34 +177,6 @@ full_custom_readme: |

  ## Versions

-  * **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk.
-  * **01.12.25:** - Bump ffmpeg to 8.0.1.
-  * **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
-  * **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.
-  * **06.08.25:** - Bump svt-av1.
-  * **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
-  * **04.06.25:** - Add libdrm and rkmpp to arm64 image.
-  * **21.04.25:** - Bump aom, Intel drivers and libs, harfbuzz, mesa, svt-av1, libvpx, libtheora, vulkan-sdk and vvenc.
-  * **07.03.25:** - Bump ffmpeg to 7.1.1, Bump aom, fontconfig, Intel drivers and libs, harfbuzz, libdav1d, libdovi, libdrm, liblc3, libpng, mesa, openjpeg, shaderc, svt-av1, vulkan-sdk, vvenc and webp.
-  * **26.11.24:** - Bump libaom, mesa, rist, srt and libx265.
-  * **07.11.24:** - Bump harfbuzz, Intel drivers and libs, libdav1d, mesa, svtav1, vpx, vulkan sdk and vvenc.
-  * **05.10.24:** - Add support for libvvenc on aarch64. Bump mesa.
-  * **30.09.24:** - Bump ffmpeg for 7.1. Add support for libvvenc (amd64 only) and liblc3. Bump libfribidi and libharfbuzz.
-  * **24.09.24:** - Let ffmpeg terminate gracefully on docker stop/restart. Bump libharfbuzz, libpng, mesa, shaderc and libx265.
-  * **09.09.24:** - Add libzmq.
-  * **31.08.24:** - Bump libaom, libdrm, libvpl, mesa and svtav1. Enable nvdec/nvenc on arm64 (untested).
-  * **17.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.
-  * **14.08.24:** - Add SRT and libRIST.
-  * **01.08.24:** - Add libdav1d. Bump libharfbuzz, various Intel drivers and libs, libass, libdrm, libplacebo, libva, mesa, svtav1, and vulkan sdk.
-  * **21.06.24:** - Bump mesa and libaom. Update lib path for rav1e.
-  * **08.06.24:** - Bump ffmpeg, fribidi, libdrm, mesa and vpx.
-  * **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.
-  * **22.05.24:** - Bump Mesa to 24.1.0.
-  * **20.05.24:** - Bump libsvtav1.
-  * **09.05.24:** - Bump libaom, fribidi, kvazaar, various Intel drivers and libs, Mesa, opus, shaderc, webp and x265.
-  * **11.04.24:** - Explicitly disable libdrm on aarch64, add new lib `libxcb-shm0`. Add quick test at the end of build.
-  * **10.04.24:** - Compile ffmpeg with `libfribidi`, `libharfbuzz` and `libfontconfig`, compile libharfbuzz.
-  * **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
  * **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.
  * **11.02.24:** - Add Zimg support.
  * **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
--- a/root/ffmpegwrapper.sh
+++ b/root/ffmpegwrapper.sh
@ -13,11 +13,11 @@ set_uidgid () {
 run_ffmpeg () {
  # we do not have input file or it does not exist on disk just run as root
  if [ -z ${INPUT_FILE+x} ] || [ ! -f "${INPUT_FILE}" ]; then
-    exec /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
+    /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
  # we found the input file run as abc
  else
    set_uidgid
-    exec s6-setuidgid abc \
+    s6-setuidgid abc \
      /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
  fi
 }