diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index a3553de17..339ad1a5e 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -4464,7 +4464,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:nvcxx_x86_cxx24_11:nvcxx_x86_cxx25_1:nvcxx_x86_cxx25_3:nvcxx_x86_cxx25_5:nvcxx_x86_cxx25_7:nvcxx_x86_cxx25_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:nvcxx_x86_cxx25_1:nvcxx_x86_cxx25_3:nvcxx_x86_cxx25_5:nvcxx_x86_cxx25_7:nvcxx_x86_cxx25_9:nvcxx_x86_cxx25_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
@@ -4599,6 +4599,11 @@ compiler.nvcxx_x86_cxx25_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/
 compiler.nvcxx_x86_cxx25_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.9/compilers/bin/nvc++
 compiler.nvcxx_x86_cxx25_9.semver=25.9
 
+compiler.nvcxx_x86_cxx25_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvdecode
+compiler.nvcxx_x86_cxx25_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/cuobjdump
+compiler.nvcxx_x86_cxx25_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/nvdisasm
+compiler.nvcxx_x86_cxx25_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvc++
+compiler.nvcxx_x86_cxx25_11.semver=25.11
 
 #################################
 # EDG compiler
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index bb53b6b39..a31be0537 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -425,7 +425,7 @@ compiler.cclang_widberg.notification=Experimental Reverse Engineering Compiler;
 #################################
 # NVHPC nvc
 
-group.nvc_x86.compilers=nvc_x86_24_9:nvc_x86_24_11:nvc_x86_25_1:nvc_x86_25_3:nvc_x86_25_5:nvc_x86_25_7:nvc_x86_25_9
+group.nvc_x86.compilers=nvc_x86_24_9:nvc_x86_24_11:nvc_x86_25_1:nvc_x86_25_3:nvc_x86_25_5:nvc_x86_25_7:nvc_x86_25_9:nvc_x86_25_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
@@ -482,6 +482,12 @@ compiler.nvc_x86_25_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.9/
 compiler.nvc_x86_25_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.9/compilers/bin/nvc
 compiler.nvc_x86_25_9.semver=25.9
 
+compiler.nvc_x86_25_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvdecode
+compiler.nvc_x86_25_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/cuobjdump
+compiler.nvc_x86_25_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/nvdisasm
+compiler.nvc_x86_25_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvc
+compiler.nvc_x86_25_11.semver=25.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/fortran.amazon.properties b/etc/config/fortran.amazon.properties
index d60a1271c..57c84a098 100644
--- a/etc/config/fortran.amazon.properties
+++ b/etc/config/fortran.amazon.properties
@@ -320,7 +320,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:nvfortran_x86_24_11:nvfortran_x86_25_1:nvfortran_x86_25_3:nvfortran_x86_25_5:nvfortran_x86_25_7:nvfortran_x86_25_9
+group.nvfortran_x86.compilers=nvfortran_x86_24_9:nvfortran_x86_24_11:nvfortran_x86_25_1:nvfortran_x86_25_3:nvfortran_x86_25_5:nvfortran_x86_25_7:nvfortran_x86_25_9:nvfortran_x86_25_11
 group.nvfortran_x86.options=
 group.nvfortran_x86.needsMulti=false
 group.nvfortran_x86.supportsBinary=true
@@ -373,6 +373,12 @@ compiler.nvfortran_x86_25_9.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64
 compiler.nvfortran_x86_25_9.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.9/compilers/bin/nvfortran
 compiler.nvfortran_x86_25_9.semver=25.9
 
+compiler.nvfortran_x86_25_11.demangler=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvdecode
+compiler.nvfortran_x86_25_11.cuobjdump=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/cuobjdump
+compiler.nvfortran_x86_25_11.nvdisasm=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/cuda/13.0/bin/nvdisasm
+compiler.nvfortran_x86_25_11.exe=/opt/compiler-explorer/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvfortran
+compiler.nvfortran_x86_25_11.semver=25.11
+
 ###############################
 # GCC Cross-Compilers
 group.cross.compilers=&gccarm:&gccaarch64:&ppcs:&gccrvs:&gccmips:&gccmips64:&gccmipsel:&gccmips64el:&gccs390x:&gccriscv:&gccriscv64:&gccloongarch64:&gccsparc:&gccsparc64:&gccsparcleon:&gcchppa:&gcctricore