Move dotfile denial up

Signed-off-by: Eric Nemchik <eric@nemchik.com>
Remove duplicate configuration for '.well-known' directory
2026-06-03 09:57:35 +00:00 · 2026-05-05 16:53:27 -05:00 · 2026-05-04 15:52:09 -05:00 · 2026-02-08 10:27:40 -06:00 · 2026-02-05 21:03:40 +00:00 · 2026-01-29 20:55:04 +00:00
12 changed files with 274 additions and 332 deletions
@@ -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-nextcloud/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-nextcloud/edit/develop/readme-vars.yml).

 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-nextcloud)
@@ -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-nextcloud/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-nextcloud/tree/develop/root), add an entry to the changelog

 ```yml
 changelogs:
@@ -21,7 +21,7 @@

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

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

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

@@ -7,31 +7,31 @@ permissions:
  contents: read

 jobs:
-  external-trigger-master:
+  external-trigger-develop:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4.1.1

      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
        env:
          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
          printf "# External trigger for docker-nextcloud\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^nextcloud_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          if grep -q "^nextcloud_develop_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
-          elif grep -q "^nextcloud_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_develop_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
+          elif grep -q "^nextcloud_develop" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`nextcloud_develop\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of master branch. To disable this trigger, add \`nextcloud_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of develop branch. To disable this trigger, add \`nextcloud_develop\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^nextcloud_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          if grep -q "^nextcloud_develop_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
@@ -39,7 +39,7 @@ jobs:
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve external version for nextcloud branch master"
+            FAILURE_REASON="Can't retrieve external version for nextcloud branch develop"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-nextcloud/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"}],
@@ -50,7 +50,7 @@ jobs:
          echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
          image="linuxserver/nextcloud"
-          tag="latest"
+          tag="develop"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fnextcloud%3Apull" \
            | jq -r '.token')
@@ -96,7 +96,7 @@ jobs:
          if [ -z "${IMAGE_VERSION}" ]; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag develop"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -106,14 +106,14 @@ jobs:
          if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
            echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
            if [[ "${artifacts_found}" == "false" ]]; then
              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              FAILURE_REASON="New version ${EXT_RELEASE} for nextcloud tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              FAILURE_REASON="New version ${EXT_RELEASE} for nextcloud tag develop is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -124,7 +124,7 @@ jobs:
                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
              fi
              response=$(curl -iX POST \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/buildWithParameters?PACKAGE_CHECK=false \
                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -139,7 +139,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 nextcloud tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
+              TRIGGER_REASON="A version change was detected for nextcloud tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -15,5 +15,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-nextcloud/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -18,9 +18,6 @@ RUN \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
-    imagemagick-heic \
-    imagemagick-pdf \
-    imagemagick-svg \
    libxml2 \
    php84-apcu \
    php84-bcmath \
@@ -50,7 +47,6 @@ RUN \
    php84-xmlreader \
    rsync \
    samba-client \
-    util-linux \
    sudo && \
  echo "**** configure php-fpm to pass env vars ****" && \
  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
@@ -84,12 +80,12 @@ RUN \
    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
  curl -o \
    /tmp/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
  tar xf /tmp/nextcloud.tar.bz2 -C \
    /app/www/src --strip-components=1 && \
  rm -rf /app/www/src/updater && \
@@ -18,9 +18,6 @@ RUN \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
-    imagemagick-heic \
-    imagemagick-pdf \
-    imagemagick-svg \
    libxml2 \
    php84-apcu \
    php84-bcmath \
@@ -50,7 +47,6 @@ RUN \
    php84-xmlreader \
    rsync \
    samba-client \
-    util-linux \
    sudo && \
  echo "**** configure php-fpm to pass env vars ****" && \
  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
@@ -84,12 +80,12 @@ RUN \
    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
  curl -o \
    /tmp/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
  tar xf /tmp/nextcloud.tar.bz2 -C \
    /app/www/src --strip-components=1 && \
  rm -rf /app/www/src/updater && \
@@ -75,10 +75,8 @@ pipeline {
           '''
        script{
          env.EXIT_STATUS = ''
-          env.CI_TEST_ATTEMPTED = ''
-          env.PUSH_ATTEMPTED = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:develop 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -111,7 +109,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 develop-${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -149,7 +147,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1 ''',
+            script: ''' curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1 ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
@@ -189,10 +187,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a develop build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -202,13 +200,13 @@ pipeline {
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
          env.CITEST_IMAGETAG = 'latest'
        }
@@ -217,7 +215,7 @@ pipeline {
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "develop"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -227,13 +225,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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
          env.CITEST_IMAGETAG = 'develop'
@@ -252,13 +250,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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
@@ -285,7 +283,7 @@ pipeline {
                  -v ${WORKSPACE}:/mnt \
                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
                    apk add --no-cache python3 && \
                    python3 -m venv /lsiopy && \
                    pip install --no-cache-dir -U pip && \
@@ -297,7 +295,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -309,24 +307,24 @@ pipeline {
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
              # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch develop of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch develop of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch develop --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
              echo "Starting Stage 1 - Jenkinsfile update"
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -345,13 +343,13 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -366,20 +364,20 @@ pipeline {
                sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
              fi
              mkdir -p ${TEMPDIR}/d2
-              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
+              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:develop
              ls -al ${TEMPDIR}/d2
-              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
+              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-develop.d2\\")" readme-vars.yml
              if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
                echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
                git add readme-vars.yml
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -396,7 +394,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -409,8 +407,8 @@ pipeline {
                fi
                git add readme-vars.yml ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -511,7 +509,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -524,10 +522,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build check the S6 service file perms
+    // If this is a develop build check the S6 service file perms
    stage("Check S6 Service file Permissions"){
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -780,7 +778,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -803,14 +801,14 @@ pipeline {
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f develop
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -828,7 +826,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -842,7 +840,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -873,7 +871,6 @@ pipeline {
          script{
            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
-            env.CI_TEST_ATTEMPTED = 'true'
          }
          sh '''#! /bin/bash
                set -e
@@ -897,7 +894,7 @@ pipeline {
                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                -e TAGS=\"${CI_TAGS}\" \
                -e META_TAG=\"${META_TAG}\" \
-                -e RELEASE_TAG=\"latest\" \
+                -e RELEASE_TAG=\"develop\" \
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
@@ -926,9 +923,6 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        script{
-          env.PUSH_ATTEMPTED = 'true'
-        }
        retry_backoff(5,5) {
          sh '''#! /bin/bash
                set -e
@@ -940,7 +934,7 @@ pipeline {
                          CACHEIMAGE=${i}
                      fi
                  done
-                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:develop -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
                    { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                  if [ -n "${SEMVER}" ]; then
                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -958,27 +952,20 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        script{
-          env.PUSH_ATTEMPTED = 'true'
-        }
        retry_backoff(5,5) {
          sh '''#! /bin/bash
                set -e
                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then
-                    MANIFESTIMAGEPLUS="${MANIFESTIMAGE}"
-                  else
-                    MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-                  fi
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                  for i in "${CACHE[@]}"; do
                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
                          CACHEIMAGE=${i}
                      fi
                  done
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-develop -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-develop -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                  if [ -n "${SEMVER}" ]; then
                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -988,7 +975,7 @@ pipeline {
                  fi
                done
                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop || \
                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
@@ -1006,7 +993,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "develop"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -1022,21 +1009,21 @@ pipeline {
              else
                AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes  \
                  -d '{"tag_name":"'${META_TAG}'",\
-                      "target_commitish": "master"}' \
+                      "target_commitish": "develop"}' \
                  | jq -r '.body' | sed 's|## What.s Changed||')
              fi
              echo "Pushing New tag for current commit ${META_TAG}"
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
                -d '{"tag":"'${META_TAG}'",\
                  "object": "'${COMMIT_SHA}'",\
-                  "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+                  "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to develop",\
                  "type": "commit",\
                  "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
              echo "Pushing New release for Tag"
              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
              jq -n \
                --arg tag_name "$META_TAG" \
-                --arg target_commitish "master" \
+                --arg target_commitish "develop" \
                --arg ci_url "${CI_URL:-N/A}" \
                --arg ls_notes "$AUTO_RELEASE_NOTES" \
                --arg remote_notes "$(cat releasebody.json)" \
@@ -1046,7 +1033,7 @@ pipeline {
                  "name": $tag_name,
                  "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
                  "draft": false,
-                  "prerelease": false                }' > releasebody.json.done
+                  "prerelease": true                }' > 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
        '''
      }
@@ -1054,14 +1041,14 @@ pipeline {
    // Add protection to the release branch
    stage('Github-Release-Branch-Protection') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Setting up protection for release branch master"
+        echo "Setting up protection for release branch develop"
        sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/develop/protection \
          -d $(jq -c .  << EOF
            {
              "required_status_checks": null,
@@ -1086,13 +1073,98 @@ EOF
          ) '''
      }
    }
+    // If this is a Pull request send the CI link as a comment on it
+    stage('Pull Request Comment') {
+      when {
+        not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
+      }
+    }
  }
  /* ######################
-     Comment on PR and Send status to Discord
+     Send status to Discord
     ###################### */
  post {
    always {
-      script {
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
+      script{
        env.JOB_DATE = sh(
            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
            returnStdout: true).trim()
@@ -1135,94 +1207,6 @@ EOF
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
-      script {
-        if (env.GITHUBIMAGE =~ /lspipepr/){
-          if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true"){
-            sh '''#! /bin/bash
-                  # Function to retrieve JSON data from URL
-                  get_json() {
-                    local url="$1"
-                    local response=$(curl -s "$url")
-                    if [ $? -ne 0 ]; then
-                      echo "Failed to retrieve JSON data from $url"
-                      return 1
-                    fi
-                    local json=$(echo "$response" | jq .)
-                    if [ $? -ne 0 ]; then
-                      echo "Failed to parse JSON data from $url"
-                      return 1
-                    fi
-                    echo "$json"
-                  }
-
-                  build_table() {
-                    local data="$1"
-
-                    # Get the keys in the JSON data
-                    local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
-
-                    # Check if keys are empty
-                    if [ -z "$keys" ]; then
-                      echo "JSON report data does not contain any keys or the report does not exist."
-                      return 1
-                    fi
-
-                    # Build table header
-                    local header="| Tag | Passed |\\n| --- | --- |\\n"
-
-                    # Loop through the JSON data to build the table rows
-                    local rows=""
-                    for build in $keys; do
-                      local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
-                      if [ "$status" = "true" ]; then
-                        status="✅"
-                      else
-                        status="❌"
-                      fi
-                      local row="| "$build" | "$status" |\\n"
-                      rows="${rows}${row}"
-                    done
-
-                    local table="${header}${rows}"
-                    local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
-                    echo "$escaped_table"
-                  }
-
-                  if [[ "${CI}" = "true" ]]; then
-                    # Retrieve JSON data from URL
-                    data=$(get_json "$CI_JSON_URL")
-                    # Create table from JSON data
-                    table=$(build_table "$data")
-                    echo -e "$table"
-
-                    curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                      -H "Accept: application/vnd.github.v3+json" \
-                      "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                      -d "{\\"body\\": \\"I am a bot, here are the test results for this PR for commit ${COMMIT_SHA:0:7} : \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
-                  else
-                    curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                      -H "Accept: application/vnd.github.v3+json" \
-                      "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                      -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR for commit ${COMMIT_SHA:0:7} : \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
-                  fi
-                  '''
-          } else {
-            sh '''#! /bin/bash
-                  curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                    -H "Accept: application/vnd.github.v3+json" \
-                    "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                    -d "{\\"body\\": \\"I am a bot, the build for PR commit ${COMMIT_SHA:0:7} failed and as a result no CI test was attempted and no images were pushed.\\"}"
-            '''
-          }
-        }
-      }
-      sh '''#!/bin/bash
-            rm -rf /config/.ssh/id_sign
-            rm -rf /config/.ssh/id_sign.pub
-            git config --global --unset gpg.format
-            git config --global --unset user.signingkey
-            git config --global --unset commit.gpgsign
-        '''
    }
    cleanup {
      sh '''#! /bin/bash
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -34,8 +34,8 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nextcloud)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
-[![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-nextcloud%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/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%2Fnextcloud%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/latest/index.html)
+[![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-nextcloud%2Fjob%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fnextcloud%2Fdevelop%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/develop/index.html)

 [Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.

@@ -47,7 +47,7 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch

 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/nextcloud:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/nextcloud:develop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

 The architectures supported by this image are:

@@ -135,7 +135,7 @@ If you are using a reverse proxy which validates certificates, you need to [disa
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.

 >[!NOTE]
->Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided.
+>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.

 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))

@@ -143,7 +143,7 @@ To help you get started creating a container from this image you can either use
 ---
 services:
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: lscr.io/linuxserver/nextcloud:develop
    container_name: nextcloud
    environment:
      - PUID=1000
@@ -169,7 +169,7 @@ docker run -d \
  -v /path/to/nextcloud/config:/config \
  -v /path/to/data:/data \
  --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud:latest
+  lscr.io/linuxserver/nextcloud:develop
 ```

 ## Parameters
@@ -249,7 +249,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:

    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:develop
    ```

 ## Updating Info
@@ -297,7 +297,7 @@ Below are the instructions for updating containers:
 * Update the image:

    ```bash
-    docker pull lscr.io/linuxserver/nextcloud:latest
+    docker pull lscr.io/linuxserver/nextcloud:develop
    ```

 * Stop the running container:
@@ -334,7 +334,7 @@ cd docker-nextcloud
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/nextcloud:latest .
+  -t lscr.io/linuxserver/nextcloud:develop .
 ```

 The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
@@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-nextcloud
 external_type: na
-custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
-release_type: stable
-release_tag: latest
-ls_branch: master
+custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
  - LS_USER = 'linuxserver'
@@ -2,11 +2,10 @@ NAME                                 VERSION               TYPE
 Process Wrapper                      0.0.0.0               binary        (+1 duplicate)  
 acl-libs                             2.3.2-r1              apk                           
 activity                             6.0.0-dev.0           npm                           
-agetty                               2.41-r9               apk                           
 alpine-baselayout                    3.7.0-r0              apk                           
 alpine-baselayout-data               3.7.0-r0              apk                           
 alpine-keys                          2.5-r0                apk                           
-alpine-release                       3.22.4-r0             apk                           
+alpine-release                       3.22.3-r0             apk                           
 alsa-lib                             1.2.14-r0             apk                           
 amphp/amp                            v2.6.5                php-composer                  
 amphp/byte-stream                    v1.8.2                php-composer                  
@@ -23,7 +22,7 @@ anstyle-query                        1.0.2                 rust-crate
 anyhow                               1.0.79                rust-crate                    
 anyhow                               1.0.98                rust-crate                    
 aom-libs                             3.12.1-r0             apk                           
-apache2-utils                        2.4.67-r0             apk                           
+apache2-utils                        2.4.66-r0             apk                           
 apk-tools                            2.14.9-r3             apk                           
 apr                                  1.7.5-r0              apk                           
 apr-util                             1.6.3-r1              apk                           
@@ -32,9 +31,8 @@ argon2-libs                          20190702-r5           apk
 arrayvec                             0.7.4                 rust-crate                    
 av-metrics                           0.9.1                 rust-crate                    
 av1-grain                            0.2.3                 rust-crate                    
-avahi-libs                           0.8-r21               apk                           
 aws/aws-crt-php                      v1.2.7                php-composer                  
-aws/aws-sdk-php                      3.376.2               php-composer                  
+aws/aws-sdk-php                      3.369.9               php-composer                  
 bamarni/composer-bin-plugin          1.8.3                 php-composer                  
 bantu/ini-get-wrapper                v1.0.1                php-composer                  
 bash                                 5.2.37-r0             apk                           
@@ -43,18 +41,15 @@ bitstream-io                         2.2.0                 rust-crate
 bitstream-io                         2.6.0                 rust-crate                    
 bitvec                               1.0.1                 rust-crate                    
 bitvec_helpers                       3.1.6                 rust-crate                    
