diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 4d22cdb5261..d1206a1c1d0 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -3617,7 +3617,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:nvcxx_x86_cxx23_11:nvcxx_x86_cxx24_1:nvcxx_x86_cxx24_3:nvcxx_x86_cxx24_5:nvcxx_x86_cxx24_7:nvcxx_x86_cxx24_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:nvcxx_x86_cxx24_1:nvcxx_x86_cxx24_3:nvcxx_x86_cxx24_5:nvcxx_x86_cxx24_7:nvcxx_x86_cxx24_9:nvcxx_x86_cxx24_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
@@ -3716,7 +3716,13 @@ compiler.nvcxx_x86_cxx24_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/
 compiler.nvcxx_x86_cxx24_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.9/compilers/bin/nvc++
 compiler.nvcxx_x86_cxx24_9.semver=24.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:nvcxx_arm_cxx23_11:nvcxx_arm_cxx24_1:nvcxx_arm_cxx24_3:nvcxx_arm_cxx24_5:nvcxx_arm_cxx24_7:nvcxx_arm_cxx24_9
+compiler.nvcxx_x86_cxx24_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvdecode
+compiler.nvcxx_x86_cxx24_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/cuobjdump
+compiler.nvcxx_x86_cxx24_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/nvdisasm
+compiler.nvcxx_x86_cxx24_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvc++
+compiler.nvcxx_x86_cxx24_11.semver=24.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:nvcxx_arm_cxx24_1:nvcxx_arm_cxx24_3:nvcxx_arm_cxx24_5:nvcxx_arm_cxx24_7:nvcxx_arm_cxx24_9:nvcxx_arm_cxx24_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)$
@@ -3788,6 +3794,10 @@ compiler.nvcxx_arm_cxx24_9.demangler=/opt/compiler-explorer/hpc_sdk/Linux_aarch6
 compiler.nvcxx_arm_cxx24_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/24.9/compilers/bin/nvc++
 compiler.nvcxx_arm_cxx24_9.semver=24.9
 
+compiler.nvcxx_arm_cxx24_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/24.11/compilers/bin/nvdecode
+compiler.nvcxx_arm_cxx24_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_aarch64/24.11/compilers/bin/nvc++
+compiler.nvcxx_arm_cxx24_11.semver=24.11
+
 #################################
 # EDG compiler
 group.edg.compilers=&edg-gnu:&edg-default
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index f232521be2f..7348170157c 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -358,7 +358,7 @@ compiler.cclang_widberg.notification=Experimental Reverse Engineering Compiler;
 #################################
 # NVHPC nvc
 
-group.nvc_x86.compilers=nvc_x86_24_9
+group.nvc_x86.compilers=nvc_x86_24_9:nvc_x86_24_11
 group.nvc_x86.options=
 group.nvc_x86.binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_start|frame_dummy|\.plt.*|_dl_relocate_static_pie)$
 group.nvc_x86.needsMulti=false
@@ -379,6 +379,12 @@ compiler.nvc_x86_24_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.9/
 compiler.nvc_x86_24_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.9/compilers/bin/nvc
 compiler.nvc_x86_24_9.semver=24.9
 
+compiler.nvc_x86_24_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvdecode
+compiler.nvc_x86_24_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/cuobjdump
+compiler.nvc_x86_24_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/nvdisasm
+compiler.nvc_x86_24_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvc
+compiler.nvc_x86_24_11.semver=24.11
+
 # Clang for Arm
 # Provides 32- and 64-bit menu items for clang-9 and trunk
 group.armcclang32.groupName=Arm 32-bit clang
diff --git a/etc/config/cuda.amazon.properties b/etc/config/cuda.amazon.properties
index fb3b21ae730..04e145ec9c0 100644
--- a/etc/config/cuda.amazon.properties
+++ b/etc/config/cuda.amazon.properties
@@ -9,7 +9,7 @@ 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=nvcc126u1:nvcc125u1:nvcc124u1: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.compilers=nvcc126u2:nvcc126u1:nvcc125u1:nvcc124u1: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
@@ -246,6 +246,13 @@ compiler.nvcc126u1.options=--compiler-bindir /opt/compiler-explorer/gcc-10.2.0/b
 compiler.nvcc126u1.nvdisasm=/opt/compiler-explorer/cuda/12.6.1/bin/nvdisasm
 compiler.nvcc126u1.demangler=/opt/compiler-explorer/gcc-10.2.0/bin/c++filt
 compiler.nvcc126u1.objdumper=/opt/compiler-explorer/gcc-10.2.0/bin/objdump
+compiler.nvcc126u2.semver=12.6.2
+compiler.nvcc126u2.exe=/opt/compiler-explorer/cuda/12.6.2/bin/nvcc
+compiler.nvcc126u2.options=--compiler-bindir /opt/compiler-explorer/gcc-10.2.0/bin
+compiler.nvcc126u2.nvdisasm=/opt/compiler-explorer/cuda/12.6.2/bin/nvdisasm
+compiler.nvcc126u2.demangler=/opt/compiler-explorer/gcc-10.2.0/bin/c++filt
+compiler.nvcc126u2.objdumper=/opt/compiler-explorer/gcc-10.2.0/bin/objdump
+
 group.cuclang.compilers=cuclang700:cuclang800:cuclang900:cuclang1000:cuclang1001:cuclang1100:cuclang1600:cuclang1701:cuclang1810:cuclang1910:cltrunk
 group.cuclang.isSemVer=true
 group.cuclang.baseName=clang
diff --git a/etc/config/fortran.amazon.properties b/etc/config/fortran.amazon.properties
index f448a2a2d85..66f70fed979 100644
--- a/etc/config/fortran.amazon.properties
+++ b/etc/config/fortran.amazon.properties
@@ -259,7 +259,7 @@ compiler.ifxlatest.options=-gxx-name=/opt/compiler-explorer/gcc-13.2.0/bin/g++
 #################################
 # NVHPC nvfortran
 
-group.nvfortran_x86.compilers=nvfortran_x86_24_9
+group.nvfortran_x86.compilers=nvfortran_x86_24_9:nvfortran_x86_24_11
 group.nvfortran_x86.options=
 group.nvfortran_x86.needsMulti=false
 group.nvfortran_x86.supportsBinary=true
@@ -276,6 +276,12 @@ compiler.nvfortran_x86_24_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64
 compiler.nvfortran_x86_24_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.9/compilers/bin/nvfortran
 compiler.nvfortran_x86_24_9.semver=24.9
 
+compiler.nvfortran_x86_24_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvdecode
+compiler.nvfortran_x86_24_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/cuobjdump
+compiler.nvfortran_x86_24_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/cuda/12.6/bin/nvdisasm
+compiler.nvfortran_x86_24_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/24.11/compilers/bin/nvfortran
+compiler.nvfortran_x86_24_11.semver=24.11
+
 ###############################
 # GCC Cross-Compilers
 group.cross.compilers=&gccarm:&gccaarch64:&ppcs:&gccrvs:&gccmips:&gccmips64:&gccmipsel:&gccmips64el:&gccs390x:&gccriscv:&gccriscv64:&gccloongarch64:&gccsparc:&gccsparc64:&gccsparcleon:&gcchppa