diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
index 4176b1ac5..9a550cd08 100644
--- a/configs/common/modules_lmod.yaml
+++ b/configs/common/modules_lmod.yaml
@@ -139,6 +139,12 @@ modules:
           ^esmf@8.5.0+debug snapshot=none: 'esmf-8.5.0-debug'
           ^esmf@8.6.0~debug snapshot=none: 'esmf-8.6.0'
           ^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:
         environment:
           set:
diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
index 3ff20800a..04e9180b4 100644
--- a/configs/common/modules_tcl.yaml
+++ b/configs/common/modules_tcl.yaml
@@ -141,6 +141,12 @@ modules:
           ^esmf@8.5.0+debug snapshot=none: 'esmf-8.5.0-debug'
           ^esmf@8.6.0~debug snapshot=none: 'esmf-8.6.0'
           ^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:
         environment:
           set:
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 312ec407d..20bdfea40 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -60,6 +60,10 @@
     esmf:
       version: ['8.6.0']
       variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio
+      #version: ['8.6.1b04']
+      #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio
+      #version: ['8.7.0b04']
+      #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio
       require:
         - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
           when: "%intel"
diff --git a/spack b/spack
index 60f4c5f03..1c7844488 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 60f4c5f033e7539e9f2a8eb3f6c7ca6b800a64b8
+Subproject commit 1c78444881608b24d2062ac33c7d8e29403d15fd