diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4
index d3acdcd..aaf5d5b 100644
--- a/toolchains/devkitarm/Dockerfile.m4
+++ b/toolchains/devkitarm/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`DEVKITARM_VERSION',20241104)
+m4_define(`DEVKITARM_VERSION',20250728)
 # This version of devkitARM depends on a Debian Bullseye
 # For now it works with our version, we will have to ensure it stays like that
 FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain
diff --git a/toolchains/devkitnds/Dockerfile.m4 b/toolchains/devkitnds/Dockerfile.m4
index 7f7d232..7c93b97 100644
--- a/toolchains/devkitnds/Dockerfile.m4
+++ b/toolchains/devkitnds/Dockerfile.m4
@@ -16,7 +16,7 @@ ENV \
 	def_pkg_config(`${PREFIX}') \
         PATH=$PATH:${DEVKITPRO}/tools/bin:${DEVKITPRO}/portlibs/nds/bin
 
-# From pkgbuild-scripts/ndsvars.sh
+# From pacman-packages:dkp-toolchain-vars/ndsvars.sh
 ENV \
 	CFLAGS="-march=armv5te -mtune=arm946e-s -O2 -ffunction-sections -fdata-sections" \
 	CXXFLAGS="-march=armv5te -mtune=arm946e-s -O2 -ffunction-sections -fdata-sections" \
diff --git a/workers/devkitnds/Dockerfile.m4 b/workers/devkitnds/Dockerfile.m4
index 5f88504..beab2c6 100644
--- a/workers/devkitnds/Dockerfile.m4
+++ b/workers/devkitnds/Dockerfile.m4
@@ -8,6 +8,7 @@ ENV DEVKITPRO=/opt/devkitpro
 ENV DEVKITARM=${DEVKITPRO}/devkitARM
 ENV PREFIX=${DEVKITPRO}/portlibs/nds HOST=arm-none-eabi
 
+COPY --from=toolchain ${DEVKITPRO}/calico ${DEVKITPRO}/calico/
 COPY --from=toolchain ${DEVKITPRO}/devkitARM ${DEVKITPRO}/devkitARM/
 COPY --from=toolchain ${DEVKITPRO}/libnds ${DEVKITPRO}/libnds/
 COPY --from=toolchain ${DEVKITPRO}/portlibs/nds ${DEVKITPRO}/portlibs/nds/