diff --git a/extra/Makefile b/extra/Makefile
index a91ef55..04fbf42 100644
--- a/extra/Makefile
+++ b/extra/Makefile
@@ -15,7 +15,7 @@ architecture?=i386
 
 mirror?=https://deb.debian.org/debian
 scratchsize?=4G
-suite?=bullseye
+suite?=bookworm
 
 flags?=-v
 flags+=--scratchsize=${scratchsize}
@@ -82,11 +82,11 @@ rpi_4:
 	gzip -f -9 $<
 	stat -c '%y: %n' $@
 
+port?=55522
 run: pinball-i386-generic.img
 	kvm -m 512 \
 	  -device e1000,netdev=net0 \
-	  -netdev user,id=net0,hostfwd=tcp::55522-:22 \
-	  -net nic,model=ne2k_pci -net user \
+	  -netdev user,id=net0,hostfwd=tcp::${port}-:22 \
 	  -machine pc $<
 
 cleanall:
diff --git a/extra/debos/machine/generic/actions.yaml b/extra/debos/machine/generic/actions.yaml
index 6ca4ea4..fb5765e 100644
--- a/extra/debos/machine/generic/actions.yaml
+++ b/extra/debos/machine/generic/actions.yaml
@@ -1,7 +1,9 @@
 {{- $architecture := or .architecture "i386" -}}
+{{- $bootloader := or .bootloader "grub-pc" -}}
 {{- $machine := or .machine "generic" -}}
+{{- $partitiontype := or .partitiontype "msdos" -}}
 {{- $project := or .project "pinball" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $image := or .image (printf "%s-%s-%s.img" $project $architecture $machine) -}}
 
 architecture: {{$architecture}}
@@ -11,33 +13,29 @@ actions:
   - action: image-partition
     imagename: {{$image}}
     imagesize: 2GB
-    partitiontype: msdos
+    partitiontype: {{$partitiontype}}
     mountpoints:
       - mountpoint: /
         partition: root
+      {{if eq $bootloader "grub-efi"}}
+      - mountpoint: /boot/efi
+        partition: efi
+        flags: [ boot ]
+      {{end}}
     partitions:
+      {{if eq $bootloader "grub-efi"}}
+      - name: efi
+        fs: vfat
+        start: 0%
+        end: 128MB
+      {{end}}
       - name: root
         fs: ext4
-        start: 512
+        start: 128MB
         end: 100%
-        flags: [boot]
 
   - action: apt
     packages:
-      {{if eq $architecture "i386" "amd64"}}
-      - grub-pc
-      {{end}}
-      {{if eq $suite "unstable" "sid" "testing" "bullseye"}}
-      - linux-image-generic
-      {{else}}
-      {{if eq $suite "buster" "stable"}}
-      {{if eq $architecture "i386"}}
-      - linux-image-686
-      {{else}}
-      - linux-image-{{$architecture}}
-      {{end}}
-      {{end}}
-      {{end}}
+      - {{$bootloader}}
+      - linux-image-{{$machine}}
       - firmware-linux-free
-      - firmware-linux-nonfree
-
diff --git a/extra/debos/machine/generic/image.yaml b/extra/debos/machine/generic/image.yaml
index ccfae16..483d4fe 100644
--- a/extra/debos/machine/generic/image.yaml
+++ b/extra/debos/machine/generic/image.yaml
@@ -1,4 +1,5 @@
 {{- $architecture := or .architecture "i386" -}}
+{{- $bootloader := or .bootloader "grub-pc" -}}
 
 architecture: {{$architecture}}
 
@@ -7,7 +8,14 @@ actions:
     description: Install bootloader
     chroot: true
     command: >
-{{if eq $architecture "i386" "amd64"}}
-      update-grub
-      && grub-install /dev/disk/by-id/virtio-fakedisk-0
+{{if eq $architecture "i386"}}
+       update-grub
+       && grub-install /dev/disk/by-id/virtio-fakedisk-0
+{{else}}
+{{if eq $architecture "amd64"}}
+       update-grub
+       && grub-install --target=x86_64-efi --no-nvram
+       && mkdir -p /boot/efi/EFI/BOOT
+       && cp /boot/efi/EFI/debian/grubx64.efi /boot/efi/EFI/BOOT/BOOTX64.EFI
+{{end}}
 {{end}}
diff --git a/extra/debos/machine/generic/pinball-amd64.yaml b/extra/debos/machine/generic/pinball-amd64.yaml
index 8e7046c..909a113 100644
--- a/extra/debos/machine/generic/pinball-amd64.yaml
+++ b/extra/debos/machine/generic/pinball-amd64.yaml
@@ -1,7 +1,9 @@
 {{- $architecture := or .architecture "amd64" -}}
