diff --git a/linux-arm64-full/Dockerfile.in b/linux-arm64-full/Dockerfile.in
index a5a69a4..665b78b 100644
--- a/linux-arm64-full/Dockerfile.in
+++ b/linux-arm64-full/Dockerfile.in
@@ -3,7 +3,7 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version
-ENV BR_VERSION 2021.08-rc1
+ENV BR_VERSION 2021.08-rc2
 
 #include "common.buildroot"
 
diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in
index 1df79e2..dfcaf28 100644
--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 #include "common.crosstool"
 
diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in
index 9883a80..15eecca 100644
--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/Dockerfile.in
@@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 #include "common.crosstool"
 
diff --git a/linux-armv6-lts/Dockerfile.in b/linux-armv6-lts/Dockerfile.in
index 15070e3..e976180 100644
--- a/linux-armv6-lts/Dockerfile.in
+++ b/linux-armv6-lts/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index 15070e3..e976180 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in
index 9e5b646..d806182 100644
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index 3afd57a..7e17184 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for 32-bit ARMv7 Linux
 
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 #include "common.crosstool"
 
diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in
index cc2e259..400d6d8 100644
--- a/linux-m68k-uclibc/Dockerfile.in
+++ b/linux-m68k-uclibc/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 ARG QEMU_VERSION=6.0.0
 
diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in
index a288424..cc4f4db 100644
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 #include "common.crosstool"
 
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index af74e8d..d244308 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 ARG QEMU_VERSION=6.0.0
 
diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in
index fa5b681..ce51360 100644
--- a/linux-riscv32/Dockerfile.in
+++ b/linux-riscv32/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 ARG QEMU_VERSION=6.0.0
 
diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in
index 61b9f04..22d6e35 100644
--- a/linux-riscv64/Dockerfile.in
+++ b/linux-riscv64/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 ARG QEMU_VERSION=6.0.0
 
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index b5d9464..7c3e4e6 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-04
-ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 #include "common.crosstool"
 
diff --git a/linux-xtensa-uclibc/Dockerfile.in b/linux-xtensa-uclibc/Dockerfile.in
index 7b5fda5..77d0fda 100644
--- a/linux-xtensa-uclibc/Dockerfile.in
+++ b/linux-xtensa-uclibc/Dockerfile.in
@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-07-07
-ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
+# crosstool-ng master 2021-08-18
+ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
 
 ENV QEMU_VERSION 6.0.0