Bot Updating Package Versions

2026-04-13 22:06:58 +09:00 · 2024-01-05 18:32:08 +00:00 · 2023-12-22 18:31:05 +00:00 · 2023-12-15 18:32:01 +00:00 · 2023-12-08 18:32:04 +00:00 · 2023-12-01 18:31:59 +00:00
14 changed files with 518 additions and 513 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,7 +24,7 @@
 ## Readme
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/development/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/master/readme-vars.yml).
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-heimdall)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Update the changelog
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/development/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/master/root), add an entry to the changelog
 ```yml
 changelogs:
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@
 ------------------------------
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 ------------------------------
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -4,26 +4,26 @@ on:
  workflow_dispatch:
 jobs:
-  external-trigger-development:
+  external-trigger-master:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3.1.0
      - name: External Trigger
-        if: github.ref == 'refs/heads/development'
+        if: github.ref == 'refs/heads/master'
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
+          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\". ****"
-          echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
+          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" | jq -r '. | .sha' | cut -c1-8)
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" | jq -r '. | .tag_name')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for heimdall branch development"
+            FAILURE_REASON="Can't retrieve external version for heimdall branch master"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-heimdall/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -35,7 +35,7 @@ jobs:
          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/heimdall"
-          tag="development"
+          tag="latest"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \
            | jq -r '.token')
@@ -61,7 +61,7 @@ jobs:
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for heimdall tag development"
+            FAILURE_REASON="Can't retrieve last pushed version for heimdall 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 }}
@@ -73,7 +73,7 @@ jobs:
            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-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
@@ -81,7 +81,7 @@ jobs:
            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-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/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 ****"
@@ -97,7 +97,7 @@ jobs:
              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
              --data-urlencode "Submit=Submit"
            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for heimdall tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for heimdall tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -9,5 +9,5 @@ jobs:
    - uses: actions/first-interaction@v1
      with:
        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/development/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -4,28 +4,28 @@ on:
  workflow_dispatch:
 jobs:
-  package-trigger-development:
+  package-trigger-master:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3.1.0
      - name: Package Trigger
-        if: github.ref == 'refs/heads/development'
+        if: github.ref == 'refs/heads/master'
        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/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 development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
+          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\". ****"
-          echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
+          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/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 ****"
--- a/16
+++ b/16
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
 # set version label
 ARG BUILD_DATE
@@ -15,11 +15,11 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
-    php83-intl \
+    php82-intl \
-    php83-pdo_pgsql \
+    php82-pdo_pgsql \
-    php83-pdo_sqlite \
+    php82-pdo_sqlite \
-    php83-pdo_mysql \
+    php82-pdo_mysql \
-    php83-tokenizer && \
+    php82-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
@@ -29,8 +29,8 @@ RUN \
  mkdir -p \
    /heimdall && \
  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
-    | awk '/sha/{print $4;exit}' FS='[""]'); \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
    /tmp/heimdall.tar.gz -L \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
 # set version label
 ARG BUILD_DATE
@@ -15,11 +15,11 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
-    php83-intl \
+    php82-intl \
-    php83-pdo_pgsql \
+    php82-pdo_pgsql \
-    php83-pdo_sqlite \
+    php82-pdo_sqlite \
-    php83-pdo_mysql \
+    php82-pdo_mysql \
-    php83-tokenizer && \
+    php82-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
@@ -29,8 +29,8 @@ RUN \
  mkdir -p \
    /heimdall && \
  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
-    | awk '/sha/{print $4;exit}' FS='[""]'); \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
    /tmp/heimdall.tar.gz -L \
--- a/395
+++ b/395
@@ -16,7 +16,6 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
    EXT_GIT_BRANCH = '2.x'
    EXT_USER = 'linuxserver'
    EXT_REPO = 'Heimdall'
@@ -51,7 +50,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:development 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -62,16 +61,11 @@ pipeline {
          env.COMMIT_SHA = sh(
            script: '''git rev-parse HEAD''',
            returnStdout: true).trim()
          env.GH_DEFAULT_BRANCH = sh(
            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
            returnStdout: true).trim()
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
        }
        sh '''#! /bin/bash
              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
          env.LS_RELEASE_NUMBER = sh(
            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -80,7 +74,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 development-${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -113,21 +107,21 @@ pipeline {
    /* ########################
       External Release Tagging
       ######################## */
-    // If this is a github commit trigger determine the current commit at head
+    // If this is a stable github release use the latest endpoint from github to determine the ext tag
-    stage("Set ENV github_commit"){
+    stage("Set ENV github_stable"){
     steps{
       script{
         env.EXT_RELEASE = sh(
-           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
+           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
           returnStdout: true).trim()
       }
     }
    }
-    // If this is a github commit trigger Set the external release link
+    // If this is a stable or devel github release generate the link for the build message
-    stage("Set ENV commit_link"){
+    stage("Set ENV github_link"){
     steps{
       script{
-         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE
+         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
       }
     }
    }
@@ -136,7 +130,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()
          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -154,7 +148,7 @@ pipeline {
          }
          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
+            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
            }
            println("SEMVER: ${env.SEMVER}")
@@ -165,10 +159,10 @@ pipeline {
        }
      }
    }
-    // If this is a development build use live docker endpoints
+    // If this is a master build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -178,20 +172,20 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = 'development-' + 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 = 'development-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "development"}
+        not {branch "master"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -201,13 +195,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
-            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -224,13 +218,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@@ -265,164 +259,129 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
        }
      }
      steps {
-        withCredentials([
+        sh '''#! /bin/bash
-          [
+              set -e
-            $class: 'UsernamePasswordMultiBinding',
+              TEMPDIR=$(mktemp -d)
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-            usernameVariable: 'DOCKERUSER',
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-            passwordVariable: 'DOCKERPASS'
+              # Stage 1 - Jenkinsfile update
-          ]
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-        ]) {
+                mkdir -p ${TEMPDIR}/repo
-          sh '''#! /bin/bash
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                set -e
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                TEMPDIR=$(mktemp -d)
+                git checkout -f master
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+                git add Jenkinsfile
-                # Stage 1 - Jenkinsfile update
+                git commit -m 'Bot Updating Templated Files'
-                if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                  mkdir -p ${TEMPDIR}/repo
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                echo "Updating Jenkinsfile"
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                rm -Rf ${TEMPDIR}
-                  git checkout -f development
+                exit 0
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+              else
-                  git add Jenkinsfile
+                echo "Jenkinsfile is up to date."
-                  git commit -m 'Bot Updating Templated Files'
+              fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              # Stage 2 - Delete old templates
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              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"
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              for i in ${OLD_TEMPLATES}; do
-                  echo "Updating Jenkinsfile"
+                if [[ -f "${i}" ]]; then
-                  rm -Rf ${TEMPDIR}
+                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
                  exit 0
                else
                  echo "Jenkinsfile is up to date."
                fi
-                # Stage 2 - Delete old templates
+              done
-                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"
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                for i in ${OLD_TEMPLATES}; do
+                mkdir -p ${TEMPDIR}/repo
-                  if [[ -f "${i}" ]]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                  fi
+                git checkout -f master
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
-                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                git commit -m 'Bot Updating Templated Files'
-                  mkdir -p ${TEMPDIR}/repo
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                echo "Deleting old and deprecated templates"
-                  git checkout -f development
+                rm -Rf ${TEMPDIR}
-                  for i in ${TEMPLATES_TO_DELETE}; do
+                exit 0
-                    git rm "${i}"
+              else
-                  done
+                echo "No templates to delete"
-                  git commit -m 'Bot Updating Templated Files'
+              fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              # Stage 3 - Update templates
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                  echo "Deleting old and deprecated templates"
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  rm -Rf ${TEMPDIR}
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
-                  exit 0
+                mkdir -p ${TEMPDIR}/repo
-                else
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                  echo "No templates to delete"
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                fi
+                git checkout -f master
                # Stage 3 - Update templates
                CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                  mkdir -p ${TEMPDIR}/repo
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}/
-                  git checkout -f development
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+                  echo ".jenkins-external" >> .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                  git add .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                fi
-                  cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git add readme-vars.yml ${TEMPLATED_FILES}
-                  cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git commit -m 'Bot Updating Templated Files'
-                  cd ${TEMPDIR}/repo/${LS_REPO}/
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                  if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                    echo ".jenkins-external" >> .gitignore
+              else
-                    git add .gitignore
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  fi
+              fi
-                  git add readme-vars.yml ${TEMPLATED_FILES}
+              mkdir -p ${TEMPDIR}/docs
-                  git commit -m 'Bot Updating Templated Files'
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                cd ${TEMPDIR}/docs/docker-documentation
                git add docs/images/docker-${CONTAINER_NAME}.md
                git commit -m 'Bot Updating Documentation'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
              fi
              mkdir -p ${TEMPDIR}/unraid
              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                cd ${TEMPDIR}/unraid/templates/
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                  echo "Image is on the ignore list, marking Unraid template as deprecated"
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add -u unraid/${CONTAINER_NAME}.xml
                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                else
-                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                fi
-                mkdir -p ${TEMPDIR}/docs
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
-                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              fi
-                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
+              rm -Rf ${TEMPDIR}'''
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+        script{
-                  cd ${TEMPDIR}/docs/docker-documentation
+          env.FILES_UPDATED = sh(
-                  GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
-                  git add docs/images/docker-${CONTAINER_NAME}.md
+            returnStdout: true).trim()
                  git commit -m 'Bot Updating Documentation'
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
                fi
                mkdir -p ${TEMPDIR}/unraid
                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
                if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
                elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
                fi
                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                  cd ${TEMPDIR}/unraid/templates/
                  GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                  if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                    echo "Image is on the ignore list, marking Unraid template as deprecated"
                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                    git add -u unraid/${CONTAINER_NAME}.xml
                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
                  else
                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                    git add unraid/${CONTAINER_NAME}.xml
                    git commit -m 'Bot Updating Unraid Template'
                  fi
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                fi
                # Stage 4 - Sync Readme to Docker Hub
                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
                    echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
                    DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
                  else
                    echo "Syncing readme to Docker Hub"
                    DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                  fi
                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
                  curl -s \
                    -H "Authorization: JWT ${DH_TOKEN}" \
                    -H "Content-Type: application/json" \
                    -X PATCH \
                    -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
                    https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
                else
                  echo "Not the default Github branch. Skipping readme sync to Docker Hub."
                fi
                rm -Rf ${TEMPDIR}'''
          script{
            env.FILES_UPDATED = sh(
              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
              returnStdout: true).trim()
          }
        }
      }
    }
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -435,10 +394,10 @@ pipeline {
        }
      }
    }
-    // If this is a development build check the S6 service file perms
+    // If this is a master build check the S6 service file perms
    stage("Check S6 Service file Permissions"){
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -580,7 +539,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -603,14 +562,13 @@ pipeline {
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -628,7 +586,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -642,7 +600,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -735,12 +693,12 @@ pipeline {
                  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}:development
+                    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}:development
+                    docker push ${PUSHIMAGE}:latest
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
@@ -786,10 +744,10 @@ pipeline {
                  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-development
+                    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-development
+                    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}
@@ -797,17 +755,17 @@ pipeline {
                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-development
+                    docker push ${MANIFESTIMAGE}:amd64-latest
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-development
+                    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}:development || :
+                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8
+                    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
@@ -823,13 +781,13 @@ pipeline {
                    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-development")
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || :
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:development
+                    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
@@ -844,7 +802,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "development"
+        branch "master"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -856,17 +814,17 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\
+             "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
-              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_RELEASE_CLEAN} | jq '.commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "development",\
+                     "target_commitish": "master",\
                     "name": "'${META_TAG}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": true}' >> releasebody.json
+              printf '","draft": false,"prerelease": false}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
@@ -874,14 +832,14 @@ pipeline {
    // Add protection to the release branch
    stage('Github-Release-Branch-Protection') {
      when {
-        branch "development"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Setting up protection for release branch development"
+        echo "Setting up protection for release branch master"
        sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/development/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
          -d $(jq -c .  << EOF
            {
              "required_status_checks": null,
@@ -906,6 +864,39 @@ EOF
          ) '''
      }
    }
    // Use helper container to sync the current README on master to the dockerhub endpoint
    stage('Sync-README') {
      when {
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
        withCredentials([
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
            usernameVariable: 'DOCKERUSER',
            passwordVariable: 'DOCKERPASS'
          ]
        ]) {
          sh '''#! /bin/bash
                set -e
                TEMPDIR=$(mktemp -d)
                docker pull ghcr.io/linuxserver/jenkins-builder:latest
                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
                docker pull ghcr.io/linuxserver/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
                  -e DOCKER_REPOSITORY=${IMAGE} \
                  -e GIT_BRANCH=master \
                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
                rm -Rf ${TEMPDIR} '''
        }
      }
    }
    // If this is a Pull request send the CI link as a comment on it
    stage('Pull Request Comment') {
      when {
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -36,7 +36,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
-[![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-heimdall%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/)
+[![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-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/latest/index.html)
 [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.
@@ -51,7 +51,7 @@ Why not use it as your browser start page? It even has the ability to include a
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
-Simply pulling `lscr.io/linuxserver/heimdall:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/heimdall:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 The architectures supported by this image are:
@@ -87,16 +87,17 @@ To help you get started creating a container from this image you can either use
 ```yaml
 ---
 version: "2.1"
 services:
  heimdall:
-    image: lscr.io/linuxserver/heimdall:development
+    image: lscr.io/linuxserver/heimdall:latest
    container_name: heimdall
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Etc/UTC
    volumes:
-      - /path/to/heimdall/config:/config
+      - /path/to/appdata/config:/config
    ports:
      - 80:80
      - 443:443
@@ -113,9 +114,9 @@ docker run -d \
  -e TZ=Etc/UTC \
  -p 80:80 \
  -p 443:443 \
-  -v /path/to/heimdall/config:/config \
+  -v /path/to/appdata/config:/config \
  --restart unless-stopped \
-  lscr.io/linuxserver/heimdall:development
+  lscr.io/linuxserver/heimdall:latest
 ```
 ## Parameters