-blkid                                2.41-r9               apk                           
 brick/math                           0.12.1                php-composer                  
 brotli-libs                          1.1.0-r2              apk                           
 busybox                              1.37.0-r20            apk                           
 busybox-binsh                        1.37.0-r20            apk                           
 c-ares                               1.34.6-r0             apk                           
 c-client                             2007f-r15             apk                           
-ca-certificates                      20260413-r0           apk                           
-ca-certificates-bundle               20260413-r0           apk                           
-cairo                                1.18.4-r0             apk                           
+ca-certificates                      20250911-r0           apk                           
+ca-certificates-bundle               20250911-r0           apk                           
 catatonit                            0.2.1-r0              apk                           
-cfdisk                               2.41-r9               apk                           
 cfg-if                               1.0.0                 rust-crate                    
 christian-riesen/base32              1.6.0                 php-composer                  
 cjson                                1.7.19-r0             apk                           
@@ -64,7 +59,7 @@ clap_complete                        4.4.6                 rust-crate
 clap_derive                          4.4.7                 rust-crate                    
 clap_lex                             0.6.0                 rust-crate                    
 colorchoice                          1.0.0                 rust-crate                    
-composer                             2.10.0                binary                        
+composer                             2.9.5                 binary                        
 console                              0.15.8                rust-crate                    
 coreutils                            9.7-r1                apk                           
 coreutils-env                        9.7-r1                apk                           
@@ -78,13 +73,11 @@ crossbeam-deque                      0.8.5                 rust-crate
 crossbeam-epoch                      0.9.18                rust-crate                    
 crossbeam-queue                      0.3.11                rust-crate                    
 crossbeam-utils                      0.8.19                rust-crate                    
-cups-libs                            2.4.18-r0             apk                           
 curl                                 8.14.1-r2             apk                           
 cweagans/composer-patches            1.7.3                 php-composer                  
 dbus-libs                            1.16.2-r1             apk                           
 deepdiver/zipstreamer                v2.0.3                php-composer                  
 deepdiver1975/tarstreamer            v2.1.0                php-composer                  
-dmesg                                2.41-r9               apk                           
 doctrine/dbal                        3.10.4                php-composer                  
 doctrine/deprecations                1.1.5                 php-composer                  
 doctrine/event-manager               2.0.1                 php-composer                  
@@ -106,20 +99,15 @@ ffmpeg-libswscale                    6.1.2-r2              apk
 fftw-double-libs                     3.3.10-r6             apk                           
 files_downloadlimit                  5.1.0-dev.0           npm                           
 files_pdfviewer                      6.0.0-dev.0           npm                           
-findmnt                              2.41-r9               apk                           
 findutils                            4.10.0-r0             apk                           
 firstrunwizard                       6.0.0-dev.0           npm                           
-flock                                2.41-r9               apk                           
 fontconfig                           2.15.0-r3             apk                           
 freetype                             2.13.3-r0             apk                           
 fribidi                              1.0.16-r1             apk                           
-fstrim                               2.41-r9               apk                           
 funty                                2.0.0                 rust-crate                    
 fusonic/opengraph                    v3.0.0                php-composer                  
 gdbm                                 1.24-r0               apk                           
-gdk-pixbuf                           2.42.12-r1            apk                           
 getrandom                            0.2.12                rust-crate                    
-ghostscript                          10.05.1-r0            apk                           
 giflib                               5.2.2-r1              apk                           
 giggsey/libphonenumber-for-php-lite  9.0.9                 php-composer                  
 git                                  2.49.1-r0             apk                           
@@ -129,7 +117,7 @@ glslang-libs                         1.4.309.0-r0          apk
 gmp                                  6.3.0-r3              apk                           
 gnu-libiconv                         1.17-r2               apk                           
 gnu-libiconv-libs                    1.17-r2               apk                           
-gnutls                               3.8.13-r0             apk                           
+gnutls                               3.8.8-r0              apk                           
 graphite2                            1.3.14-r6             apk                           
 guzzlehttp/guzzle                    7.10.0                php-composer                  
 guzzlehttp/promises                  2.3.0                 php-composer                  
@@ -137,7 +125,6 @@ guzzlehttp/psr7                      2.8.0                 php-composer
 guzzlehttp/uri-template              v1.0.4                php-composer                  
 harfbuzz                             11.2.1-r0             apk                           
 heck                                 0.4.1                 rust-crate                    
-hexdump                              2.41-r9               apk                           
 hexogen/kdtree                       v0.2.6                php-composer                  
 hwdata-pci                           0.395-r0              apk                           
 icewind/searchdav                    v3.2.0                php-composer                  
@@ -145,24 +132,18 @@ icewind/smb                          3.8.1                 php-composer
 icewind/streams                      v0.7.8                php-composer                  
 icu-data-en                          76.1-r1               apk                           
 icu-libs                             76.1-r1               apk                           
