diff --git a/Dockerfile b/Dockerfile
index d1acf08..17d37be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 FROM ghcr.io/linuxserver/picons-builder as piconsstage
 
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -149,7 +149,7 @@ RUN \
     /picons
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -196,7 +196,8 @@ RUN \
     x264 \
     x265 \
     xmltv \
-    zlib
+    zlib && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c45dad5..6188e7f 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -195,7 +195,8 @@ RUN \
     x264 \
     x265 \
     xmltv \
-    zlib
+    zlib && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
diff --git a/Jenkinsfile b/Jenkinsfile
index da584d5..ec66203 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='9981'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
diff --git a/README.md b/README.md
index 07239d2..ca6f7ab 100644
--- a/README.md
+++ b/README.md
@@ -351,6 +351,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.06.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **16.10.23:** - Add mesa-va-gallium package for AMD transcoding.
 * **20.09.23:** - Add perl-json-xs package.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 7556076..5f2a4c2 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: github_commit
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'tvheadend'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='9981'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index 85316c0..73b1e0c 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -9,20 +9,12 @@ project_blurb: |
   Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
   Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_blurb_optional_extras_enabled: false
 
 # supported architectures
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-# development version
-development_versions: false
-development_versions_items:
-  - { tag: "latest", desc: "Current latest release." }
-  - { tag: "release-4.2", desc: "Latest release from 4.2 branch." }
-
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
@@ -114,6 +106,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.06.24:", desc: "Rebase to Alpine 3.20." }
   - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
   - { date: "16.10.23:", desc: "Add mesa-va-gallium package for AMD transcoding." }
   - { date: "20.09.23:", desc: "Add perl-json-xs package." }