diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh
index 734e906..2bf605d 100755
--- a/PepDeb32/pepbld.sh
+++ b/PepDeb32/pepbld.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
 uchinanchu="$(pwd)"
 
-# This cleanup might be better served in the BldHelper*.sh script.
 # Create the build folder, move into it removing stale mountpoints and files there.
 [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato
 cd fusato
@@ -18,17 +21,16 @@ lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures i386 \
 	--linux-flavours 686 \
-	--distribution bullseye \
-	--archive-areas "main contrib non-free" \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--distribution bookworm \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution bullseye \
+	--debian-installer-distribution bookworm \
 	--debian-installer-gui true \
-	--uefi-secure-boot enable \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "PeppermintOS" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
@@ -38,15 +40,15 @@ lb config  noauto \
      "${@}"
 
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDeb32/pephooks b/PepDeb32/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDeb32/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh
index 30215a6..cefbc86 100755
--- a/PepDeb64/pepbld.sh
+++ b/PepDeb64/pepbld.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
 uchinanchu="$(pwd)"
 
-# This cleanup might be better served in the BldHelper*.sh script.
 # Create the build folder, move into it removing stale mountpoints and files there.
 [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato
 cd fusato
@@ -18,16 +21,16 @@ lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures amd64 \
 	--linux-flavours amd64 \
-	--distribution bullseye \
-	--archive-areas "main contrib non-free" \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--distribution bookworm \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution bullseye \
+	--debian-installer-distribution bookworm \
 	--debian-installer-gui true \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "PeppermintOS" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
@@ -36,17 +39,17 @@ lb config  noauto \
 
      "${@}"
 
-
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
+
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDeb64/pephooks b/PepDeb64/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDeb64/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh
index 48cf7c1..fcfc86f 100755
--- a/PepDeb_arm64/pepbld.sh
+++ b/PepDeb_arm64/pepbld.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
@@ -13,24 +17,22 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done
 
 
 # Defines Live Build settings
-
 lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures arm64 \
-	--linux-flavours arm64 \
 	--distribution bullseye \
-	--archive-areas "main contrib non-free" \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution bullseye \
+	--debian-installer-distribution bookworm \
 	--debian-installer-gui true \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--bootstrap-qemu-arch arm64 \
 	--bootloaders grub-efi \
 	--bootstrap-qemu-static /usr/sbin/qemu-debootstrap \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "PeppermintOS" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
@@ -40,15 +42,15 @@ lb config  noauto \
      "${@}"
 
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDeb_arm64/pephooks b/PepDeb_arm64/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDeb_arm64/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh
index 509233e..007da40 100755
--- a/PepDev32/pepbld.sh
+++ b/PepDev32/pepbld.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
@@ -13,32 +17,32 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done
 
 
 # Defines Live Build settings
-
 lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures i386 \
-	--linux-flavours 686 \
-	--distribution chimaera \
+	--distribution daedalus \
 	--initsystem sysvinit \
-	--archive-areas "main contrib non-free" \
-	--mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary-security http://pkgmaster.devuan.org/merged \
-	--mirror-chroot http://pkgmaster.devuan.org/merged \
-	--mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-chroot http://deb.devuan.org/merged \
+	--parent-mirror-chroot-security http://deb.devuan.org/merged \
+	--parent-mirror-binary http://deb.devuan.org/merged \
+	--parent-mirror-binary-security http://deb.devuan.org/merged \
+	--mirror-chroot http://deb.devuan.org/merged \
+	--mirror-chroot-security http://deb.devuan.org/merged \
+	--security false \
+	--updates false \
+	--backports false \
 	--uefi-secure-boot enable \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution chimaera \
+	--debian-installer-distribution daedalus \
 	--debian-installer-gui true \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "PeppermintOS" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
@@ -48,15 +52,15 @@ lb config  noauto \
      "${@}"
 
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDev32/pephooks b/PepDev32/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDev32/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh
index a32fad9..cbc7112 100755
--- a/PepDev64/pepbld.sh
+++ b/PepDev64/pepbld.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
@@ -13,31 +17,31 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done
 
 
 # Defines Live Build settings
-
 lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures amd64 \
-	--linux-flavours amd64 \
-	--distribution chimaera \
+	--distribution daedalus \
 	--initsystem sysvinit \
-	--archive-areas "main contrib non-free" \
-	--mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary-security http://pkgmaster.devuan.org/merged \
-	--mirror-chroot http://pkgmaster.devuan.org/merged \
-	--mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-chroot http://deb.devuan.org/merged \
+	--parent-mirror-chroot-security http://deb.devuan.org/merged \
+	--parent-mirror-binary http://deb.devuan.org/merged \
+	--parent-mirror-binary-security http://deb.devuan.org/merged \
+	--mirror-chroot http://deb.devuan.org/merged \
+	--mirror-chroot-security http://deb.devuan.org/merged \
+	--security false \
+	--updates false \
+	--backports false \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution chimaera \
+	--debian-installer-distribution daedalus \
 	--debian-installer-gui true \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "Peppermint" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
@@ -49,15 +53,15 @@ lb config  noauto \
      "${@}"
 
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDev64/pephooks b/PepDev64/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDev64/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh
index 83aadcc..fb139ad 100755
--- a/PepDev_arm64/pepbld.sh
+++ b/PepDev_arm64/pepbld.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
@@ -13,55 +17,53 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done
 
 
 # Defines Live Build settings
-
 lb config  noauto \
 	--binary-images iso-hybrid \
 	--architectures arm64 \
-	--linux-flavours arm64 \
-	--distribution chimaera \
+	--distribution daedalus \
 	--initsystem sysvinit \
-	--archive-areas "main contrib non-free" \
-	--mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot http://pkgmaster.devuan.org/merged \
-	--parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary http://pkgmaster.devuan.org/merged \
-	--parent-mirror-binary-security http://pkgmaster.devuan.org/merged \
-	--mirror-chroot http://pkgmaster.devuan.org/merged \
-	--mirror-chroot-security http://pkgmaster.devuan.org/merged \
-	--parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \
+	--archive-areas "main contrib non-free non-free-firmware" \
+	--mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-bootstrap http://deb.devuan.org/merged \
+	--parent-mirror-chroot http://deb.devuan.org/merged \
+	--parent-mirror-chroot-security http://deb.devuan.org/merged \
+	--parent-mirror-binary http://deb.devuan.org/merged \
+	--parent-mirror-binary-security http://deb.devuan.org/merged \
+	--mirror-chroot http://deb.devuan.org/merged \
+	--mirror-chroot-security http://deb.devuan.org/merged \
+	--security false \
+	--updates false \
+	--backports false \
 	--uefi-secure-boot enable \
-	--firmware-binary true \
-	--firmware-chroot true \
+	--firmware-chroot false \
 	--debian-installer netinst \
-	--debian-installer-distribution chimaera \
+	--debian-installer-distribution daedalus \
 	--debian-installer-gui true \
+	--parent-mirror-debian-installer http://repo.peppermintos.com/packages \
 	--bootstrap-qemu-arch arm64 \
 	--bootloaders grub-efi \
 	--bootstrap-qemu-static /usr/sbin/qemu-debootstrap \
 	--iso-preparer "PeppermintOS-https://peppermintos.com/" \
 	--iso-publisher "Peppermint OS Team" \
-	--iso-volume "PepOS-mini-iso" \
+	--iso-volume "PeppermintOS" \
 	--image-name "PepOS-mini-iso" \
 	--checksums sha512 \
 	--zsync false \
 	--win32-loader false \
 	--debian-installer-preseedfile preseed.cfg \
-	--security true \
-	--updates true \
-	--backports true \
+
      "${@}"
 
 # Setup the installer structure
-mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
+mkdir -p $uchinanchu/fusato/config/hooks/normal
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
-cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
+cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary
diff --git a/PepDev_arm64/pephooks b/PepDev_arm64/pephooks
new file mode 120000
index 0000000..7d0d615
--- /dev/null
+++ b/PepDev_arm64/pephooks
@@ -0,0 +1 @@
+../pephooks
\ No newline at end of file
diff --git a/pephooks/normal/0950-final-cleanup-hook.binary b/pephooks/normal/0950-final-cleanup-hook.binary
new file mode 100755
index 0000000..324b352
--- /dev/null
+++ b/pephooks/normal/0950-final-cleanup-hook.binary
@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
+## This script will remove unnecessary files and folders and reduce the size of the iso.
+# Remove live folder from binary.
+
+rm -r live
diff --git a/pepinstaller/preseed/preseed.cfg b/pepinstaller/preseed/preseed.cfg
index e0a2a44..0e8d464 100644
--- a/pepinstaller/preseed/preseed.cfg
+++ b/pepinstaller/preseed/preseed.cfg
@@ -1,12 +1,16 @@
-# Debian Installer preconfiguration file
-# to install Debian with custom repositories
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
+
+# This preseed file includes configuration settings for a custom repository, 
+# as well as enabling the "contrib" and "non-free" components. Additionally, 
+# automatic responses to the Debian popularity contest are disabled
 
 # Add your custom repositories
 d-i apt-setup/local0/repository string \
-	http://repo.peppermintos.com/packages peptesting main contrib non-free
+	http://repo.peppermintos.com/packages bookworm main contrib non-free non-free-firmware
 d-i apt-setup/local0/comment string PeppermintOS repository
 d-i apt-setup/local0/source boolean true
-d-i apt-setup/local0/source boolean true
 
 # URL to the public key of the local repository
 d-i apt-setup/local0/key string http://repo.peppermintos.com/packages/conf/peppermint-keyring.gpg
@@ -15,6 +19,11 @@ d-i apt-setup/local0/key string http://repo.peppermintos.com/packages/conf/peppe
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 
+# Select which update services to use; define the mirrors to be used.
+# Values shown below are the normal defaults.
+d-i apt-setup/services-select multiselect security, updates
+d-i apt-setup/security_host string security.debian.org
+
 # Remove popularity-contest
 popularity-contest popularity-contest/participate boolean false
 
diff --git a/peprepo/peppermint-keyring.key.chroot b/peprepo/peppermint-keyring.key.chroot
deleted file mode 100644
index 87f923f..0000000
Binary files a/peprepo/peppermint-keyring.key.chroot and /dev/null differ
diff --git a/peprepo/peppermint.list.binary b/peprepo/peppermint.list.binary
index 8edb20a..4968a16 100644
--- a/peprepo/peppermint.list.binary
+++ b/peprepo/peppermint.list.binary
@@ -3,7 +3,7 @@
 #deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
 
 #Testing repos
-deb http://repo.peppermintos.com/packages peptesting main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free
+deb http://repo.peppermintos.com/packages bookworm main contrib non-free
+#deb-src http://repo.peppermintos.com/packages bookworm main contrib non-free
 
 
diff --git a/peprepo/peppermint.list.chroot b/peprepo/peppermint.list.chroot
deleted file mode 100644
index 8edb20a..0000000
--- a/peprepo/peppermint.list.chroot
+++ /dev/null
@@ -1,9 +0,0 @@
-#Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
-deb http://repo.peppermintos.com/packages peptesting main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free
-
-