-imagemagick                          7.1.2.15-r0           apk                           
-imagemagick-heic                     7.1.2.15-r0           apk                           
-imagemagick-jpeg                     7.1.2.15-r0           apk                           
-imagemagick-jxl                      7.1.2.15-r0           apk                           
-imagemagick-libs                     7.1.2.15-r0           apk                           
-imagemagick-openexr                  7.1.2.15-r0           apk                           
-imagemagick-pango                    7.1.2.15-r0           apk                           
-imagemagick-pdf                      7.1.2.15-r0           apk                           
-imagemagick-svg                      7.1.2.15-r0           apk                           
-imagemagick-tiff                     7.1.2.15-r0           apk                           
-imagemagick-webp                     7.1.2.15-r0           apk                           
+imagemagick                          7.1.2.8-r0            apk                           
+imagemagick-jpeg                     7.1.2.8-r0            apk                           
+imagemagick-jxl                      7.1.2.8-r0            apk                           
+imagemagick-libs                     7.1.2.8-r0            apk                           
+imagemagick-openexr                  7.1.2.8-r0            apk                           
+imagemagick-webp                     7.1.2.8-r0            apk                           
 imath                                3.1.12-r0             apk                           
 interpolate_name                     0.2.4                 rust-crate                    
 itertools                            0.10.5                rust-crate                    
 itertools                            0.12.0                rust-crate                    
 ivf                                  0.1.3                 rust-crate                    
 jansson                              2.14.1-r0             apk                           
-jbig2dec                             0.20-r0               apk                           
 joomla/string                        3.0.4                 php-composer                  
 jq                                   1.8.1-r0              apk                           
 justinrainbow/json-schema            6.6.4                 php-composer                  
@@ -171,7 +152,7 @@ lab                                  0.11.0                rust-crate
 lame-libs                            3.100-r5              apk                           
 laravel/serializable-closure         v2.0.4                php-composer                  
 lazy_static                          1.4.0                 rust-crate                    
-lcms2                                2.19-r0               apk                           
+lcms2                                2.16-r0               apk                           
 lcobucci/clock                       3.0.0                 php-composer                  
 ldb                                  4.21.9-r1             apk                           
 libSvtAv1Enc                         2.3.0-r0              apk                           
@@ -188,26 +169,22 @@ libbsd                               0.12.2-r0             apk
 libbz2                               1.0.8-r6              apk                           
 libc                                 0.2.155               rust-crate                    
 libc                                 0.2.172               rust-crate                    
-libcap-ng                            0.8.5-r0              apk                           
-libcap2                              2.78-r0               apk                           
-libcrypto3                           3.5.6-r0              apk                           
+libcap2                              2.76-r0               apk                           
+libcrypto3                           3.5.5-r0              apk                           
 libcurl                              8.14.1-r2             apk                           
 libdav1d                             1.5.1-r0              apk                           
-libde265                             1.0.15-r1             apk                           
 libdeflate                           1.23-r0               apk                           
 libdovi                              3.3.1-r1              apk                           
 libdrm                               2.4.124-r0            apk                           
 libeconf                             0.6.3-r0              apk                           
 libedit                              20250104.3.1-r1       apk                           
 libevent                             2.1.12-r8             apk                           
-libexpat                             2.7.5-r0              apk                           
-libfdisk                             2.41-r9               apk                           
+libexpat                             2.7.4-r0              apk                           
 libffi                               3.4.8-r0              apk                           
 libflac                              1.4.3-r1              apk                           
 libformw                             6.5_p20250503-r0      apk                           
 libgcc                               14.2.0-r6             apk                           
 libgomp                              14.2.0-r6             apk                           
-libheif                              1.19.8-r1             apk                           
 libhwy                               1.0.7-r1              apk                           
 libice                               1.1.2-r0              apk                           
 libidn2                              2.3.7-r0              apk                           
@@ -225,23 +202,21 @@ libopenmpt                           0.7.15-r0             apk
 libpanelw                            6.5_p20250503-r0      apk                           
 libpciaccess                         0.18.1-r0             apk                           
 libplacebo                           6.338.2-r3            apk                           
-libpng                               1.6.57-r0             apk                           
-libpq                                17.10-r0              apk                           
+libpng                               1.6.54-r0             apk                           
+libpq                                17.7-r0               apk                           
 libproc2                             4.0.4-r3              apk                           
 libpsl                               0.21.5-r3             apk                           
 libpulse                             17.0-r5               apk                           
 librist                              0.2.10-r1             apk                           
-librsvg                              2.60.0-r0             apk                           
 libsasl                              2.1.28-r8             apk                           
 libsharpyuv                          1.5.0-r0              apk                           
 libsm                                1.2.5-r0              apk                           
-libsmartcols                         2.41-r9               apk                           
 libsmbclient                         4.21.9-r1             apk                           
 libsndfile                           1.2.2-r2              apk                           
 libsodium                            1.0.20-r1             apk                           
 libsrt                               1.5.3-r1              apk                           
 libssh                               0.11.2-r0             apk                           
-libssl3                              3.5.6-r0              apk                           
+libssl3                              3.5.5-r0              apk                           
 libstdc++                            14.2.0-r6             apk                           
 libtasn1                             4.21.0-r0             apk                           
 libtheora                            1.1.1-r18             apk                           
@@ -262,10 +237,8 @@ libxcb                               1.17.0-r0             apk
 libxdmcp                             1.1.5-r1              apk                           
 libxext                              1.3.6-r2              apk                           
 libxfixes                            6.0.1-r4              apk                           
-libxft                               2.3.8-r3              apk                           
 libxml2                              2.13.9-r0             apk                           