+{{- $bootloader := or .bootloader "grub-efi" -}}
 {{- $machine := or .machine "generic" -}}
 {{- $mirror := or .mirror "https://deb.debian.org/debian" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $partitiontype := or .partitiontype "gpt" -}}
+{{- $suite := or .suite "bookworm" -}}
 
 architecture: {{$architecture}}
 
@@ -11,6 +13,8 @@ actions:
     recipe: ../../pinball.yaml
     variables:
        architecture: {{$architecture}}
+       bootloader: {{$bootloader}}
        machine: {{$machine}}
        mirror: {{$mirror}}
+       partitiontype: {{$partitiontype}}
        suite: {{$suite}}
diff --git a/extra/debos/machine/generic/pinball-i386.yaml b/extra/debos/machine/generic/pinball-i386.yaml
index 7f96855..842a6d4 100644
--- a/extra/debos/machine/generic/pinball-i386.yaml
+++ b/extra/debos/machine/generic/pinball-i386.yaml
@@ -1,7 +1,9 @@
 {{- $architecture := or .architecture "i386" -}}
+{{- $bootloader := or .bootloader "grub-pc" -}}
 {{- $machine := or .machine "generic" -}}
 {{- $mirror := or .mirror "https://deb.debian.org/debian" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $partitiontype := or .partitiontype "msdos" -}}
+{{- $suite := or .suite "bookworm" -}}
 
 architecture: {{$architecture}}
 
@@ -11,6 +13,8 @@ actions:
     recipe: ../../pinball.yaml
     variables:
        architecture: {{$architecture}}
+       bootloader: {{$bootloader}}
        machine: {{$machine}}
        mirror: {{$mirror}}
+       partitiontype: {{$partitiontype}}
        suite: {{$suite}}
diff --git a/extra/debos/machine/rpi_2/actions.yaml b/extra/debos/machine/rpi_2/actions.yaml
index 581acac..eab254f 100644
--- a/extra/debos/machine/rpi_2/actions.yaml
+++ b/extra/debos/machine/rpi_2/actions.yaml
@@ -3,7 +3,7 @@
 {{- $kernel := or .kernel "linux-image-armmp" -}}
 {{- $machine := or .machine "rpi_2" -}}
 {{- $project := or .project "pinball" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine (printf "%s" $machine) -}}
 {{- $image := or .image (printf "%s-%s-%s.img" $project $architecture $machine) -}}
 
