diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index f4a2832552f..f990145c66f 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -17,7 +17,7 @@ llvmDisassembler=/opt/compiler-explorer/clang-14.0.0/bin/llvm-dis
 
 ###############################
 # GCC for x86
-group.gcc86.compilers=g412:g447:g453:g464:g471:g472:g473:g474:g481:g482:g483:g484:g485:g490:g491:g492:g493:g494:g510:g520:g530:g540:g550:g6:g62:g63:g64:g71:g72:g73:g74:g75:g81:g82:g83:g84:g85:g91:g92:g93:g94:g95:g101:g102:g103:g104:g105:g111:g112:g113:g114:g121:g122:g123:g131:g132:gsnapshot:gcontracts-trunk:gcontract-labels-trunk:gcxx-modules-trunk:gcxx-coroutines-trunk:gcc-embed-trunk:gcc-static-analysis-trunk
+group.gcc86.compilers=g412:g447:g453:g464:g471:g472:g473:g474:g481:g482:g483:g484:g485:g490:g491:g492:g493:g494:g510:g520:g530:g540:g550:g6:g62:g63:g64:g71:g72:g73:g74:g75:g81:g82:g83:g84:g85:g91:g92:g93:g94:g95:g101:g102:g103:g104:g105:g111:g112:g113:g114:g121:g122:g123:g131:g132:gsnapshot:gcontracts-trunk:gcontract-labels-trunk:gcontracts-nonattr-trunk:gcxx-modules-trunk:gcxx-coroutines-trunk:gcc-embed-trunk:gcc-static-analysis-trunk
 group.gcc86.groupName=GCC x86-64
 group.gcc86.instructionSet=amd64
 group.gcc86.baseName=x86-64 gcc
@@ -174,6 +174,12 @@ compiler.gcontract-labels-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bi
 compiler.gcontract-labels-trunk.semver=(contract labels)
 compiler.gcontract-labels-trunk.isNightly=true
 compiler.gcontract-labels-trunk.notification=Experimental Contract Label Support; see <a href="https://github.com/lock3/gcc/wiki" target="_blank" rel="noopener noreferrer">Lock3's repository wiki<sup><small class="fas fa-external-link-alt opens-new-window" title="Opens in a new window"></small></sup></a>
+compiler.gcontracts-nonattr-trunk.exe=/opt/compiler-explorer/gcc-contracts-nonattr-trunk/bin/g++
+compiler.gcontracts-nonattr-trunk.demangler=/opt/compiler-explorer/gcc-snapshot/bin/c++filt
+compiler.gcontracts-nonattr-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
+compiler.gcontracts-nonattr-trunk.semver=(contracts natural syntax)
+compiler.gcontracts-nonattr-trunk.isNightly=true
+compiler.gcontracts-nonattr-trunk.notification=Experimental Contract Natural Syntax Support; see <a href="https://open-std.org/JTC1/SC22/WG21/docs/papers/2023/p2961r0.pdf" target="_blank" rel="noopener noreferrer">P2961R0<sup><small class="fas fa-external-link-alt opens-new-window" title="Opens in a new window"></small></sup></a>
 compiler.gcxx-modules-trunk.exe=/opt/compiler-explorer/gcc-cxx-modules-trunk/bin/g++
 compiler.gcxx-modules-trunk.demangler=/opt/compiler-explorer/gcc-snapshot/bin/c++filt
 compiler.gcxx-modules-trunk.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump