diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 3d79b288afb..17ab8028bb3 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -2756,7 +2756,7 @@ compiler.gcc6502_1110.notification=This uses AVR-GCC 11.1.0 to compile C++ and u
 #################################
 # NVHPC nvc++
 
-group.nvcxx_x86_cxx.compilers=nvcxx_x86_cxx22_7:nvcxx_x86_cxx22_9:nvcxx_x86_cxx22_11:nvcxx_x86_cxx23_1:nvcxx_x86_cxx23_3:nvcxx_x86_cxx23_5:nvcxx_x86_cxx23_7:nvcxx_x86_cxx23_9
+group.nvcxx_x86_cxx.compilers=nvcxx_x86_cxx22_7:nvcxx_x86_cxx22_9:nvcxx_x86_cxx22_11:nvcxx_x86_cxx23_1:nvcxx_x86_cxx23_3:nvcxx_x86_cxx23_5:nvcxx_x86_cxx23_7:nvcxx_x86_cxx23_9:nvcxx_x86_cxx23_11
 group.nvcxx_x86_cxx.options=
 group.nvcxx_x86_cxx.binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_start|frame_dummy|\.plt.*|_dl_relocate_static_pie)$
 group.nvcxx_x86_cxx.needsMulti=false
@@ -2819,7 +2819,13 @@ compiler.nvcxx_x86_cxx23_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/
 compiler.nvcxx_x86_cxx23_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc++
 compiler.nvcxx_x86_cxx23_9.semver=23.9
 
-group.nvcxx_arm_cxx.compilers=nvcxx_arm_cxx22_7:nvcxx_arm_cxx22_9:nvcxx_arm_cxx22_11:nvcxx_arm_cxx23_1:nvcxx_arm_cxx23_3:nvcxx_arm_cxx23_5:nvcxx_arm_cxx23_7:nvcxx_arm_cxx23_9
+compiler.nvcxx_x86_cxx23_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/23.11/compilers/bin/nvdecode
+compiler.nvcxx_x86_cxx23_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/23.11/cuda/12.3/bin/cuobjdump
+compiler.nvcxx_x86_cxx23_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/23.11/cuda/12.3/bin/nvdisasm
+compiler.nvcxx_x86_cxx23_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/23.11/compilers/bin/nvc++
+compiler.nvcxx_x86_cxx23_11.semver=23.11
+
+group.nvcxx_arm_cxx.compilers=nvcxx_arm_cxx22_7:nvcxx_arm_cxx22_9:nvcxx_arm_cxx22_11:nvcxx_arm_cxx23_1:nvcxx_arm_cxx23_3:nvcxx_arm_cxx23_5:nvcxx_arm_cxx23_7:nvcxx_arm_cxx23_9:nvcxx_arm_cxx23_11
 group.nvcxx_arm_cxx.options=
 group.nvcxx_arm_cxx.supportsBinary=true
 group.nvcxx_arm_cxx.binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_start|frame_dummy|\.plt.*|_dl_relocate_static_pie)$
@@ -2867,6 +2873,10 @@ compiler.nvcxx_arm_cxx23_9.demangler=/opt/compiler-explorer/hpc_sdk/Linux_aarch6
 compiler.nvcxx_arm_cxx23_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/23.9/compilers/bin/nvc++
 compiler.nvcxx_arm_cxx23_9.semver=23.9
 
+compiler.nvcxx_arm_cxx23_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/23.11/compilers/bin/nvdecode
+compiler.nvcxx_arm_cxx23_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/23.11/compilers/bin/nvc++
+compiler.nvcxx_arm_cxx23_11.semver=23.11
+
 #################################
 # EDG compiler
 group.edg.compilers=&edg-gnu:&edg-default
diff --git a/etc/config/cuda.amazon.properties b/etc/config/cuda.amazon.properties
index 7a21f006bfe..c83db3cc2f9 100644
--- a/etc/config/cuda.amazon.properties
+++ b/etc/config/cuda.amazon.properties
@@ -2,14 +2,14 @@ compilers=godbolt.org@443/gpu:&nvrtc:&cuclang:&hipclang
 # Disabled: nvcc
 # The disabled group(s) are actually used in the cuda.gpu.properties (along with libs etc). One day these might exist on
 # both servers, so I want to keep them in the same place.
-defaultCompiler=nvcc122u1
+defaultCompiler=nvcc123u1
 supportsBinary=true
 supportsExecute=false
 
 # Details of GPUs/features supported by CUDA compilers can be found here:
 # gist.github.com/ax3l/9489132#clang--x-cuda
 
-group.nvcc.compilers=nvcc122u1:nvcc121:nvcc120u1:nvcc120:nvcc118:nvcc117u1:nvcc117:nvcc116u2:nvcc116u1:nvcc116:nvcc115u2:nvcc115u1:nvcc115:nvcc114u4:nvcc114u3:nvcc114u2:nvcc114u1:nvcc114:nvcc113u1:nvcc113:nvcc112u2:nvcc112u1:nvcc112:nvcc111u1:nvcc111:nvcc11u1:nvcc11:nvcc102:nvcc101u2:nvcc101u1:nvcc101:nvcc100:nvcc92:nvcc91
+group.nvcc.compilers=nvcc123u1:nvcc122u1:nvcc121:nvcc120u1:nvcc120:nvcc118:nvcc117u1:nvcc117:nvcc116u2:nvcc116u1:nvcc116:nvcc115u2:nvcc115u1:nvcc115:nvcc114u4:nvcc114u3:nvcc114u2:nvcc114u1:nvcc114:nvcc113u1:nvcc113:nvcc112u2:nvcc112u1:nvcc112:nvcc111u1:nvcc111:nvcc11u1:nvcc11:nvcc102:nvcc101u2:nvcc101u1:nvcc101:nvcc100:nvcc92:nvcc91
 group.nvcc.versionRe=^Cuda.*
 group.nvcc.compilerType=nvcc
 group.nvcc.isSemVer=true
@@ -222,6 +222,12 @@ compiler.nvcc122u1.options=--compiler-bindir /opt/compiler-explorer/gcc-10.2.0/b
 compiler.nvcc122u1.nvdisasm=/opt/compiler-explorer/cuda/12.2.1/bin/nvdisasm
 compiler.nvcc122u1.demangler=/opt/compiler-explorer/gcc-10.2.0/bin/c++filt
 compiler.nvcc122u1.objdumper=/opt/compiler-explorer/gcc-10.2.0/bin/objdump
+compiler.nvcc123u1.semver=12.3.1
+compiler.nvcc123u1.exe=/opt/compiler-explorer/cuda/12.3.1/bin/nvcc
+compiler.nvcc123u1.options=--compiler-bindir /opt/compiler-explorer/gcc-10.2.0/bin
+compiler.nvcc123u1.nvdisasm=/opt/compiler-explorer/cuda/12.3.1/bin/nvdisasm
+compiler.nvcc123u1.demangler=/opt/compiler-explorer/gcc-10.2.0/bin/c++filt
+compiler.nvcc123u1.objdumper=/opt/compiler-explorer/gcc-10.2.0/bin/objdump
 group.cuclang.compilers=cuclang700:cuclang800:cuclang900:cuclang1000:cuclang1001:cuclang1100:cltrunk
 group.cuclang.isSemVer=true
 group.cuclang.baseName=clang