diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 6f440ea21..86650c75b 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -182,6 +182,8 @@ jobs:
 
       - name: Build
         shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.gh_token }}
         run: |
           # Define some variables for things we need
           release_name="ErsatzTV-Legacy-${{ inputs.release_version }}-${{ matrix.target }}"
@@ -194,6 +196,13 @@ jobs:
           mkdir "$release_name"
           mv scanner/* "$release_name/"
           mv main/* "$release_name/"
+
+          # download next artifacts
+          gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-${{ matrix.target }}.tar.gz" --dir next-download
+          mkdir -p "$release_name/next"
+          tar xzvf next-download/*.tar.gz -C "$release_name/next" --strip-components 1
+          rm -rf next-download
+
           tar czvf "${release_name}.tar.gz" "$release_name"
 
           # Delete output directory
@@ -300,6 +309,8 @@ jobs:
 
       - name: Package artifacts
         shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.gh_token }}
         run: |
           release_name="ErsatzTV-Legacy-${{ inputs.release_version }}-win-x64"
           echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
@@ -312,6 +323,14 @@ jobs:
           rm -rf "$release_name/Resources"
 
           mv rust-build/ErsatzTV-Windows.exe "$release_name/ErsatzTV-Windows.exe"
+
+          # download next artifacts
+          gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-windows-x64.zip" --dir next-download
+          mkdir -p "$release_name/next"
+          7z x next-download/*.zip -onext-extracted
+          mv next-extracted/ersatztv-next-*/ersatztv*.exe "$release_name/next/"
+          rm -rf next-download next-extracted
+
           7z e "ffmpeg/${{ steps.downloadffmpeg.outputs.filename }}" -o"$release_name" '*.exe' -r
           rm -f "$release_name/ffplay.exe"
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 824989024..4ca7bbd43 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -48,6 +48,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download next artifacts
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.gh_token }}
+        run: |
+          case "${{ matrix.name }}" in
+            amd64) TARGET="linux-x64" ;;
+            arm32v7) TARGET="linux-arm" ;;
+            arm64) TARGET="linux-arm64" ;;
+          esac
+          gh release download develop --repo ErsatzTV/next --pattern "ersatztv-next-*-${TARGET}.tar.gz" --dir next-download
+          mkdir -p next
+          tar xzvf next-download/*.tar.gz -C next --strip-components 1
+          rm -rf next-download
+
       - name: Set up QEMU
         if: ${{ matrix.name == 'arm32v7' }}
         uses: docker/setup-qemu-action@v3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 25412bd86..2bbb765d4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,6 +60,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
+COPY next/ ./next/
 ENV PYTHONPATH=/app/pythonlibs
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile
index 546cd8717..64807b43a 100644
--- a/docker/arm32v7/Dockerfile
+++ b/docker/arm32v7/Dockerfile
@@ -46,6 +46,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
+COPY next/ ./next/
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
 ENTRYPOINT ["./ErsatzTV"]
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
index 3e122386a..d8357c258 100644
--- a/docker/arm64/Dockerfile
+++ b/docker/arm64/Dockerfile
@@ -46,6 +46,7 @@ ENV FONTCONFIG_PATH=/etc/fonts
 RUN fc-cache update
 WORKDIR /app
 COPY --from=build /app ./
+COPY next/ ./next/
 ENV ETV_CONFIG_FOLDER=/config
 ENV ETV_TRANSCODE_FOLDER=/transcode
 ENTRYPOINT ["./ErsatzTV"]