-libxpm                               3.5.19-r0             apk                           
-libxrender                           0.9.12-r0             apk                           
+libxpm                               3.5.17-r0             apk                           
 libxt                                1.3.1-r0              apk                           
 libxxhash                            0.8.3-r0              apk                           
 libyuv                               0.0.1887.20251502-r1  apk                           
@@ -276,39 +249,33 @@ linux-pam                            1.7.0-r4              apk
 linux-raw-sys                        0.4.12                rust-crate                    
 lmdb                                 0.9.33-r0             apk                           
 log                                  0.4.20                rust-crate                    
-logger                               2.41-r9               apk                           
 logreader                            6.0.0                 npm                           
 logrotate                            3.21.0-r1             apk                           
-losetup                              2.41-r9               apk                           
-lsblk                                2.41-r9               apk                           
-lscpu                                2.41-r9               apk                           
 lz4-libs                             1.10.0-r0             apk                           
 marc-mabe/php-enum                   v4.7.1                php-composer                  
 masterminds/html5                    2.9.0                 php-composer                  
 maybe-rayon                          0.1.1                 rust-crate                    
-mbedtls                              3.6.6-r0              apk                           
-mcookie                              2.41-r9               apk                           
+mbedtls                              3.6.5-r0              apk                           
 memchr                               2.7.1                 rust-crate                    
 mexitek/phpcolors                    v1.0.4                php-composer                  
 microsoft/azure-storage-blob         1.5.4                 php-composer                  
 microsoft/azure-storage-common       1.5.2                 php-composer                  
 minimal-lexical                      0.2.1                 rust-crate                    
 mlocati/ip-lib                       1.22.0                php-composer                  
-mount                                2.41-r9               apk                           
 mpg123-libs                          1.32.10-r0            apk                           
 mtdowling/jmespath.php               2.8.0                 php-composer                  
-musl                                 1.2.5-r12             apk                           
-musl-utils                           1.2.5-r12             apk                           
+musl                                 1.2.5-r10             apk                           
+musl-utils                           1.2.5-r10             apk                           
 nano                                 8.4-r0                apk                           
 ncurses-terminfo-base                6.5_p20250503-r0      apk                           
 nelexa/buffer                        1.3.0                 php-composer                  
 netcat-openbsd                       1.229.1-r0            apk                           
-nettle                               3.10.2-r0             apk                           
+nettle                               3.10.1-r0             apk                           
 new_debug_unreachable                1.0.4                 rust-crate                    
 nextcloud                            1.0.0                 npm                           
-nextcloud/lognormalizer              v3.0.1                php-composer                  
-nghttp2-libs                         1.69.0-r0             apk                           
-nginx                                1.28.3-r2             apk                           
+nextcloud/lognormalizer              v3.0.0                php-composer                  
+nghttp2-libs                         1.65.0-r0             apk                           
+nginx                                1.28.2-r0             apk                           
 nom                                  7.1.3                 rust-crate                    
 noop_proc_macro                      0.3.0                 rust-crate                    
 notifications                        6.0.0-dev.0           npm                           
@@ -325,14 +292,11 @@ openexr-libiex                       3.3.2-r0              apk
 openexr-libilmthread                 3.3.2-r0              apk                           
 openexr-libopenexr                   3.3.2-r0              apk                           
 openexr-libopenexrcore               3.3.2-r0              apk                           
-openjpeg                             2.5.3-r0              apk                           
-openssl                              3.5.6-r0              apk                           
+openssl                              3.5.5-r0              apk                           
 opus                                 1.5.2-r1              apk                           
 orc                                  0.4.40-r1             apk                           
 p11-kit                              0.25.5-r2             apk                           
-pango                                1.56.3-r0             apk                           
 paragonie/constant_time_encoding     v2.6.3                php-composer                  
-partx                                2.41-r9               apk                           
 password_policy                      5.0.0-dev.0           npm                           
 paste                                1.0.14                rust-crate                    
 pcre2                                10.46-r0              apk                           
@@ -391,10 +355,8 @@ php84-xml                            8.4.16-r0             apk
 php84-xmlreader                      8.4.16-r0             apk                           
 php84-xmlwriter                      8.4.16-r0             apk                           
 php84-zip                            8.4.16-r0             apk                           
-phpseclib/phpseclib                  2.0.53                php-composer                  
+phpseclib/phpseclib                  2.0.47                php-composer                  
 pimple/pimple                        v3.6.0                php-composer                  
-pixman                               0.46.4-r0             apk                           
-pkgconf                              2.4.3-r0              apk                           
 popt                                 1.19-r4               apk                           
 ppv-lite86                           0.2.17                rust-crate                    
 privacy                              5.0.0-dev.0           npm                           
@@ -423,11 +385,10 @@ rayon                                1.8.0                 rust-crate
 rayon-core                           1.12.0                rust-crate                    
 readline                             8.2.13-r1             apk                           
 recommendations                      6.0.0-dev.0           npm                           
-rsync                                3.4.3-r0              apk                           
+rsync                                3.4.1-r1              apk                           
 rubix/ml                             2.5.3                 php-composer                  
 rubix/tensor                         3.0.5                 php-composer                  
 rullzer/easytotp                     v0.1.4                php-composer                  
-runuser                              2.41-r9               apk                           
 rustix                               0.38.28               rust-crate                    
 sabre/dav                            4.7.0                 php-composer                  
 sabre/event                          5.1.7                 php-composer                  
