diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index e3e2e0c..3aa1ae8 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -1,19 +1,2 @@
-gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
-evince gtk2-engines alsa-utils
-desktop-base
-git
-gvfs
-rfkill
-chromium rpi-chromium-mods libwidevinecdm0
-firefox rpi-firefox-mods
-gldriver-test
-fonts-droid-fallback
-fonts-liberation2
-obconf
-raindrop
-libcamera-tools
-rpicam-apps
-python3-picamera2
-python3-pyqt5
-python3-opengl
-vulkan-tools mesa-vulkan-drivers
+rpd-preferences
+rpd-theme
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
index 227c861..fec8391 100644
--- a/stage3/00-install-packages/00-packages-nr
+++ b/stage3/00-install-packages/00-packages-nr
@@ -1,8 +1,2 @@
-xserver-xorg xinit
-mousepad
-eom
-lxde lxtask menu-xdg
-zenity xdg-utils
-gvfs-backends gvfs-fuse
-lightdm gnome-themes-extra-data gnome-icon-theme
-gnome-keyring
+rpd-wayland-core
+rpd-x-core
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
deleted file mode 100755
index 7fb0f4b..0000000
--- a/stage3/00-install-packages/01-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot <<- EOF
-	apt-mark auto python3-pyqt5 python3-opengl
-EOF
diff --git a/stage4/05-print-support/01-run.sh b/stage3/01-print-support/00-run.sh
similarity index 100%
rename from stage4/05-print-support/01-run.sh
rename to stage3/01-print-support/00-run.sh
diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf
deleted file mode 100644
index 87932e2..0000000
--- a/stage4/00-install-packages/00-debconf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable realtime process priority?
-jackd2  jackd/tweak_rt_limits   boolean true
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 285bccd..85311f8 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -1,28 +1,6 @@
-python3-pygame
-python3-tk thonny
-python3-pgzero
-python3-serial
-debian-reference-en
-rpd-wayland-core rpd-x-core
-rpd-theme
-rpd-utilities rpd-preferences
-python3-pip
-python3-numpy
-rc-gui sense-hat
-tree
-libgl1-mesa-dri libgles1 xcompmgr
-geany
-piclone
-python3-flask
-pprompt
-piwiz
-rp-prefapps
-ffmpeg
-vlc
-rpi-connect
-rpi-imager
-labwc
-squeekboard
-
-# ninja-build and openocd needed for vscode pico extension
-meson openocd
+rpd-applications
+rpd-developer
+rpd-graphics
+rpd-utilities
+rpd-wayland-extras
+rpd-x-extras
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
deleted file mode 100644
index 88c1cd4..0000000
--- a/stage4/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1 +0,0 @@
-pi-package
diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages
deleted file mode 100644
index fc43d17..0000000
--- a/stage4/00-install-packages/02-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-hunspell-en-gb
-hyphen-en-gb
-wamerican
-wbritish
diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh
deleted file mode 100755
index 665dcdb..0000000
--- a/stage4/01-console-autologin/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4
-EOF
diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh
deleted file mode 100755
index ad6298d..0000000
--- a/stage4/04-enable-xcompmgr/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	raspi-config nonint do_xcompmgr 0
-EOF
diff --git a/stage4/05-print-support/00-packages b/stage4/05-print-support/00-packages
deleted file mode 100644
index 462d36c..0000000
--- a/stage4/05-print-support/00-packages
+++ /dev/null
@@ -1 +0,0 @@
-cups
diff --git a/stage4/06-enable-wayland/00-run.sh b/stage4/06-enable-wayland/00-run.sh
deleted file mode 100755
index bd8bbc3..0000000
--- a/stage4/06-enable-wayland/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W2
-EOF