diff --git a/scripts/compiler_tests/build_all.sh b/scripts/compiler_tests/build_all.sh
index 6ce4ed4..ed88004 100755
--- a/scripts/compiler_tests/build_all.sh
+++ b/scripts/compiler_tests/build_all.sh
@@ -11,7 +11,7 @@ if [ $? -ne 0 ]; then
 	images/ubuntu/build.sh
 fi
 
-for i in 8 15;
+for i in 8 16;
 do
 	gcc/build.sh $1 $i
 done
diff --git a/scripts/compiler_tests/images/ubuntu/prepare.sh b/scripts/compiler_tests/images/ubuntu/prepare.sh
index 1cab9bc..a5c3653 100755
--- a/scripts/compiler_tests/images/ubuntu/prepare.sh
+++ b/scripts/compiler_tests/images/ubuntu/prepare.sh
@@ -120,6 +120,20 @@ mkdir build && cd build
 make -j$(nproc)
 make install
 
+echo "Installing GCC 16.1.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-16.1.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-16
+
+cd gcc-16
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-16
+make -j$(nproc)
+make install
+
 echo "Installing clang"
 
 cd /root
diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh
index deb1fe5..d152a56 100755
--- a/scripts/release/images/ubuntu/prepare.sh
+++ b/scripts/release/images/ubuntu/prepare.sh
@@ -8,7 +8,7 @@ BINUTILS_VERSION=2_46
 CLANG_VERSION=21.1.8
 CMAKE_VERSION=4.3.2
 FREEBSD_VERSION=12.4
-GCC_VERSION=15.2.0
+GCC_VERSION=16.1.0
 GLIBC_VERSION=2.43
 LINUX_HEADERS_VERSION=6.19.14
 MACOSX_SDK_VERSION=26.1
@@ -269,7 +269,7 @@ echo "Install GCC for aarch64-linux-gnu"
 cd /root
 
 mkdir gcc_build_aarch64 && cd gcc_build_aarch64
-../gcc/configure --target=aarch64-linux-gnu --enable-languages=c,c++ --disable-multilib
+../gcc/configure --target=aarch64-linux-gnu --enable-languages=c,c++ --disable-multilib --disable-libatomic
 make -j$(nproc) all-gcc
 make install-gcc
 
@@ -321,7 +321,7 @@ echo "Install GCC for riscv64-linux-gnu"
 cd /root
 
 mkdir gcc_build_riscv64 && cd gcc_build_riscv64
-../gcc/configure --target=riscv64-linux-gnu --enable-languages=c,c++ --disable-multilib
+../gcc/configure --target=riscv64-linux-gnu --enable-languages=c,c++ --disable-multilib --disable-libatomic
 make -j$(nproc) all-gcc
 make install-gcc
 
@@ -380,7 +380,7 @@ echo "Install GCC for x86_64-w64-mingw32"
 cd /root
 
 mkdir gcc_build_w64 && cd gcc_build_w64
-../gcc/configure --target=x86_64-w64-mingw32 --enable-languages=c,c++ --disable-multilib
+../gcc/configure --target=x86_64-w64-mingw32 --enable-languages=c,c++ --disable-multilib --disable-libatomic
 make -j$(nproc) all-gcc
 make install-gcc
 
diff --git a/scripts/release/windows_x64/p2pool_windows_x64.sh b/scripts/release/windows_x64/p2pool_windows_x64.sh
index c329ba4..899b70c 100755
--- a/scripts/release/windows_x64/p2pool_windows_x64.sh
+++ b/scripts/release/windows_x64/p2pool_windows_x64.sh
@@ -19,7 +19,7 @@ flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_T
 flags_libs="--target=x86_64-pc-windows-gnu -Os -flto -Wl,/timestamp:$BUILD_TIMESTAMP -fuse-ld=lld -w $flags_size $flags_datetime"
 
 flags_p2pool="--target=x86_64-pc-windows-gnu -Wl,/timestamp:$BUILD_TIMESTAMP -fuse-ld=lld -femulated-tls -Wno-unused-command-line-argument -Wno-unknown-attributes $flags_size $flags_datetime"
-flags_cxx_headers="-isystem /usr/local/x86_64-w64-mingw32/include/c++ -isystem /usr/local/x86_64-w64-mingw32/include/c++/15.2.0 -isystem /usr/local/x86_64-w64-mingw32/include"
+flags_cxx_headers="-isystem /usr/local/x86_64-w64-mingw32/include/c++ -isystem /usr/local/x86_64-w64-mingw32/include/c++/16.1.0 -isystem /usr/local/x86_64-w64-mingw32/include"
 
 cd /p2pool
 git apply --verbose --ignore-whitespace --directory=external/src/grpc/third_party/boringssl-with-bazel patches/boringssl/win7.patch