@@ -445,12 +406,8 @@ scanelf                              1.3.8-r1              apk
 sdl2-compat                          2.32.56-r0            apk                           
 sdl3                                 3.2.16-r0             apk                           
 serd-libs                            0.32.4-r0             apk                           
-setarch                              2.41-r9               apk                           
-setpriv                              2.41-r9               apk                           
-sfdisk                               2.41-r9               apk                           
 shaderc                              2024.4-r0             apk                           
 shadow                               4.17.3-r0             apk                           
-shared-mime-info                     2.4-r6                apk                           
 signal-hook                          0.3.17                rust-crate                    
 signal-hook-registry                 1.4.1                 rust-crate                    
 simd_helpers                         0.1.0                 rust-crate                    
@@ -467,16 +424,16 @@ ssl_client                           1.37.0-r20            apk
 stecman/symfony-console-completion   v0.14.0               php-composer                  
 sudo                                 1.9.17_p2-r0          apk                           
 support                              5.0.0-dev.0           npm                           
-symfony/console                      v6.4.32               php-composer                  
-symfony/css-selector                 v6.4.24               php-composer                  
+symfony/console                      v6.4.17               php-composer                  
+symfony/css-selector                 v6.4.13               php-composer                  
 symfony/deprecation-contracts        v3.6.0                php-composer  (+1 duplicate)  
-symfony/dom-crawler                  v6.4.32               php-composer                  
-symfony/event-dispatcher             v6.4.32               php-composer                  
-symfony/event-dispatcher-contracts   v3.5.1                php-composer                  
+symfony/dom-crawler                  v6.4.23               php-composer                  
+symfony/event-dispatcher             v6.4.8                php-composer                  
+symfony/event-dispatcher-contracts   v3.5.0                php-composer                  
 symfony/filesystem                   v7.4.0                php-composer                  
-symfony/http-foundation              v6.4.33               php-composer                  
-symfony/mailer                       v6.4.31               php-composer                  
-symfony/mime                         v6.4.32               php-composer                  
+symfony/http-foundation              v6.4.29               php-composer                  
+symfony/mailer                       v6.4.12               php-composer                  
+symfony/mime                         v6.4.12               php-composer                  
 symfony/polyfill-intl-grapheme       v1.32.0               php-composer                  
 symfony/polyfill-intl-idn            v1.32.0               php-composer                  
 symfony/polyfill-intl-normalizer     v1.33.0               php-composer                  
@@ -488,13 +445,13 @@ symfony/polyfill-php83               v1.33.0               php-composer
 symfony/polyfill-php84               v1.33.0               php-composer  (+1 duplicate)  
 symfony/polyfill-php85               v1.33.0               php-composer                  
 symfony/polyfill-uuid                v1.29.0               php-composer                  
-symfony/process                      v6.4.33               php-composer                  
-symfony/routing                      v6.4.32               php-composer                  
+symfony/process                      v6.4.31               php-composer                  
+symfony/routing                      v6.4.12               php-composer                  
 symfony/service-contracts            v3.5.1                php-composer                  
-symfony/string                       v6.4.30               php-composer                  
-symfony/translation                  v6.4.32               php-composer                  
-symfony/translation-contracts        v3.4.3                php-composer                  
-symfony/uid                          v6.4.32               php-composer                  
+symfony/string                       v6.4.15               php-composer                  
+symfony/translation                  v6.4.4                php-composer                  
+symfony/translation-contracts        v3.4.2                php-composer                  
+symfony/uid                          v6.4.3                php-composer                  
 syn                                  2.0.48                rust-crate                    
 talloc                               2.4.2-r1              apk                           
 tap                                  1.0.1                 rust-crate                    
@@ -505,17 +462,13 @@ tevent                               0.16.1-r0             apk
 text                                 7.0.0-dev.1           npm                           
 thiserror                            1.0.56                rust-crate                    
 thiserror-impl                       1.0.56                rust-crate                    
-tiff                                 4.7.1-r0              apk                           
 tinyvec                              1.9.0                 rust-crate                    
-tzdata                               2026b-r0              apk                           
-umount                               2.41-r9               apk                           
+twofactor_totp                       15.0.0-dev.0          npm                           
+tzdata                               2025c-r0              apk                           
 unicode-ident                        1.0.12                rust-crate                    
 unicode-width                        0.1.11                rust-crate                    
 utf8parse                            0.2.1                 rust-crate                    
-util-linux                           2.41-r9               apk                           
-util-linux-misc                      2.41-r9               apk                           
 utmps-libs                           0.1.3.1-r0            apk                           
-uuidgen                              2.41-r9               apk                           
 v4l-utils-libs                       1.28.1-r1             apk                           
 v_frame                              0.3.7                 rust-crate                    
 vidstab                              1.1.1-r0              apk                           
@@ -526,15 +479,14 @@ wapmorgan/mp3info                    0.1.1                 php-composer
 wayland-libs-client                  1.23.1-r3             apk                           
 web-auth/cose-lib                    4.3.0                 php-composer                  
 web-auth/webauthn-lib                4.9.1                 php-composer                  
-wipefs                               2.41-r9               apk                           
 woltlab/webp-exif                    v0.1.2                php-composer                  
 wyz                                  0.5.1                 rust-crate                    
 x264-libs                            0.164.3108-r0         apk                           
 x265-libs                            3.6-r0                apk                           
 xvidcore                             1.3.7-r2              apk                           
