diff --git a/Makefile b/Makefile
index 14a95fb..e7c084a 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ build/base:
 
 build/cross: build/base
 	cd roborio-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
+	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd raspbian-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd aarch64-cross-ubuntu && \
@@ -35,7 +35,7 @@ build/minimal-base:
 
 build/minimal-cross: build/minimal-base
 	cd roborio-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
+	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd raspbian-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd aarch64-cross-ubuntu && \
@@ -52,7 +52,7 @@ push/base:
 	docker push ${DOCKER_USER}/gazebo-ubuntu:${UBUNTU}
 
 push/cross: push/base
-	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU}
+	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU}
 
@@ -60,7 +60,7 @@ push/minimal-base:
 	docker push ${DOCKER_USER}/ubuntu-minimal-base:${UBUNTU}
 
 push/minimal-cross: push/minimal-base
-	docker push ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU}
+	docker push ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU}
 
@@ -70,7 +70,7 @@ push/opensdk:
 
 .PHONY: save/minimal-cross
 save/minimal-cross:
-	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} | gzip > roborio.tar.gz
+	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU} | gzip > roborio.tar.gz
 	docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > raspbian.tar.gz
 	docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > aarch64.tar.gz
 
diff --git a/aarch64-cross-ubuntu/Dockerfile.bullseye b/aarch64-cross-ubuntu/Dockerfile.bullseye
index 7e7be29..9457bc0 100644
--- a/aarch64-cross-ubuntu/Dockerfile.bullseye
+++ b/aarch64-cross-ubuntu/Dockerfile.bullseye
@@ -3,6 +3,6 @@ ARG TYPE=base
 FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/cross-ubuntu-py/py.mk b/cross-ubuntu-py/py.mk
index e686461..af23b3c 100644
--- a/cross-ubuntu-py/py.mk
+++ b/cross-ubuntu-py/py.mk
@@ -14,9 +14,9 @@ TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
 AC_TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
 
 TYPE_ROBORIO=roborio
-VERSION_ROBORIO=2024
-TARGET_HOST_ROBORIO=arm-frc2024-linux-gnueabi
-AC_TARGET_HOST_ROBORIO=armv7l-frc2024-linux-gnueabi
+VERSION_ROBORIO=2025
+TARGET_HOST_ROBORIO=arm-frc2025-linux-gnueabi
+AC_TARGET_HOST_ROBORIO=armv7l-frc2025-linux-gnueabi
 
 
 .PHONY: build/cross-python
diff --git a/raspbian-cross-ubuntu/Dockerfile.bullseye b/raspbian-cross-ubuntu/Dockerfile.bullseye
index c03f19e..b43c3f9 100644
--- a/raspbian-cross-ubuntu/Dockerfile.bullseye
+++ b/raspbian-cross-ubuntu/Dockerfile.bullseye
@@ -4,6 +4,6 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/roborio-cross-ubuntu/Dockerfile.2024 b/roborio-cross-ubuntu/Dockerfile.2025
similarity index 80%
rename from roborio-cross-ubuntu/Dockerfile.2024
rename to roborio-cross-ubuntu/Dockerfile.2025
index 63e953b..9bedc94 100644
--- a/roborio-cross-ubuntu/Dockerfile.2024
+++ b/roborio-cross-ubuntu/Dockerfile.2025
@@ -3,6 +3,6 @@ ARG TYPE=base
 FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/cortexa9_vfpv3-roborio-academic-2025-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /