diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 502a614ee..f15d77bf0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -266,13 +266,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2025-24.04
-            artifact-name: Athena
-            build-options: "-Ponlylinuxathena"
-          - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
+          - container: wpilib/raspbian-cross-ubuntu:bookworm-24.04
             artifact-name: Raspbian
             build-options: "-Ponlylinuxarm32"
-          - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
+          - container: wpilib/aarch64-cross-ubuntu:bookworm-24.04
             artifact-name: Aarch64
             build-options: "-Ponlylinuxarm64"
 
diff --git a/docs/source/docs/hardware/selecting-hardware.md b/docs/source/docs/hardware/selecting-hardware.md
index b9baa4d7b..86b404011 100644
--- a/docs/source/docs/hardware/selecting-hardware.md
+++ b/docs/source/docs/hardware/selecting-hardware.md
@@ -10,7 +10,7 @@ In order to use PhotonVision, you need a coprocessor and a camera. This page dis
 
 ### Minimum System Requirements
 
-- Ubuntu 22.04 LTS or Windows 10/11
+- Ubuntu 24.04 LTS or Windows 10/11
   - We don't recommend using Windows for anything except testing out the system on a local machine.
 - CPU: ARM Cortex-A53 (the CPU on Raspberry Pi 3) or better
 - At least 8GB of storage