diff --git a/aarch64-cross-ubuntu/Dockerfile.bookworm-2027 b/aarch64-cross-ubuntu/Dockerfile.bookworm-2027
index ad05a5c..be51352 100644
--- a/aarch64-cross-ubuntu/Dockerfile.bookworm-2027
+++ b/aarch64-cross-ubuntu/Dockerfile.bookworm-2027
@@ -5,8 +5,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 # Install toolchain
 RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
-RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
+RUN apt update && apt install -y openjdk-25-jdk && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 
 WORKDIR /
diff --git a/raspbian-cross-ubuntu/Dockerfile.bookworm-2027 b/raspbian-cross-ubuntu/Dockerfile.bookworm-2027
index cb7c99a..b13594c 100644
--- a/raspbian-cross-ubuntu/Dockerfile.bookworm-2027
+++ b/raspbian-cross-ubuntu/Dockerfile.bookworm-2027
@@ -6,8 +6,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 # Install toolchain
 RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/armhf-raspi-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
-RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
+RUN apt update && apt install -y openjdk-25-jdk && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 
 WORKDIR /
diff --git a/systemcore-cross-ubuntu/Dockerfile.2027 b/systemcore-cross-ubuntu/Dockerfile.2027
index 27a0546..4848585 100644
--- a/systemcore-cross-ubuntu/Dockerfile.2027
+++ b/systemcore-cross-ubuntu/Dockerfile.2027
@@ -5,8 +5,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 # Install toolchain
 RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
-RUN apt update && apt install -y openjdk-21-jdk avahi-daemon && rm -rf /var/lib/apt/lists/*
+RUN apt update && apt install -y openjdk-25-jdk avahi-daemon && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 
 WORKDIR /