@@ -129,7 +130,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Persistent config files |
+| `-v /config` | Contains all relevant configuration files. |
 ## Environment variables from files (Docker secrets)
@@ -195,12 +196,12 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:latest
    ```
 ## Updating Info
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 Below are the instructions for updating containers:
@@ -243,7 +244,7 @@ Below are the instructions for updating containers:
 * Update the image:
    ```bash
-    docker pull lscr.io/linuxserver/heimdall:development
+    docker pull lscr.io/linuxserver/heimdall:latest
    ```
 * Stop the running container:
@@ -265,6 +266,21 @@ Below are the instructions for updating containers:
    docker image prune
    ```
 ### Via Watchtower auto-updater (only use if you don't remember the original parameters)
 * Pull the latest image at its tag and replace it with the same env variables in one run:
    ```bash
    docker run --rm \
      -v /var/run/docker.sock:/var/run/docker.sock \
      containrrr/watchtower \
      --run-once heimdall
    ```
 * You can also remove the old dangling images: `docker image prune`
 **warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
@@ -279,7 +295,7 @@ cd docker-heimdall
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/heimdall:development .
+  -t lscr.io/linuxserver/heimdall:latest .
 ```
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -292,22 +308,27 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
-* **04.11.22:** - Build commits to upstream branch 2.x.
+* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag.
 * **13.03.21:** - Make searchproviders.yaml user configurable.
 * **11.03.21:** - Rebase to alpine 3.14.
 * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel.
 * **10.02.21:** - Rebasing to alpine 3.13.
 * **17.08.20:** - Add php7-curl.
 * **01.06.20:** - Rebasing to alpine 3.12.
 * **17.01.20:** - Use nginx from baseimage.
 * **19.12.19:** - Rebasing to alpine 3.11.
-* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
+* **16.07.19:** - Save laravel.log to /config/log/heimdall.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **01.04.19:** - Fix permission detect logic.
 * **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **15.03.19:** - Clarify docker image tags in readme.
 * **22.02.19:** - Rebasing to alpine 3.9.
 * **16.01.18:** - Generate random app key in .env for new installs.
 * **20.11.18:** - Upgrade baseimage packages during build.
 * **04.11.18:** - Add php7-zip.
 * **31.10.18:** - Add queue service.
 * **17.10.18:** - Symlink avatars folder.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -2,10 +2,10 @@
 # jenkins variables
 project_name: docker-heimdall
-external_type: github_commit
+external_type: github_stable
-release_type: prerelease
+release_type: stable
-release_tag: development
+release_tag: latest
-ls_branch: development
+ls_branch: master
 build_armhf: false
 repo_vars:
  - EXT_GIT_BRANCH = '2.x'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,234 +1,229 @@
-NAME                                VERSION                TYPE         
+NAME                                VERSION                 TYPE         
-Hidden Input                        1, 0, 0, 0             dotnet        
+Hidden Input                        1, 0, 0, 0              dotnet        
-alpine-baselayout                   3.4.3-r2               apk           
+alpine-baselayout                   3.4.3-r1                apk           
-alpine-baselayout-data              3.4.3-r2               apk           
+alpine-baselayout-data              3.4.3-r1                apk           
-alpine-keys                         2.4-r1                 apk           
+alpine-keys                         2.4-r1                  apk           
-alpine-release                      3.19.1-r0              apk           
+alpine-release                      3.18.5-r0               apk           
-apache2-utils                       2.4.58-r1              apk           
+apache2-utils                       2.4.58-r0               apk           
-apk-tools                           2.14.0-r5              apk           
+apk-tools                           2.14.0-r2               apk           
-apr                                 1.7.4-r0               apk           
+apr                                 1.7.4-r0                apk           
-apr-util                            1.6.3-r1               apk           
+apr-util                            1.6.3-r1                apk           
-argon2-libs                         20190702-r5            apk           
+argon2-libs                         20190702-r4             apk           
-barryvdh/laravel-ide-helper         v2.12.3                php-composer  
+barryvdh/laravel-ide-helper         v2.12.3                 php-composer  
-barryvdh/reflection-docblock        v2.1.0                 php-composer  
+barryvdh/reflection-docblock        v2.1.0                  php-composer  
-bash                                5.2.21-r0              apk           
+bash                                5.2.15-r5               apk           
-brick/math                          0.9.3                  php-composer  
+brick/math                          0.9.3                   php-composer  
-brotli-libs                         1.1.0-r1               apk           
+brotli-libs                         1.0.9-r14               apk           
-busybox                             1.36.1-r15             apk           
+busybox                             1.36.1-r5               apk           
-busybox-binsh                       1.36.1-r15             apk           
+busybox-binsh                       1.36.1-r5               apk           
-c-ares                              1.24.0-r1              apk           
+ca-certificates                     20230506-r0             apk           
-ca-certificates                     20230506-r0            apk           
+ca-certificates-bundle              20230506-r0             apk           
-ca-certificates-bundle              20230506-r0            apk           
+clue/stream-filter                  v1.6.0                  php-composer  
-clue/stream-filter                  v1.6.0                 php-composer  
+composer                            2.6.6                   binary        
-composer                            2.7.0                  binary        
+composer/pcre                       3.1.0                   php-composer  
-composer/pcre                       3.1.0                  php-composer  
+coreutils                           9.3-r1                  apk           
-coreutils                           9.4-r2                 apk           
+curl                                8.5.0-r0                apk           
-coreutils-env                       9.4-r2                 apk           
+dflydev/dot-access-data             v3.0.2                  php-composer  
-coreutils-fmt                       9.4-r2                 apk           
+doctrine/cache                      2.2.0                   php-composer  
-coreutils-sha512sum                 9.4-r2                 apk           
+doctrine/dbal                       3.5.1                   php-composer  
-curl                                8.5.0-r0               apk           
+doctrine/deprecations               v1.0.0                  php-composer  
-dflydev/dot-access-data             v3.0.2                 php-composer  
+doctrine/event-manager              1.2.0                   php-composer  
-doctrine/cache                      2.2.0                  php-composer  
+doctrine/inflector                  2.0.6                   php-composer  
-doctrine/dbal                       3.5.1                  php-composer  
+doctrine/instantiator               1.4.1                   php-composer  
-doctrine/deprecations               v1.0.0                 php-composer  
+doctrine/lexer                      1.2.3                   php-composer  
-doctrine/event-manager              1.2.0                  php-composer  
+dragonmantank/cron-expression       v3.3.2                  php-composer  
-doctrine/inflector                  2.0.6                  php-composer  
+egulias/email-validator             2.1.25                  php-composer  
-doctrine/instantiator               1.4.1                  php-composer  
+facade/flare-client-php             1.10.0                  php-composer  
-doctrine/lexer                      1.2.3                  php-composer  
+facade/ignition                     2.17.6                  php-composer  
-dragonmantank/cron-expression       v3.3.2                 php-composer  
+facade/ignition-contracts           1.0.2                   php-composer  
-egulias/email-validator             2.1.25                 php-composer  
+fideloper/proxy                     4.4.2                   php-composer  
-facade/flare-client-php             1.10.0                 php-composer  
+filp/whoops                         2.14.6                  php-composer  
-facade/ignition                     2.17.6                 php-composer  
+fzaninotto/faker                    v1.9.2                  php-composer  
-facade/ignition-contracts           1.0.2                  php-composer  
+git                                 2.40.1-r0               apk           
-fideloper/proxy                     4.4.2                  php-composer  
+graham-campbell/bounded-cache       v1.3.0                  php-composer  
-filp/whoops                         2.14.6                 php-composer  
+graham-campbell/github              v10.6.0                 php-composer  
-fzaninotto/faker                    v1.9.2                 php-composer  
+graham-campbell/manager             v4.7.0                  php-composer  
-git                                 2.43.0-r0              apk           
+graham-campbell/result-type         v1.1.0                  php-composer  
-graham-campbell/bounded-cache       v1.3.0                 php-composer  
+guzzlehttp/guzzle                   7.5.0                   php-composer  
-graham-campbell/github              v10.6.0                php-composer  
+guzzlehttp/promises                 1.5.2                   php-composer  
-graham-campbell/manager             v4.7.0                 php-composer  
+guzzlehttp/psr7                     2.4.3                   php-composer  
-graham-campbell/result-type         v1.1.0                 php-composer  
+hamcrest/hamcrest-php               v2.0.1                  php-composer  
-guzzlehttp/guzzle                   7.5.0                  php-composer  
+icu-data-en                         73.2-r2                 apk           
-guzzlehttp/promises                 1.5.2                  php-composer  
+icu-libs                            73.2-r2                 apk           
-guzzlehttp/psr7                     2.4.3                  php-composer  
+jq                                  1.6-r4                  apk           
-hamcrest/hamcrest-php               v2.0.1                 php-composer  
+knplabs/github-api                  v3.6.0                  php-composer  
-hiredis                             1.2.0-r0               apk           
+laravel/framework                   v8.83.26                php-composer  
-icu-data-en                         74.1-r0                apk           
+laravel/serializable-closure        v1.2.2                  php-composer  
-icu-libs                            74.1-r0                apk           
+laravel/tinker                      v2.7.3                  php-composer  
-jq                                  1.7.1-r0               apk           
+laravel/ui                          v3.4.6                  php-composer  
-knplabs/github-api                  v3.6.0                 php-composer  
+laravelcollective/html              v6.3.0                  php-composer  
-laravel/framework                   v8.83.26               php-composer  
+league/commonmark                   2.3.7                   php-composer  
-laravel/serializable-closure        v1.2.2                 php-composer  
+league/config                       v1.1.1                  php-composer  
-laravel/tinker                      v2.7.3                 php-composer  
+league/flysystem                    1.1.10                  php-composer  
-laravel/ui                          v3.4.6                 php-composer  
+league/mime-type-detection          1.11.0                  php-composer  
-laravelcollective/html              v6.3.0                 php-composer  
+libacl                              2.3.1-r3                apk           
-league/commonmark                   2.3.7                  php-composer  
+libattr                             2.5.1-r4                apk           
-league/config                       v1.1.1                 php-composer  
+libbsd                              0.11.7-r1               apk           
-league/flysystem                    1.1.10                 php-composer  
+libbz2                              1.0.8-r5                apk           
-league/mime-type-detection          1.11.0                 php-composer  
+libc-utils                          0.7.2-r5                apk           
-libacl                              2.3.1-r4               apk           
+libcrypto3                          3.1.4-r1                apk           
-libattr                             2.5.1-r5               apk           
+libcurl                             8.5.0-r0                apk           
-libbsd                              0.11.7-r3              apk           
+libedit                             20221030.3.1-r1         apk           
-libbz2                              1.0.8-r6               apk           
+libexpat                            2.5.0-r1                apk           
-libc-utils                          0.7.2-r5               apk           
+libgcc                              12.2.1_git20220924-r10  apk           
-libcrypto3                          3.1.4-r5               apk           
+libidn2                             2.3.4-r1                apk           
-libcurl                             8.5.0-r0               apk           
+libintl                             0.21.1-r7               apk           
-libedit                             20230828.3.1-r3        apk           
+libmd                               1.0.4-r2                apk           
-libexpat                            2.5.0-r2               apk           
+libncursesw                         6.4_p20230506-r0        apk           
-libgcc                              13.2.1_git20231014-r0  apk           
+libpq                               15.5-r0                 apk           
-libidn2                             2.3.4-r4               apk           
+libproc2                            4.0.4-r0                apk           
-libintl                             0.22.3-r0              apk           
+libssl3                             3.1.4-r1                apk           
-libmd                               1.1.0-r0               apk           
+libstdc++                           12.2.1_git20220924-r10  apk           
-libncursesw                         6.4_p20231125-r0       apk           
+libunistring                        1.1-r1                  apk           
-libpq                               16.2-r0                apk           
+libuuid                             2.38.1-r8               apk           
-libproc2                            4.0.4-r0               apk           
+libxml2                             2.11.6-r0               apk           
-libssl3                             3.1.4-r5               apk           
+libzip                              1.9.2-r2                apk           
-libstdc++                           13.2.1_git20231014-r0  apk           
+linux-pam                           1.5.2-r10               apk           
-libunistring                        1.1-r2                 apk           
+logrotate                           3.21.0-r1               apk           
-libuuid                             2.39.3-r0              apk           
+mockery/mockery                     1.5.1                   php-composer  
-libxml2                             2.11.6-r0              apk           
+monolog/monolog                     2.8.0                   php-composer  
-libzip                              1.10.1-r0              apk           
+musl                                1.2.4-r2                apk           
-linux-pam                           1.5.3-r7               apk           
+musl-utils                          1.2.4-r2                apk           
-logrotate                           3.21.0-r1              apk           
+myclabs/deep-copy                   1.11.0                  php-composer  
-mockery/mockery                     1.5.1                  php-composer  
+nano                                7.2-r1                  apk           
-monolog/monolog                     2.8.0                  php-composer  
+ncurses-terminfo-base               6.4_p20230506-r0        apk           
-musl                                1.2.4_git20230717-r4   apk           
+nesbot/carbon                       2.63.0                  php-composer  
-musl-utils                          1.2.4_git20230717-r4   apk           
+netcat-openbsd                      1.219-r1                apk           
-myclabs/deep-copy                   1.11.0                 php-composer  
+nette/schema                        v1.2.3                  php-composer  
-nano                                7.2-r1                 apk           
+nette/utils                         v3.2.8                  php-composer  
-ncurses-terminfo-base               6.4_p20231125-r0       apk           
+nghttp2-libs                        1.57.0-r0               apk           
-nesbot/carbon                       2.63.0                 php-composer  
+nginx                               1.24.0-r7               apk           
-netcat-openbsd                      1.226-r0               apk           
+nikic/php-parser                    v4.15.2                 php-composer  
-nette/schema                        v1.2.3                 php-composer  
+nunomaduro/collision                v5.11.0                 php-composer  
-nette/utils                         v3.2.8                 php-composer  
+oniguruma                           6.9.8-r1                apk           
-nghttp2-libs                        1.58.0-r0              apk           
+openssl                             3.1.4-r1                apk           
-nginx                               1.24.0-r15             apk           
+opis/closure                        3.6.3                   php-composer  
-nikic/php-parser                    v4.15.2                php-composer  
+pcre                                8.45-r3                 apk           
-nunomaduro/collision                v5.11.0                php-composer  
+pcre2                               10.42-r1                apk           
-oniguruma                           6.9.9-r0               apk           
+phar-io/manifest                    2.0.3                   php-composer  
-openssl                             3.1.4-r5               apk           
+phar-io/version                     3.2.1                   php-composer  
-opis/closure                        3.6.3                  php-composer  
+php-http/cache-plugin               1.7.5                   php-composer  
-pcre                                8.45-r3                apk           
+php-http/client-common              2.6.0                   php-composer  
-pcre2                               10.42-r2               apk           
+php-http/discovery                  1.14.3                  php-composer  
-phar-io/manifest                    2.0.3                  php-composer  
+php-http/httplug                    2.3.0                   php-composer  
-phar-io/version                     3.2.1                  php-composer  
+php-http/message                    1.13.0                  php-composer  
-php-http/cache-plugin               1.7.5                  php-composer  
+php-http/message-factory            v1.0.2                  php-composer  
-php-http/client-common              2.6.0                  php-composer  
+php-http/multipart-stream-builder   1.2.0                   php-composer  
-php-http/discovery                  1.14.3                 php-composer  
+php-http/promise                    1.1.0                   php-composer  
-php-http/httplug                    2.3.0                  php-composer  
+php82                               8.2.13-r0               apk           
-php-http/message                    1.13.0                 php-composer  
+php82-common                        8.2.13-r0               apk           
-php-http/message-factory            v1.0.2                 php-composer  
+php82-ctype                         8.2.13-r0               apk           
-php-http/multipart-stream-builder   1.2.0                  php-composer  
+php82-curl                          8.2.13-r0               apk           
-php-http/promise                    1.1.0                  php-composer  
+php82-fileinfo                      8.2.13-r0               apk           
-php83                               8.3.2-r0               apk           
+php82-fpm                           8.2.13-r0               apk           
-php83-common                        8.3.2-r0               apk           
+php82-iconv                         8.2.13-r0               apk           
-php83-ctype                         8.3.2-r0               apk           
+php82-intl                          8.2.13-r0               apk           
-php83-curl                          8.3.2-r0               apk           
+php82-mbstring                      8.2.13-r0               apk           
-php83-fileinfo                      8.3.2-r0               apk           
+php82-mysqlnd                       8.2.13-r0               apk           
-php83-fpm                           8.3.2-r0               apk           
+php82-openssl                       8.2.13-r0               apk           
-php83-iconv                         8.3.2-r0               apk           
+php82-pdo                           8.2.13-r0               apk           
-php83-intl                          8.3.2-r0               apk           
+php82-pdo_mysql                     8.2.13-r0               apk           
-php83-mbstring                      8.3.2-r0               apk           
+php82-pdo_pgsql                     8.2.13-r0               apk           
-php83-mysqlnd                       8.3.2-r0               apk           
+php82-pdo_sqlite                    8.2.13-r0               apk           
-php83-openssl                       8.3.2-r0               apk           
+php82-phar                          8.2.13-r0               apk           
-php83-pdo                           8.3.2-r0               apk           
+php82-session                       8.2.13-r0               apk           
-php83-pdo_mysql                     8.3.2-r0               apk           
+php82-simplexml                     8.2.13-r0               apk           
-php83-pdo_pgsql                     8.3.2-r0               apk           
+php82-tokenizer                     8.2.13-r0               apk           
-php83-pdo_sqlite                    8.3.2-r0               apk           
+php82-xml                           8.2.13-r0               apk           
-php83-phar                          8.3.2-r0               apk           
+php82-xmlwriter                     8.2.13-r0               apk           
-php83-session                       8.3.2-r0               apk           
+php82-zip                           8.2.13-r0               apk           
-php83-simplexml                     8.3.2-r0               apk           
+phpdocumentor/reflection-common     2.2.0                   php-composer  
-php83-tokenizer                     8.3.2-r0               apk           
+phpdocumentor/type-resolver         1.6.2                   php-composer  
-php83-xml                           8.3.2-r0               apk           
+phpoption/phpoption                 1.9.0                   php-composer  
-php83-xmlwriter                     8.3.2-r0               apk           
+phpunit/php-code-coverage           9.2.19                  php-composer  
-php83-zip                           8.3.2-r0               apk           
+phpunit/php-file-iterator           3.0.6                   php-composer  
-phpdocumentor/reflection-common     2.2.0                  php-composer  
+phpunit/php-invoker                 3.1.1                   php-composer  
-phpdocumentor/type-resolver         1.6.2                  php-composer  
+phpunit/php-text-template           2.0.4                   php-composer  
-phpoption/phpoption                 1.9.0                  php-composer  
+phpunit/php-timer                   5.0.3                   php-composer  
-phpunit/php-code-coverage           9.2.19                 php-composer  
+phpunit/phpunit                     9.5.26                  php-composer  
-phpunit/php-file-iterator           3.0.6                  php-composer  
+popt                                1.19-r2                 apk           
-phpunit/php-invoker                 3.1.1                  php-composer  
+procps-ng                           4.0.4-r0                apk           
-phpunit/php-text-template           2.0.4                  php-composer  
+psr/cache                           1.0.1                   php-composer  
-phpunit/php-timer                   5.0.3                  php-composer  
+psr/container                       1.1.2                   php-composer  
-phpunit/phpunit                     9.5.26                 php-composer  
+psr/event-dispatcher                1.0.0                   php-composer  
-popt                                1.19-r3                apk           
+psr/http-client                     1.0.1                   php-composer  
-procps-ng                           4.0.4-r0               apk           
+psr/http-factory                    1.0.1                   php-composer  
-psr/cache                           1.0.1                  php-composer  
+psr/http-message                    1.0.1                   php-composer  
-psr/container                       1.1.2                  php-composer  
+psr/log                             1.1.4                   php-composer  
-psr/event-dispatcher                1.0.0                  php-composer  
+psr/simple-cache                    1.0.1                   php-composer  
-psr/http-client                     1.0.1                  php-composer  
+psy/psysh                           v0.11.9                 php-composer  
-psr/http-factory                    1.0.1                  php-composer  
+ralouphie/getallheaders             3.0.3                   php-composer  
-psr/http-message                    1.0.1                  php-composer  
+ramsey/collection                   1.2.2                   php-composer  
-psr/log                             1.1.4                  php-composer  
+ramsey/uuid                         4.2.3                   php-composer  
-psr/simple-cache                    1.0.1                  php-composer  
+readline                            8.2.1-r1                apk           
-psy/psysh                           v0.11.9                php-composer  
+scanelf                             1.3.7-r1                apk           
-ralouphie/getallheaders             3.0.3                  php-composer  
+sebastian/cli-parser                1.0.1                   php-composer  
-ramsey/collection                   1.2.2                  php-composer  
+sebastian/code-unit                 1.0.8                   php-composer  
-ramsey/uuid                         4.2.3                  php-composer  
+sebastian/code-unit-reverse-lookup  2.0.3                   php-composer  
-readline                            8.2.1-r2               apk           
+sebastian/comparator                4.0.8                   php-composer  
-scanelf                             1.3.7-r2               apk           
+sebastian/complexity                2.0.2                   php-composer  
-sebastian/cli-parser                1.0.1                  php-composer  
+sebastian/diff                      4.0.4                   php-composer  
-sebastian/code-unit                 1.0.8                  php-composer  
+sebastian/environment               5.1.4                   php-composer  
-sebastian/code-unit-reverse-lookup  2.0.3                  php-composer  
+sebastian/exporter                  4.0.5                   php-composer  
-sebastian/comparator                4.0.8                  php-composer  
+sebastian/global-state              5.0.5                   php-composer  
-sebastian/complexity                2.0.2                  php-composer  
+sebastian/lines-of-code             1.0.3                   php-composer  
-sebastian/diff                      4.0.4                  php-composer  
+sebastian/object-enumerator         4.0.4                   php-composer  
-sebastian/environment               5.1.4                  php-composer  
+sebastian/object-reflector          2.0.4                   php-composer  
-sebastian/exporter                  4.0.5                  php-composer  
+sebastian/recursion-context         4.0.4                   php-composer  
-sebastian/global-state              5.0.5                  php-composer  
+sebastian/resource-operations       3.0.3                   php-composer  
-sebastian/lines-of-code             1.0.3                  php-composer  
+sebastian/type                      3.2.0                   php-composer  
-sebastian/object-enumerator         4.0.4                  php-composer  
+sebastian/version                   3.0.2                   php-composer  
-sebastian/object-reflector          2.0.4                  php-composer  
+shadow                              4.13-r4                 apk           
-sebastian/recursion-context         4.0.4                  php-composer  
+skalibs                             2.13.1.1-r1             apk           
-sebastian/resource-operations       3.0.3                  php-composer  
+sqlite-libs                         3.41.2-r2               apk           
-sebastian/type                      3.2.0                  php-composer  
+squizlabs/php_codesniffer           3.7.1                   php-composer  
-sebastian/version                   3.0.2                  php-composer  
+ssl_client                          1.36.1-r5               apk           
-shadow                              4.14.2-r0              apk           
+swiftmailer/swiftmailer             v6.3.0                  php-composer  
-skalibs                             2.14.0.1-r0            apk           
+symfony/cache                       v5.4.15                 php-composer  
-sqlite-libs                         3.44.2-r0              apk           
+symfony/cache-contracts             v2.5.2                  php-composer  
-squizlabs/php_codesniffer           3.7.1                  php-composer  
+symfony/console                     v5.4.15                 php-composer  
-ssl_client                          1.36.1-r15             apk           
+symfony/css-selector                v5.4.11                 php-composer  
-swiftmailer/swiftmailer             v6.3.0                 php-composer  
+symfony/deprecation-contracts       v2.5.2                  php-composer  
-symfony/cache                       v5.4.15                php-composer  
+symfony/error-handler               v5.4.15                 php-composer  
-symfony/cache-contracts             v2.5.2                 php-composer  
+symfony/event-dispatcher            v5.4.9                  php-composer  
-symfony/console                     v5.4.15                php-composer  
+symfony/event-dispatcher-contracts  v2.5.2                  php-composer  
-symfony/css-selector                v5.4.11                php-composer  
+symfony/finder                      v5.4.11                 php-composer  
-symfony/deprecation-contracts       v2.5.2                 php-composer  
+symfony/http-foundation             v5.4.15                 php-composer  
-symfony/error-handler               v5.4.15                php-composer  
+symfony/http-kernel                 v5.4.15                 php-composer  
-symfony/event-dispatcher            v5.4.9                 php-composer  
+symfony/mime                        v5.4.14                 php-composer  
-symfony/event-dispatcher-contracts  v2.5.2                 php-composer  
+symfony/options-resolver            v5.4.11                 php-composer  
-symfony/finder                      v5.4.11                php-composer  
+symfony/polyfill-ctype              v1.27.0                 php-composer  
-symfony/http-foundation             v5.4.15                php-composer  
+symfony/polyfill-iconv              v1.27.0                 php-composer  
-symfony/http-kernel                 v5.4.15                php-composer  
+symfony/polyfill-intl-grapheme      v1.27.0                 php-composer  
-symfony/mime                        v5.4.14                php-composer  
+symfony/polyfill-intl-idn           v1.27.0                 php-composer  
-symfony/options-resolver            v5.4.11                php-composer  
+symfony/polyfill-intl-normalizer    v1.27.0                 php-composer  
-symfony/polyfill-ctype              v1.27.0                php-composer  
+symfony/polyfill-mbstring           v1.27.0                 php-composer  
-symfony/polyfill-iconv              v1.27.0                php-composer  
+symfony/polyfill-php72              v1.27.0                 php-composer  
-symfony/polyfill-intl-grapheme      v1.27.0                php-composer  
+symfony/polyfill-php73              v1.27.0                 php-composer  
-symfony/polyfill-intl-idn           v1.27.0                php-composer  
+symfony/polyfill-php80              v1.27.0                 php-composer  
-symfony/polyfill-intl-normalizer    v1.27.0                php-composer  
+symfony/polyfill-php81              v1.27.0                 php-composer  
-symfony/polyfill-mbstring           v1.27.0                php-composer  
+symfony/process                     v5.4.11                 php-composer  
-symfony/polyfill-php72              v1.27.0                php-composer  
+symfony/routing                     v5.4.15                 php-composer  
-symfony/polyfill-php73              v1.27.0                php-composer  
+symfony/service-contracts           v2.5.2                  php-composer  
-symfony/polyfill-php80              v1.27.0                php-composer  
+symfony/string                      v5.4.15                 php-composer  
-symfony/polyfill-php81              v1.27.0                php-composer  
+symfony/thanks                      v1.2.10                 php-composer  
-symfony/process                     v5.4.11                php-composer  
+symfony/translation                 v5.4.14                 php-composer  
-symfony/routing                     v5.4.15                php-composer  
+symfony/translation-contracts       v2.5.2                  php-composer  
-symfony/service-contracts           v2.5.2                 php-composer  
+symfony/var-dumper                  v5.4.14                 php-composer  
-symfony/string                      v5.4.15                php-composer  
+symfony/var-exporter                v5.4.10                 php-composer  
-symfony/thanks                      v1.2.10                php-composer  
+symfony/yaml                        v5.4.14                 php-composer  
-symfony/translation                 v5.4.14                php-composer  
+theseer/tokenizer                   1.2.1                   php-composer  
-symfony/translation-contracts       v2.5.2                 php-composer  
+tijsverkoyen/css-to-inline-styles   2.2.5                   php-composer  
-symfony/var-dumper                  v5.4.14                php-composer  
+tzdata                              2023d-r0                apk           
-symfony/var-exporter                v5.4.10                php-composer  
+utmps-libs                          0.1.2.1-r1              apk           
-symfony/yaml                        v5.4.14                php-composer  
+vlucas/phpdotenv                    v5.5.0                  php-composer  
-theseer/tokenizer                   1.2.1                  php-composer  
+voku/portable-ascii                 1.6.1                   php-composer  
-tijsverkoyen/css-to-inline-styles   2.2.5                  php-composer  
+webmozart/assert                    1.11.0                  php-composer  
-tzdata                              2024a-r0               apk           
+xz-libs                             5.4.3-r0                apk           
-utmps-libs                          0.1.2.2-r0             apk           
+zlib                                1.2.13-r1               apk           
-vlucas/phpdotenv                    v5.5.0                 php-composer  
+zstd-libs                           1.5.5-r4                apk           
 voku/portable-ascii                 1.6.1                  php-composer  
 webmozart/assert                    1.11.0                 php-composer  
 xz-libs                             5.4.5-r0               apk           
 zlib                                1.3.1-r0               apk           
 zstd-libs                           1.5.5-r8               apk           
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -28,7 +28,7 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
+  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
 param_usage_include_ports: true
 param_ports:
  - { external_port: "80", internal_port: "80", port_desc: "http gui" }
@@ -37,15 +37,6 @@ param_usage_include_env: true
 param_env_vars:
  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 # optional parameters
 optional_block_1: false
 optional_block_1_items:
  - |
    Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
    Add the development tag,  if required,  to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
    The development tag will be the latest commit in the master branch of Heimdall.
    HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -58,22 +49,27 @@ app_setup_block: |
 # changelog
 changelogs:
  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
  - { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
-  - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x." }
+  - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." }
  - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }
  - { date: "11.03.21:", desc: "Rebase to alpine 3.14." }
  - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }
  - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
  - { date: "17.08.20:", desc: "Add php7-curl." }
  - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
  - { date: "17.01.20:", desc: "Use nginx from baseimage." }
  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
-  - { date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start." }
+  - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
  - { date: "01.04.19:", desc: "Fix permission detect logic." }
  - { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
  - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
  - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
  - { date: "04.11.18:", desc: "Add php7-zip." }
  - { date: "31.10.18:", desc: "Add queue service." }
  - { date: "17.10.18:", desc: "Symlink avatars folder." }
--- a/root/etc/s6-overlay/s6-rc.d/svc-queue/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-queue/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 exec \
    s6-setuidgid abc php /app/www/artisan queue:work database --sleep=3 --tries=3
--- a/root/migrations/02-default-location
+++ b/root/migrations/02-default-location
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /var/www/localhost/heimdall/public;"
Author	SHA1	Message	Date
LinuxServer-CI	883863471c	Bot Updating Package Versions	2024-01-05 18:32:08 +00:00
LinuxServer-CI	578be1f1f3	Bot Updating Package Versions	2023-12-22 18:31:05 +00:00
LinuxServer-CI	4cb619e62d	Bot Updating Package Versions	2023-12-15 18:32:01 +00:00
LinuxServer-CI	c5eeeea25f	Bot Updating Package Versions	2023-12-08 18:32:04 +00:00
LinuxServer-CI	7d6fadb7a0	Bot Updating Package Versions	2023-12-01 18:31:59 +00:00
Eric Nemchik	6208bee94a	Merge pull request #138 from linuxserver/quiet-migration only run migration if conf exists	2023-11-29 08:30:57 -06:00
Eric Nemchik	5a13df03c2	only run migration if conf exists redirect stderr to /dev/null Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-25 10:42:57 -06:00
LinuxServer-CI	95b5c12980	Bot Updating Package Versions	2023-11-24 18:30:13 +00:00
LinuxServer-CI	1930594564	Bot Updating Package Versions	2023-11-17 18:34:44 +00:00
LinuxServer-CI	ab062598dd	Bot Updating Templated Files	2023-11-17 18:31:28 +00:00
LinuxServer-CI	6e67e9639f	Bot Updating Package Versions	2023-11-10 18:29:51 +00:00
LinuxServer-CI	08c8690c05	Bot Updating Package Versions	2023-10-27 18:30:40 +00:00
LinuxServer-CI	10c24c4e6c	Bot Updating Package Versions	2023-10-20 18:30:04 +00:00
LinuxServer-CI	9f3e2d5e25	Bot Updating Package Versions	2023-10-13 18:32:34 +00:00
LinuxServer-CI	7f2ed151a8	Bot Updating Templated Files	2023-10-07 00:23:35 +00:00
LinuxServer-CI	edf366cafc	Bot Updating Package Versions	2023-10-06 18:37:37 +00:00
LinuxServer-CI	56cfd5e4f9	Bot Updating Templated Files	2023-10-06 18:32:40 +00:00
LinuxServer-CI	ec44060cd9	Bot Updating Templated Files	2023-10-06 18:30:08 +00:00
LinuxServer-CI	9c3398a642	Bot Updating Package Versions	2023-09-29 18:30:40 +00:00
LinuxServer-CI	8ae8376b0e	Bot Updating Package Versions	2023-09-22 18:31:02 +00:00
LinuxServer-CI	171f7a06ba	Bot Updating Package Versions	2023-09-08 18:29:10 +00:00
LinuxServer-CI	ea77b698e9	Bot Updating Package Versions	2023-09-01 18:28:10 +00:00
LinuxServer-CI	72e0b2429d	Bot Updating Package Versions	2023-08-18 18:29:16 +00:00
LinuxServer-CI	cd14d065fb	Bot Updating Package Versions	2023-08-11 18:28:08 +00:00
LinuxServer-CI	5ec148867c	Bot Updating Package Versions	2023-08-04 18:29:09 +00:00
LinuxServer-CI	bc67105b9f	Bot Updating Package Versions	2023-07-28 18:27:45 +00:00
LinuxServer-CI	78ce2e7888	Bot Updating Package Versions	2023-07-21 18:31:34 +00:00
LinuxServer-CI	a3d7d6b52d	Bot Updating Package Versions	2023-07-14 18:33:24 +00:00
LinuxServer-CI	73abea2a2a	Bot Updating Package Versions	2023-07-07 18:35:16 +00:00
LinuxServer-CI	2ee1aac893	Bot Updating Templated Files	2023-07-07 18:33:06 +00:00
LinuxServer-CI	ca1aad4eef	Bot Updating Package Versions	2023-06-23 18:33:17 +00:00
LinuxServer-CI	4b1ebc551b	Bot Updating Package Versions	2023-06-16 18:30:20 +00:00
LinuxServer-CI	405811c812	Bot Updating Package Versions	2023-06-09 18:29:18 +00:00
LinuxServer-CI	72febc8128	Bot Updating Package Versions	2023-06-02 18:30:09 +00:00
LinuxServer-CI	79cc6e9958	Bot Updating Package Versions	2023-05-31 17:35:27 +00:00
Eric Nemchik	106be7d4c8	Merge pull request #130 from linuxserver/3.18 Rebase to Alpine 3.18, deprecate armhf	2023-05-31 12:31:46 -05:00
Eric Nemchik	ef39ae4b09	Merge remote-tracking branch 'origin/master' into 3.18 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-05-29 17:29:04 -05:00
Eric Nemchik	d631acbc2b	Rebase to Alpine 3.18, deprecate armhf	2023-05-27 16:51:39 -05:00
LinuxServer-CI	1d14a698e9	Bot Updating Package Versions	2023-05-26 18:32:01 +00:00
LinuxServer-CI	a39cf6077e	Bot Updating Templated Files	2023-05-26 18:28:15 +00:00
LinuxServer-CI	913d0ae731	Bot Updating Package Versions	2023-05-19 18:28:38 +00:00
LinuxServer-CI	f4373faaf7	Bot Updating Package Versions	2023-05-12 18:28:26 +00:00
LinuxServer-CI	6337038936	Bot Updating Package Versions	2023-04-28 18:32:32 +00:00
LinuxServer-CI	b4d0dd10ed	Bot Updating Templated Files	2023-04-28 18:29:38 +00:00
LinuxServer-CI	0cd62d2600	Bot Updating Templated Files	2023-04-28 18:28:39 +00:00
LinuxServer-CI	7a416945f8	Bot Updating Package Versions	2023-04-21 18:30:09 +00:00
LinuxServer-CI	3a461589ae	Bot Updating Package Versions	2023-04-18 09:13:38 -05:00
Eric Nemchik	7423abbba3	Merge pull request #125 from linuxserver/move-ssl-include Move ssl.conf include to default.conf	2023-04-18 09:08:13 -05:00
LinuxServer-CI	dc90782e9b	Bot Updating Package Versions	2023-04-14 13:30:32 -05:00
Eric Nemchik	4bc9c1c0a8	Move ssl.conf include to default.conf	2023-04-13 11:05:47 -05:00
LinuxServer-CI	c1e8f4aff6	Bot Updating Package Versions	2023-04-07 13:35:44 -05:00
LinuxServer-CI	ed2a01883e	Bot Updating Package Versions	2023-04-02 03:03:28 -05:00
LinuxServer-CI	d4a94d2b22	Bot Updating Templated Files	2023-04-02 03:01:08 -05:00
LinuxServer-CI	268c0bd387	Bot Updating Templated Files	2023-04-02 02:59:33 -05:00
LinuxServer-CI	270e7fe693	Bot Updating Templated Files	2023-04-02 02:58:01 -05:00
LinuxServer-CI	12b0376ef0	Bot Updating Package Versions	2023-03-26 02:58:20 -05:00
LinuxServer-CI	279e8aff58	Bot Updating Package Versions	2023-03-09 17:53:32 +01:00
LinuxServer-CI	ff2790ec89	Bot Updating Package Versions	2023-03-05 09:00:27 +01:00
LinuxServer-CI	94c5031806	Bot Updating Templated Files	2023-03-05 08:57:50 +01:00
LinuxServer-CI	201ead3860	Bot Updating Package Versions	2023-02-26 01:59:11 -06:00
LinuxServer-CI	2a933c71f5	Bot Updating Package Versions	2023-02-19 08:58:54 +01:00
LinuxServer-CI	2579fdf1d5	Bot Updating Package Versions	2023-02-12 02:01:32 -06:00
LinuxServer-CI	9da5735d04	Bot Updating Templated Files	2023-02-12 01:59:02 -06:00
LinuxServer-CI	75a85e47d0	Bot Updating Templated Files	2023-02-12 01:57:45 -06:00
LinuxServer-CI	21da59c4d2	Bot Updating Package Versions	2023-02-05 01:58:11 -06:00
LinuxServer-CI	46f6a30e9d	Bot Updating Package Versions	2023-01-27 04:20:22 -06:00
Eric Nemchik	86be90bf2e	Merge pull request #120 from linuxserver/3.17 Rebase to alpine 3.17 with php8.1 (master)	2023-01-27 04:17:38 -06:00
Eric Nemchik	de8ba1b570	Fix perm check	2023-01-25 19:33:19 -06:00
Eric Nemchik	96d2cfabc4	Adjust for overlayfs chown bug	2023-01-25 19:19:23 -06:00
Eric Nemchik	fb74b689ec	Adjust file ownership	2023-01-23 20:46:38 -06:00
Eric Nemchik	59fd8f30c9	Only set folder permissions when symlinking	2023-01-23 20:08:33 -06:00
Eric Nemchik	b9940034b8	Move install back to Dockerfile	2023-01-23 19:50:44 -06:00
Eric Nemchik	0a47a08cc0	Rebase to alpine 3.17 with php8.1	2023-01-22 16:28:25 -06:00
LinuxServer-CI	4ed42cde3a	Bot Updating Package Versions	2023-01-22 01:58:06 -06:00
Eric Nemchik	c4f48e26a5	Merge pull request #119 from linuxserver/format Format shell scripts	2023-01-18 06:02:56 -06:00
Eric Nemchik	a7e8da1751	Format shell scripts	2023-01-15 09:48:49 -06:00
LinuxServer-CI	fed915b7c7	Bot Updating Package Versions	2022-12-25 08:57:52 +01:00
LinuxServer-CI	89d886bf9b	Bot Updating Templated Files	2022-12-04 02:00:50 -06:00
LinuxServer-CI	311858e691	Bot Updating Templated Files	2022-12-04 08:59:21 +01:00
LinuxServer-CI	c8907dc91d	Bot Updating Templated Files	2022-12-04 01:58:04 -06:00
Eric Nemchik	a7e89cd97c	Merge pull request #112 from linuxserver/fix-permissions Reorder init to fix permissions	2022-11-25 11:20:32 -06:00
TheSpad	56f29b5e96	Symlink before permissions	2022-11-25 16:27:53 +00:00
TheSpad	9279d33966	Reorder init to fix permissions	2022-11-25 16:26:58 +00:00
KodeStar	e1be906c7a	Merge pull request #111 from linuxserver/master-logs Remove logrotate and symlink logs	2022-11-25 15:10:38 +00:00
Eric Nemchik	40f301e5f9	Spacing	2022-11-25 01:04:24 +00:00
Eric Nemchik	b4403d7c37	Remove logrotate and symlink logs	2022-11-24 23:11:37 +00:00
LinuxServer-CI	2d84657f1c	Bot Updating Package Versions	2022-11-24 00:08:34 +01:00
Eric Nemchik	09350f3a5c	Merge pull request #79 from linuxserver/standard-base Standard base	2022-11-23 17:06:49 -06:00