diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 93a69be..f06f7d0 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -5,7 +5,7 @@ python-is-python3
 v4l-utils
 gpiod python3-libgpiod
 python3-gpiozero
-pigpio python3-pigpio raspi-gpio python3-rpi.gpio
+pigpio python3-pigpio raspi-gpio python3-rpi-lgpio
 python3-spidev
 python3-smbus2
 avahi-daemon
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index f3af725..f7cbe74 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -11,7 +11,7 @@ gldriver-test
 fonts-droid-fallback
 fonts-liberation2
 obconf
-arandr
+raindrop
 libcamera-tools
 rpicam-apps
 python3-picamera2
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index ebd1af4..511941c 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -21,6 +21,7 @@ vlc
 rpi-connect
 rpi-imager
 labwc
+squeekboard
 
 # ninja-build and openocd needed for vscode pico extension
 meson openocd
diff --git a/stage4/06-enable-wayland/00-run.sh b/stage4/06-enable-wayland/00-run.sh
index bd8bbc3..d1f240d 100755
--- a/stage4/06-enable-wayland/00-run.sh
+++ b/stage4/06-enable-wayland/00-run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W2
+	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W3
 EOF