diff --git a/extra/debos/machine/rpi_2/pinball-rpi_2.yaml b/extra/debos/machine/rpi_2/pinball-rpi_2.yaml
index edac3c9..d237035 100644
--- a/extra/debos/machine/rpi_2/pinball-rpi_2.yaml
+++ b/extra/debos/machine/rpi_2/pinball-rpi_2.yaml
@@ -1,6 +1,6 @@
 {{- $architecture := or .architecture "armhf" -}}
 {{- $machine := or .machine "rpi_2" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_2" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_3_32b/actions.yaml b/extra/debos/machine/rpi_3_32b/actions.yaml
index 34dc132..acec08e 100644
--- a/extra/debos/machine/rpi_3_32b/actions.yaml
+++ b/extra/debos/machine/rpi_3_32b/actions.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "armhf" -}}
 {{- $kernel := or .kernel "linux-image-armmp" -}}
 {{- $machine := or .machine "rpi_3_32b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_3_32b" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_3_32b/image.yaml b/extra/debos/machine/rpi_3_32b/image.yaml
index 5dbd537..16c4ed4 100644
--- a/extra/debos/machine/rpi_3_32b/image.yaml
+++ b/extra/debos/machine/rpi_3_32b/image.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "armhf" -}}
 {{- $kernel := or .kernel "linux-image-armmp" -}}
 {{- $machine := or .machine "rpi_3_32b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 
 architecture: {{$architecture}}
 
diff --git a/extra/debos/machine/rpi_3_32b/pinball-rpi_3_32b.yaml b/extra/debos/machine/rpi_3_32b/pinball-rpi_3_32b.yaml
index ab1f2ca..1e6e0ea 100644
--- a/extra/debos/machine/rpi_3_32b/pinball-rpi_3_32b.yaml
+++ b/extra/debos/machine/rpi_3_32b/pinball-rpi_3_32b.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "armhf" -}}
 {{- $image := or .image "pinball-rpi_3_32b.img" -}}
 {{- $machine := or .machine "rpi_3_32b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_3_32b" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_3_64b/actions.yaml b/extra/debos/machine/rpi_3_64b/actions.yaml
index 9e3de83..d1c4ede 100644
--- a/extra/debos/machine/rpi_3_64b/actions.yaml
+++ b/extra/debos/machine/rpi_3_64b/actions.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "arm64" -}}
 {{- $kernel := or .kernel "linux-image-generic" -}}
 {{- $machine := or .machine "rpi_3_64b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_3" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_3_64b/image.yaml b/extra/debos/machine/rpi_3_64b/image.yaml
index 21307b9..1c87f56 100644
--- a/extra/debos/machine/rpi_3_64b/image.yaml
+++ b/extra/debos/machine/rpi_3_64b/image.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "arm64" -}}
 {{- $kernel := or .kernel "linux-image-generic" -}}
 {{- $machine := or .machine "rpi_3_64b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 
 architecture: {{$architecture}}
 
diff --git a/extra/debos/machine/rpi_3_64b/pinball-rpi_3_64b.yaml b/extra/debos/machine/rpi_3_64b/pinball-rpi_3_64b.yaml
index aa94388..a327892 100644
--- a/extra/debos/machine/rpi_3_64b/pinball-rpi_3_64b.yaml
+++ b/extra/debos/machine/rpi_3_64b/pinball-rpi_3_64b.yaml
@@ -2,7 +2,7 @@
 {{- $image := or .image "pinball-rpi_3_64b.img" -}}
 {{- $kernel := or .kernel "linux-image-generic" -}}
 {{- $machine := or .machine "rpi_3_64b" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_3" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_4/actions.yaml b/extra/debos/machine/rpi_4/actions.yaml
index d12c1d1..6b89816 100644
--- a/extra/debos/machine/rpi_4/actions.yaml
+++ b/extra/debos/machine/rpi_4/actions.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "arm64" -}}
 {{- $kernel := or .kernel "linux-image-generic" -}}
 {{- $machine := or .machine "rpi_4" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi4" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/machine/rpi_4/image.yaml b/extra/debos/machine/rpi_4/image.yaml
index d48a39e..250d401 100644
--- a/extra/debos/machine/rpi_4/image.yaml
+++ b/extra/debos/machine/rpi_4/image.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "arm64" -}}
 {{- $kernel := or .kernel "linux-image-generic" -}}
 {{- $machine := or .machine "rpi_4" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 
 architecture: {{$architecture}}
 
diff --git a/extra/debos/machine/rpi_4/pinball-rpi_4.yaml b/extra/debos/machine/rpi_4/pinball-rpi_4.yaml
index a18d034..243b8aa 100644
--- a/extra/debos/machine/rpi_4/pinball-rpi_4.yaml
+++ b/extra/debos/machine/rpi_4/pinball-rpi_4.yaml
@@ -1,7 +1,7 @@
 {{- $architecture := or .architecture "arm64" -}}
 {{- $machine := or .machine "rpi_4" -}}
 {{- $mirror := or .mirror "https://deb.debian.org/debian" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
 {{- $uboot_machine := or .uboot_machine "rpi_4" -}}
 
 architecture: {{$architecture}}
diff --git a/extra/debos/pinball.yaml b/extra/debos/pinball.yaml
index f1a6289..415e2af 100644
--- a/extra/debos/pinball.yaml
+++ b/extra/debos/pinball.yaml
@@ -3,7 +3,9 @@
 {{- $machine := or .machine "generic" -}}
 {{- $mirror := or .mirror "https://deb.debian.org/debian" -}}
 {{- $project := or .project "pinball" -}}
-{{- $suite := or .suite "bullseye" -}}
+{{- $suite := or .suite "bookworm" -}}
+{{- $bootloader := or .bootloader "grub-pc" -}}
+{{- $partitiontype := or .partitiontype "msdos" -}}
 {{- $uboot_machine := or .uboot_machine "generic" -}}
 {{- $image := or .image (printf "%s-%s-%s.img" $project $architecture $machine) -}}
 
@@ -15,6 +17,7 @@ actions:
     components:
       - main
       - non-free
+      - non-free-firmware
     mirror: {{$mirror}}
     variant: minbase
 
@@ -24,7 +27,7 @@ actions:
       cat /etc/os-release
       cat<<EOF
       URL: https://purl.org/rzr/pinball#
-      
+
       architecture: {{$architecture}}
       image: {{$image}}
       machine: {{$machine}}
@@ -49,6 +52,8 @@ actions:
       image: {{$image}}
       machine: {{$machine}}
       uboot_machine: {{$uboot_machine}}
+      bootloader: {{$bootloader}}
+      partitiontype: {{$partitiontype}}
 
   - action: run
     chroot: true
@@ -82,6 +87,7 @@ actions:
     recipe: machine/{{$machine}}/image.yaml
     variables:
       architecture: {{$architecture}}
+      bootloader: {{$bootloader}}
       image: {{$image}}
       machine: {{$machine}}
       uboot_machine: {{$uboot_machine}}
diff --git a/extra/profile/pinball/etc/pinball/pinball-session.sh b/extra/profile/pinball/etc/pinball/pinball-session.sh
index 13899f5..1dd307f 100755
--- a/extra/profile/pinball/etc/pinball/pinball-session.sh
+++ b/extra/profile/pinball/etc/pinball/pinball-session.sh
@@ -29,9 +29,11 @@ mkdir -p "${HOME}" ||:
 
 echo "# Delay launcher's gap: ${PINBALL_DISPLAY_MANAGER}"
 if [ "weston" = "${PINBALL_DISPLAY_MANAGER}" ] ; then
-    while [ ! -e "${XDG_RUNTIME_DIR}/wayland-0" ] ; do
+    while ! ls "${XDG_RUNTIME_DIR}/wayland-"* ; do
         sleep 1
     done
+    WAYLAND_DISPLAY=$(find "${XDG_RUNTIME_DIR}" -iname "wayland-[0-9]" -exec basename "{}" \; | head -n1)
+    export WAYLAND_DISPLAY
     sleep 5
 fi
 
@@ -43,8 +45,8 @@ if [ "" = "${PINBALL_SCREEN}" ] ; then
     PINBALL_SCREEN=$(grep -n "^${PINBALL_RESOLUTION}$" /sys/class/drm/card*/modes \
                          | sed -e 's|/sys/class/drm/card[^-]*-\(.*\)/.*|\1|g' \
                          | sort | head -n1 || echo "TODO")
-    grep "${PINBALL_RESOLUTION}" /sys/class/drm/card*"-${PINBALL_SCREEN}/modes" ||:
 fi
+grep "${PINBALL_RESOLUTION}" /sys/class/drm/card*"-${PINBALL_SCREEN}/modes" ||:
 
 if [ ! -z ${DISPLAY} ] ; then # X11
     xsetroot -solid "${PINBALL_BGCOLOR}" ||:
@@ -88,6 +90,7 @@ aplay /usr/share/games/pinball/tux/lock.wav \
     export ALSA_CARD="$id"
     aplay /usr/share/games/pinball/tux/bump.wav \
         && break || unset ALSA_CARD
+    sleep 1
 done
 echo "# ALSA_CARD=${ALSA_CARD}"
 aplay /usr/share/games/pinball/tux/loop.wav ||:
diff --git a/extra/profile/pinball/etc/pinball/pinball.env.sh b/extra/profile/pinball/etc/pinball/pinball.env.sh
index c094bed..3da2381 100755
--- a/extra/profile/pinball/etc/pinball/pinball.env.sh
+++ b/extra/profile/pinball/etc/pinball/pinball.env.sh
@@ -26,7 +26,7 @@ HOME="/tmp/pinball"
 
 # Graphical system : weston or xinit
 PINBALL_DISPLAY_MANAGER='weston'
-XDG_RUNTIME_DIR='/run/user/0'
+#XDG_RUNTIME_DIR='/run/user/0'
 #PINBALL_DISPLAY_MANAGER="xinit"
 #DISPLAY=':0'
 #XINITRC="/etc/pinball/pinball-session.sh"
diff --git a/extra/profile/pinball/etc/pinball/weston.service b/extra/profile/pinball/etc/pinball/weston.service
index f7db7f6..f6487cc 100644
--- a/extra/profile/pinball/etc/pinball/weston.service
+++ b/extra/profile/pinball/etc/pinball/weston.service
@@ -13,7 +13,7 @@ Environment="DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/root/dbus/user_bus_soc
 ExecStartPre=/usr/bin/sudo /bin/mkdir -p /run/user/0/dbus
 ExecStartPre=/usr/bin/sudo /bin/chown -R root:root /run/user/0/dbus
 ExecStartPre=/bin/chmod -R 0700 /run/user/0
-ExecStart=/usr/bin/openvt -v -w -s -- su root -l -c "/usr/bin/weston-launch --  2>&1 | tee /var/log/weston.log"
+ExecStart=/usr/bin/weston --tty=2
 
 [Install]
 Alias=display-manager.service