diff --git a/config/raspberry/default b/config/raspberry/default
index 0fd604202..e4cdeed49 100644
--- a/config/raspberry/default
+++ b/config/raspberry/default
@@ -4,6 +4,11 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
+# New locations after Bullseye turned into 'oldstable'
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"
+
 BASE_IMAGE_ENLARGEROOT=4500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
@@ -12,6 +17,9 @@ BASE_RELEASE_COMPRESS=no
 MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,crowsnest,sonar,password-for-sudo),postrename"
 
 # export Variables
+export DOWNLOAD_BASE_URL
+export DOWNLOAD_URL_CHECKSUM
+export DOWNLOAD_URL_IMAGE
 export BASE_IMAGE_ENLARGEROOT
 export BASE_IMAGE_RESIZEROOT
 export BASE_RELEASE_COMPRESS
diff --git a/config/raspberry/rpi32 b/config/raspberry/rpi32
index 8239ff3c7..9bee05d46 100644
--- a/config/raspberry/rpi32
+++ b/config/raspberry/rpi32
@@ -4,14 +4,12 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
-# Keep for Bookworm template
-# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.sha256"
-# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.torrent"
-
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.torrent"
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06/2023-12-05-raspios-bullseye-armhf-lite.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"
 
+export DOWNLOAD_BASE_URL
 export DOWNLOAD_URL_CHECKSUM
 export DOWNLOAD_URL_IMAGE
 
diff --git a/config/raspberry/rpi64 b/config/raspberry/rpi64
index 01c486d33..3a29f75e2 100644
--- a/config/raspberry/rpi64
+++ b/config/raspberry/rpi64
@@ -6,19 +6,8 @@
 
 BASE_ARCH="arm64"
 
-# Keep for Bookworm template
-# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.sha256"
-# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
-
-# New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent"
-
-
 # export variables
 export BASE_ARCH
-export DOWNLOAD_URL_CHECKSUM
-export DOWNLOAD_URL_IMAGE
 
 ### JSON sniplet Setup
 ### NOTE: Please see all config files for setup variables!!!
diff --git a/config/raspberry/rpi64-ks b/config/raspberry/rpi64-ks
index 40db48dc6..103f4f8e6 100644
--- a/config/raspberry/rpi64-ks
+++ b/config/raspberry/rpi64-ks
@@ -6,24 +6,12 @@
 
 BASE_ARCH="arm64"
 
-# Keep for Bookworm template
-# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.sha256"
-# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
-
-# New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent"
-
-
 # Changed modules
-# shellcheck disable=SC2034
 MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,klipperscreen,crowsnest,sonar,password-for-sudo),postrename"
 
-
 # export variables
 export BASE_ARCH
-export DOWNLOAD_URL_CHECKSUM
-export DOWNLOAD_URL_IMAGE
+export MODULES
 
 ### JSON sniplet Setup
 ### NOTE: Please see all config files for setup variables!!!