diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index e946273edf..63f57833b3 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -35,7 +35,7 @@ file
 kms++-utils
 ntp
 pigpiod pigpio
-openjdk-11-jre
+openjdk-17-jre
 vim
 libtbb2
 git
diff --git a/stage2/01-sys-tweaks/00-packages-nr b/stage2/01-sys-tweaks/00-packages-nr
index 453ada8be2..acbe506d85 100644
--- a/stage2/01-sys-tweaks/00-packages-nr
+++ b/stage2/01-sys-tweaks/00-packages-nr
@@ -1,4 +1,4 @@
 cifs-utils
-libcamera-apps-lite
+rpicam-apps-lite
 mkvtoolnix
 python3-picamera2
diff --git a/stage2/04-update-firmware/00-run.sh b/stage2/04-update-firmware/00-run.sh
index c749695cfc..b525587058 100755
--- a/stage2/04-update-firmware/00-run.sh
+++ b/stage2/04-update-firmware/00-run.sh
@@ -12,7 +12,7 @@ rm -rf /boot.bak
 
 apt-get purge -y python3 gdb gcc g++ default-jdk
 apt-get autoremove -y
-apt-get install -y openjdk-11-jre
+apt-get install -y openjdk-17-jre
 
 rm -rf /var/lib/apt/lists/*
 apt-get clean