diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
index 24a3773d0..5d6e0bbc8 100644
--- a/configs/common/modules_lmod.yaml
+++ b/configs/common/modules_lmod.yaml
@@ -100,6 +100,7 @@ modules:
       - intel-oneapi-compilers
       - intel-oneapi-compilers-classic
       - llvm
+      - nvhpc
       # By default, do not create MPI modules
       - cray-mpich
       - intel-mpi
diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
index a3097f320..a9b389892 100644
--- a/configs/common/modules_tcl.yaml
+++ b/configs/common/modules_tcl.yaml
@@ -119,6 +119,7 @@ modules:
       - intel-oneapi-compilers
       - intel-oneapi-compilers-classic
       - llvm
+      - nvhpc
       # By default, do not create MPI modules
       - cray-mpich
       - intel-mpi
diff --git a/configs/common/packages_nvhpc.yaml b/configs/common/packages_nvhpc.yaml
index 57b74373e..142d765dd 100644
--- a/configs/common/packages_nvhpc.yaml
+++ b/configs/common/packages_nvhpc.yaml
@@ -21,6 +21,9 @@ packages:
     require:
     - nvhpc
   # Individual package settings
+  util-linux-uuid:
+    require:
+    - '%c,cxx=gcc'
   antlr:
     require:
     - '%c,cxx=gcc'
@@ -91,9 +94,13 @@ packages:
   py-numpy:
     require:
     - '%c,cxx=gcc'
+  py-pyyaml:
+    require:
+    - '@=6.0.3'
+    - +libyaml
   rust:
     require:
     - '%c,cxx=gcc'
   zstd:
     require:
-    - '%c,cxx=gcc'
\ No newline at end of file
+    - '%c,cxx=gcc'
diff --git a/configs/sites/tier1/blueback/packages_nvhpc-26.5.yaml b/configs/sites/tier1/blueback/packages_nvhpc-26.5.yaml
new file mode 100644
index 000000000..9cc0f8a89
--- /dev/null
+++ b/configs/sites/tier1/blueback/packages_nvhpc-26.5.yaml
@@ -0,0 +1,55 @@
+packages:
+  all:
+    require:
+    - any_of: ['%nvhpc@=26.5']
+      when: '%nvhpc'
+    - any_of: ['%gcc@=13.3.0']
+      when: '%gcc'
+  mpi:
+    buildable: false
+    require:
+    - cray-mpich@8.1.32
+  nvhpc:
+    buildable: false
+    externals:
+    - spec: nvhpc@26.5+blas+lapack~mpi
+      prefix: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5
+      modules:
+      - PrgEnv-nvidia/8.7.0
+      - nvhpc/26.5
+      extra_attributes:
+        compilers:
+          c: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc
+          cxx: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc++
+          fortran: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvfortran
+        environment:
+          set:
+            CONFIG_SITE: ''
+  gcc:
+    buildable: false
+    externals:
+    - spec: gcc@13.3.0 languages:='c,c++'
+      prefix: /usr
+      modules:
+      - PrgEnv-gnu/8.7.0
+      - gcc-native/13.2
+      extra_attributes:
+        compilers:
+          c: /usr/bin/gcc
+          cxx: /usr/bin/g++
+          fortran: /usr/bin/gfortran
+        environment:
+          set:
+            CONFIG_SITE: ''
+            PE_GCC_EXTERNAL: native
+  cray-mpich:
+    buildable: false
+    externals:
+    - spec: cray-mpich@8.1.32
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/nvidia/23.3
+      modules:
+      - cray-mpich/8.1.32
+      extra_attributes:
+        environment:
+          prepend_path:
+            CMAKE_PREFIX_PATH: /p/app/projects/NEPTUNE/spack-stack/cmake-findmpi
diff --git a/configs/templates/neptune-dev-nvhpc/spack.yaml b/configs/templates/neptune-dev-nvhpc/spack.yaml
index adf6cfcc0..0b97f8c40 100644
--- a/configs/templates/neptune-dev-nvhpc/spack.yaml
+++ b/configs/templates/neptune-dev-nvhpc/spack.yaml
@@ -10,15 +10,15 @@ spack:
   specs:
   #- dev-utils-env
   - neptune-env ~debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
-  - neptune-env +debug +openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
-  - neptune-env ~debug ~openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
-  - neptune-env +debug ~openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
+  - neptune-env +debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
+  - neptune-env ~debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
+  - neptune-env +debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
 
-  - py-numpy
+  #- py-numpy
   #- crtm@3.1.3
 
   packages:
     # Turn on python variant for esmf
     esmf:
       require:
-      - +python
+      - ~python