diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index c3e96f80c7a..a3dfe71b96a 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -339,25 +339,26 @@ compiler.clang601.semver=6.0.1
 
 compiler.clang700.exe=/opt/compiler-explorer/clang-7.0.0/bin/clang++
 compiler.clang700.semver=7.0.0
-compiler.clang700.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang700.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang701.exe=/opt/compiler-explorer/clang-7.0.1/bin/clang++
 compiler.clang701.semver=7.0.1
-compiler.clang701.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang701.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang710.exe=/opt/compiler-explorer/clang-7.1.0/bin/clang++
 compiler.clang710.semver=7.1.0
-compiler.clang710.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang710.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang800.exe=/opt/compiler-explorer/clang-8.0.0/bin/clang++
 compiler.clang800.semver=8.0.0
-compiler.clang800.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang800.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang801.exe=/opt/compiler-explorer/clang-8.0.1/bin/clang++
 compiler.clang801.semver=8.0.1
-compiler.clang801.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang801.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang900.exe=/opt/compiler-explorer/clang-9.0.0/bin/clang++
 compiler.clang900.semver=9.0.0
-compiler.clang900.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang900.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.clang901.exe=/opt/compiler-explorer/clang-9.0.1/bin/clang++
 compiler.clang901.semver=9.0.1
-compiler.clang901.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.clang901.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
+
 compiler.clang1000.exe=/opt/compiler-explorer/clang-10.0.0/bin/clang++
 compiler.clang1000.semver=10.0.0
 compiler.clang1000.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index 133797c4407..0f595c8904e 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -269,25 +269,25 @@ compiler.cclang601.semver=6.0.1
 
 compiler.cclang700.exe=/opt/compiler-explorer/clang-7.0.0/bin/clang
 compiler.cclang700.semver=7.0.0
-compiler.cclang700.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang700.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang701.exe=/opt/compiler-explorer/clang-7.0.1/bin/clang
 compiler.cclang701.semver=7.0.1
-compiler.cclang701.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang701.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang710.exe=/opt/compiler-explorer/clang-7.1.0/bin/clang
 compiler.cclang710.semver=7.1.0
-compiler.cclang710.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang710.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang800.exe=/opt/compiler-explorer/clang-8.0.0/bin/clang
 compiler.cclang800.semver=8.0.0
-compiler.cclang800.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang800.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang801.exe=/opt/compiler-explorer/clang-8.0.1/bin/clang
 compiler.cclang801.semver=8.0.1
-compiler.cclang801.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang801.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang900.exe=/opt/compiler-explorer/clang-9.0.0/bin/clang
 compiler.cclang900.semver=9.0.0
-compiler.cclang900.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang900.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang901.exe=/opt/compiler-explorer/clang-9.0.1/bin/clang
 compiler.cclang901.semver=9.0.1
-compiler.cclang901.options=--gcc-toolchain=/opt/compiler-explorer/gcc-14.1.0
+compiler.cclang901.options=--gcc-toolchain=/opt/compiler-explorer/gcc-9.3.0
 compiler.cclang1000.exe=/opt/compiler-explorer/clang-10.0.0/bin/clang
 
 compiler.cclang1000.semver=10.0.0