diff --git a/stacks/pinot-noir-gcc/modules.yaml b/stacks/pinot-noir-gcc/modules.yaml
index afc56d3326d0b93a48c8e6526208a60e63d7226f..64d679e1c1a8ab7e302d58be66457741ee87ba9d 100644
--- a/stacks/pinot-noir-gcc/modules.yaml
+++ b/stacks/pinot-noir-gcc/modules.yaml
@@ -10,7 +10,7 @@ modules:
       all:
         environment:
           set:
-            ${PACKAGE}_ROOT: ${PREFIX}
+            "{name}_ROOT": "{prefix}"
         suffixes:
           '+mpi': mpi
           '+openmp': openmp
@@ -34,11 +34,11 @@ modules:
       gcc:
         environment:
           set:
-            CC: ${PREFIX}/bin/gcc
-            CXX: ${PREFIX}/bin/g++
-            F77: ${PREFIX}/bin/gfortran
-            FC: ${PREFIX}/bin/gfortran
-            F90: ${PREFIX}/bin/gfortran
+            CC: "{prefix}/bin/gcc"
+            CXX: "{prefix}/bin/g++"
+            F77: "{prefix}/bin/gfortran"
+            FC: "{prefix}/bin/gfortran"
+            F90: "{prefix}/bin/gfortran"
       cuda@12.4.0:
         environment:
           append_path:
@@ -82,7 +82,7 @@ modules:
       plumed:
         environment:
           set:
-            PLUMED_KERNEL: ${PREFIX}/lib/libplumedKernel.so
+            PLUMED_KERNEL: "{prefix}/lib/libplumedKernel.so"
           unset:
           - PLUMED_ROOT
       py-horovod:
@@ -116,14 +116,14 @@ modules:
       comsol:
         environment:
           prepend_path:
-            MATLABPATH: ${PREFIX}/mli
+            MATLABPATH: "{prefix}/mli"
       crystal17:
         template: modules/group_restricted.lua
       fdtd:
         environment:
           prepend_path:
-            PATH: ${PREFIX}/mpich2/nemesis/bin
-            LD_LIBRARY_PATH: ${PREFIX}/mpich2/nemesis/lib
+            PATH: "{prefix}/mpich2/nemesis/bin"
+            LD_LIBRARY_PATH: "{prefix}/mpich2/nemesis/lib"
           set:
             SLURM_MPI_TYPE: pmi2
       gaussian:
@@ -132,7 +132,7 @@ modules:
         autoload: direct
         environment:
           prepend_path:
-            PATH: /ssoft/spack/scripts/all/spark
+            PATH: "/ssoft/spack/scripts/all/spark"
       ucx:
         environment:
           unset: