diff --git a/Dockerfile b/Dockerfile
index f9c0871..af02aa9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM debian:12
-RUN apt-get update && \
+COPY etc_fai/apt/keys/fai-project.gpg /etc/apt/trusted.gpg.d/
+RUN echo "deb [arch=amd64] http://fai-project.org/download bookworm koeln" > /etc/apt/sources.list.d/fai.list && \
+    apt-get update && \
     apt-get -y upgrade && \
     apt-get -y install fai-server fai-doc fai-setup-storage && \
     apt-get -y install lftp curl && \
diff --git a/etc_fai/NFSROOT b/etc_fai/NFSROOT
index b809185..25679dc 100644
--- a/etc_fai/NFSROOT
+++ b/etc_fai/NFSROOT
@@ -6,7 +6,6 @@ rsync
 lshw procinfo
 dump reiserfsprogs xfsprogs xfsdump btrfs-progs
 hwinfo hdparm smartmontools nvme-cli
-rdate
 zile
 numactl
 udns-utils
@@ -15,8 +14,10 @@ pxelinux syslinux-common
 ca-certificates # for get-config-dir-https and apt-transport-https
 usbutils pciutils
 ssh
+screen tmux
 netselect
 mdadm
+cryptsetup
 #git # git consumes a lot of disk space on the FAI CD
 
 PACKAGES install-norec
@@ -24,25 +25,25 @@ PACKAGES install-norec
 dracut live-boot- initramfs-tools-
 dracut-config-generic
 dracut-network
-sysvinit-core systemd-sysv-
 curl lftp
 less
-ntpdate
+ntpsec-ntpdate rdate
 dosfstools
 lvm2
 psmisc
+uuid-runtime
 dialog
 console-common kbd
 xz-utils pigz zstd
+gpg
 
 
 # some network cards needs firmware
 PACKAGES install-norec NONFREE
 firmware-bnx2 firmware-bnx2x firmware-realtek
-firmware-cavium
+firmware-cavium firmware-myricom firmware-netronome
 firmware-misc-nonfree
 
-
 # you should not edit the lines below
 # architecture dependend list of packages that are installed
 
@@ -67,13 +68,3 @@ PACKAGES install-norec ARMHF
 grub-efi-arm
 efibootmgr
 linux-image-armmp
-
-PACKAGES install-norec DEBIAN_9
-apt-transport-https
-
-PACKAGES install-norec DEBIAN_10
-fdisk gpg
-
-PACKAGES install-norec DEBIAN_11 DEBIAN_
-fdisk gpg
-
diff --git a/etc_fai/apt/sources.list b/etc_fai/apt/sources.list
index fbf74b4..87d523d 100644
--- a/etc_fai/apt/sources.list
+++ b/etc_fai/apt/sources.list
@@ -5,7 +5,7 @@ deb http://ftp.fr.debian.org/debian-security bookworm-security main contrib non-
 deb http://ftp.fr.debian.org/debian bookworm-backports main contrib non-free
 
 # repository that may contain newer fai packages for bookworm
-#deb [arch=amd64] http://fai-project.org/download bookworm koeln
+deb [arch=amd64] http://fai-project.org/download bookworm koeln
 
 #Elastic
 deb [arch=amd64] https://artifacts.elastic.co/packages/8.x/apt stable main
diff --git a/srv_fai_config/class/SEAPATH_COMMON.var.defaults b/srv_fai_config/class/SEAPATH_COMMON.var.defaults
index b461180..d244f99 100644
--- a/srv_fai_config/class/SEAPATH_COMMON.var.defaults
+++ b/srv_fai_config/class/SEAPATH_COMMON.var.defaults
@@ -1,5 +1,7 @@
 # default values for installation. You can override them in your *.var files
 
+HOSTNAME=debian
+
 # allow installation of packages from unsigned repositories
 FAI_ALLOW_UNSIGNED=0