-xz-libs                              5.8.3-r0              apk                           
+xz-libs                              5.8.1-r0              apk                           
 y4m                                  0.8.0                 rust-crate                    
 zimg                                 3.0.5-r3              apk                           
 zix-libs                             0.6.2-r0              apk                           
-zlib                                 1.3.2-r0              apk                           
+zlib                                 1.3.1-r2              apk                           
 zstd-libs                            1.5.7-r0              apk                           
@@ -9,7 +9,6 @@ project_blurb: |

  Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_categories: "Cloud,Documents"
 # supported architectures
 available_architectures:
  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -93,7 +92,7 @@ app_setup_block: |
  Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).
 # init diagram
 init_diagram: |
-  "nextcloud:latest": {
+  "nextcloud:develop": {
    docker-mods
    base {
      fix-attr +\nlegacy cont-init
@@ -142,9 +141,10 @@ init_diagram: |
  Base Images: {
    "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22"
  }
-  "nextcloud:latest" <- Base Images
+  "nextcloud:develop" <- Base Images
 # changelog
 changelogs:
+  - {date: "08.02.26:", desc: "Existing users should update: site-confs/default.conf - Deny access to all dotfiles."}
  - {date: "10.07.25:", desc: "Rebase to Alpine 3.22."}
  - {date: "12.02.25:", desc: "Rebase to Alpine 3.21."}
  - {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."}
@@ -1,4 +1,4 @@
-## Version 2025/07/10 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2026/05/05 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample

 # Set the `immutable` cache control options only for assets with a cache busting `v` argument
 map $arg_v $asset_immutable {
@@ -20,6 +20,13 @@ server {

    root /app/www/public;

+    # deny access to all dotfiles
+    location ~ /\. {
+        access_log off;
+        log_not_found off;
+        return 404;
+    }
+
    # display real ip in nginx logs when connected through reverse proxy via docker network
    set_real_ip_from 172.16.0.0/12;
    real_ip_header X-Forwarded-For;
@@ -49,12 +56,12 @@ server {
    client_body_buffer_size 512k;

    # HTTP response headers borrowed from Nextcloud `.htaccess`
-    add_header Referrer-Policy                   "no-referrer"       always;
-    add_header X-Content-Type-Options            "nosniff"           always;
-    add_header X-Frame-Options                   "SAMEORIGIN"        always;
-    add_header X-Permitted-Cross-Domain-Policies "none"              always;
-    add_header X-Robots-Tag                      "noindex, nofollow" always;
-    add_header X-XSS-Protection                  "1; mode=block"     always;
+    add_header Referrer-Policy "no-referrer" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Permitted-Cross-Domain-Policies "none" always;
+    add_header X-Robots-Tag "noindex, nofollow" always;
+    add_header X-XSS-Protection "1; mode=block" always;

    # Remove X-Powered-By, which is an information leak
    fastcgi_hide_header X-Powered-By;
@@ -92,11 +99,19 @@ server {
        # The rules in this block are an adaptation of the rules
        # in `.htaccess` that concern `/.well-known`.

-        location = /.well-known/carddav { return 301 /remote.php/dav/; }
-        location = /.well-known/caldav  { return 301 /remote.php/dav/; }
+        location = /.well-known/carddav {
+            return 301 /remote.php/dav/;
+        }
+        location = /.well-known/caldav {
+            return 301 /remote.php/dav/;
+        }

-        location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
-        location /.well-known/pki-validation    { try_files $uri $uri/ =404; }
+        location /.well-known/acme-challenge {
+            try_files $uri $uri/ =404;
+        }
+        location /.well-known/pki-validation {
+            try_files $uri $uri/ =404;
+        }

        # Let Nextcloud's API for `/.well-known` URIs handle all other
        # requests by passing them to the front-end controller.
@@ -104,8 +119,12 @@ server {
    }

    # Rules borrowed from `.htaccess` to hide certain paths from clients
-    location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
-    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+    location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) {
+        return 404;
+    }
+    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
+        return 404;
+    }

    # Ensure this block, which passes PHP files to the PHP process, is above the blocks
    # which handle static assets (as seen below). If this block is not declared first,
@@ -124,8 +143,8 @@ server {
        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
        fastcgi_param PATH_INFO $path_info;

-        fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
-        fastcgi_param front_controller_active true;     # Enable pretty urls
+        fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice
+        fastcgi_param front_controller_active true; # Enable pretty urls
        fastcgi_pass 127.0.0.1:9000;

        fastcgi_intercept_errors on;
@@ -138,7 +157,7 @@ server {
    location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
        try_files $uri /index.php$request_uri;
        add_header Cache-Control "public, max-age=15778463, $asset_immutable";
-        access_log off;     # Optional: Don't log access to assets
+        access_log off; # Optional: Don't log access to assets

        location ~ \.wasm$ {
            default_type application/wasm;
@@ -148,8 +167,8 @@ server {

    location ~ \.woff2?$ {
        try_files $uri /index.php$request_uri;
-        expires 7d;         # Cache-Control policy borrowed from `.htaccess`
-        access_log off;     # Optional: Don't log access to assets
+        expires 7d; # Cache-Control policy borrowed from `.htaccess`
+        access_log off; # Optional: Don't log access to assets
    }

    # Rule borrowed from `.htaccess`
@@ -172,9 +191,4 @@ server {

        try_files $uri $uri/ /index.php$request_uri;
    }
-
-    # deny access to .htaccess/.htpasswd files
-    location ~ /\.ht {
-        deny all;
-    }
 }