diff --git a/build.sh b/build.sh
index cc2ebc8..16f179b 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ dist="$(lsb_release -i -s)"
 
 if [ "$dist" == "Debian" ]; then
   apt-get install -y binutils patch zstd live-build
-  dpkg -i ./debs/ubuntu-keyring*.deb
+  dpkg -i ./debs/debian-keyring*.deb
 else
   apt-get install -y binutils patch zstd debootstrap
   dpkg -i ./debs/*.deb
diff --git a/etc/auto/config b/etc/auto/config
index a032a7f..94d86b0 100755
--- a/etc/auto/config
+++ b/etc/auto/config
@@ -7,21 +7,17 @@ set -e
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
-    --initramfs none \
     --distribution "$BASECODENAME" \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
     --linux-packages linux-image \
-    --bootappend-live "boot=live quiet splash" \
+    --bootappend-live "boot=live components username=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
     --mirror-chroot-security "http://deb.debian.org/debian-security/" \
     --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
-    --mirror-binary-security "http://deb.debian.org/debian-security/" \
-    --parent-mirror-binary-security "http://deb.debian.org/debian-security/" \
     --apt-source-archives false \
-    --mirror-binary "$MIRROR_URL" \
     --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages debian-keyring \
     --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \
@@ -31,12 +27,11 @@ lb config noauto \
     --binary-images iso-hybrid \
     --iso-application "$NAME" \
     --iso-volume "$NAME" \
-    --firmware-binary false \
-    --firmware-chroot false \
+    --firmware-chroot true \
     --zsync false \
     --security true \
     --updates true \
-    --debootstrap-options="--extractor=ar --variant=minbase" \
+    --debootstrap-options="--extractor=ar" \
     "${@}"
 
 # replace channel and suite
@@ -45,6 +40,7 @@ sed -i "s/@DEBIAN_VERSION/$DEBIAN_VERSION/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install
+sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_live
 
 DATE=$(date +%Y%m%d)
 sed -i "s/@CHANNEL/$CHANNEL/" config/includes.binary/.disk/info
diff --git a/etc/config/includes.chroot/etc/greetd/config.toml b/etc/config/includes.chroot/etc/greetd/config.toml
index b9f88c2..e4a88ea 100644
--- a/etc/config/includes.chroot/etc/greetd/config.toml
+++ b/etc/config/includes.chroot/etc/greetd/config.toml
@@ -6,5 +6,5 @@ command = "cage -s -d -- regreet"
 user = "_greetd"
  
 [initial_session]
-command = "start-sway"
+command = "sway"
 user = "tileos"
diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live
index 16a37d5..34edc49 100644
--- a/etc/config/package-lists.calamares/desktop.list.chroot_live
+++ b/etc/config/package-lists.calamares/desktop.list.chroot_live
@@ -1 +1 @@
-tileos-live
+tileos-@DESKTOP-live
diff --git a/etc/terraform.conf b/etc/terraform.conf
index 5ffa5ad..765f928 100644
--- a/etc/terraform.conf
+++ b/etc/terraform.conf
@@ -2,6 +2,9 @@
 ARCH="amd64"
 
 # base codename
+BASECODENAME="bookworm"
+
+# Debian version
 DEBIAN_VERSION="Debian_Testing"
 
 # base version