diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
index a8f56966e..e05b611a5 100644
--- a/configs/common/modules_lmod.yaml
+++ b/configs/common/modules_lmod.yaml
@@ -140,6 +140,8 @@ modules:
           ^esmf@8.6.0+debug snapshot=none: 'esmf-8.6.0-debug'
           ^esmf@8.6.1b04~debug snapshot=b04: 'esmf-8.6.1b04'
           ^esmf@8.6.1b04+debug snapshot=b04: 'esmf-8.6.1b04-debug'
+          ^esmf@8.6.1~debug snapshot=none: 'esmf-8.6.1'
+          ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug'
           ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04'
           ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug'
       openmpi:
diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
index c864d093d..8ba6b9e44 100644
--- a/configs/common/modules_tcl.yaml
+++ b/configs/common/modules_tcl.yaml
@@ -142,6 +142,8 @@ modules:
           ^esmf@8.6.0+debug snapshot=none: 'esmf-8.6.0-debug'
           ^esmf@8.6.1b04~debug snapshot=b04: 'esmf-8.6.1b04'
           ^esmf@8.6.1b04+debug snapshot=b04: 'esmf-8.6.1b04-debug'
+          ^esmf@8.6.1~debug snapshot=none: 'esmf-8.6.1'
+          ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug'
           ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04'
           ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug'
       openmpi:
diff --git a/spack b/spack
index a11d824ab..e379fd985 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit a11d824ab096688c6225a2d2780ce381734f1549
+Subproject commit e379fd985cbe68b9e46ba1eb14466e24820bf74f