diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml
index dace76e13..64281eb78 100644
--- a/.github/workflows/ubuntu-ci-x86_64.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64.yaml
@@ -116,6 +116,9 @@ jobs:
           # Add additional variants for MET packages, different from config/common/packages.yaml
           spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
 
+          # https://github.com/spack/spack/issues/42137
+          spack config add "packages:pflogger:variants:+mpi"
+
           # Concretize and check for duplicates
           spack concretize 2>&1 | tee log.concretize.intel-2022.1.0
           ${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2022.1.0 -i fms -i crtm -i esmf -i mapl
diff --git a/.github/workflows/ubuntu-rnd-x86_64.yaml b/.github/workflows/ubuntu-rnd-x86_64.yaml
index 6b924468c..e11a0e9ac 100644
--- a/.github/workflows/ubuntu-rnd-x86_64.yaml
+++ b/.github/workflows/ubuntu-rnd-x86_64.yaml
@@ -64,6 +64,9 @@ jobs:
           # Add additional variants for MET packages, different from config/common/packages.yaml
           spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
 
+          # https://github.com/spack/spack/issues/42137
+          spack config add "packages:pflogger:variants:+mpi"
+
           # Overrides for spack build and staging areas to speed up builds,
           # separate from the default site config locations to avoid conflicts
           spack config add "config:build_stage:/home/ubuntu/spack-stack/CI/tmp/build_stage"
@@ -130,6 +133,9 @@ jobs:
           # Add additional variants for MET packages, different from config/common/packages.yaml
           spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
 
+          # https://github.com/spack/spack/issues/42137
+          spack config add "packages:pflogger:variants:+mpi"
+
           # Overrides for spack build and staging areas to speed up builds,
           # separate from the default site config locations to avoid conflicts
           spack config add "config:build_stage:/home/ubuntu/spack-stack/CI/tmp/build_stage"
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 9ab083172..09e7b5c00 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -61,7 +61,7 @@
     # Also, check the acorn and derecho site configs which have esmf modifications.
     esmf:
       version: ['8.6.0']
-      variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
+      variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio
       require:
         - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
           when: "%intel"
@@ -142,7 +142,7 @@
       # https://github.com/JCSDA/spack-stack/issues/769
       # also: ... extdata2g segfault UFS?
       version: ['2.40.3']
-      variants: ~shared ~extdata2g ~pflogger
+      variants: +shared +pflogger ~f2py
     # If making changes here, also check the Discover site config and the CI workflows
     met:
       version: ['11.1.0']
diff --git a/configs/sites/aws-pcluster/packages.yaml b/configs/sites/aws-pcluster/packages.yaml
index ee9922c6d..50830f9a6 100644
--- a/configs/sites/aws-pcluster/packages.yaml
+++ b/configs/sites/aws-pcluster/packages.yaml
@@ -30,6 +30,12 @@ packages:
       - libfabric-aws/1.16.0~amzn4.0
       - openmpi/4.1.4
 
+### Modification of common packages
+
+  # https://github.com/spack/spack/issues/42137
+  pflogger:
+    variants: +mpi
+
 ### All other external packages listed alphabetically
   autoconf:
     externals:
diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml
index e9df7134b..54fc94d0f 100644
--- a/configs/templates/skylab-dev/spack.yaml
+++ b/configs/templates/skylab-dev/spack.yaml
@@ -9,6 +9,7 @@ spack:
   - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
   - packages:
       - ewok-env +ecflow +cylc
+      - geos-gcm-env
       - jedi-fv3-env
       - jedi-mpas-env
       - jedi-neptune-env
diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml
index e028d3106..0e35787e4 100644
--- a/configs/templates/unified-dev/spack.yaml
+++ b/configs/templates/unified-dev/spack.yaml
@@ -8,10 +8,11 @@ spack:
   definitions:
   - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
   - packages:
+      - ewok-env +ecflow +cylc
+      - geos-gcm-env
       - global-workflow-env
       - gmao-swell-env
       - gsi-env
-      - ewok-env +ecflow +cylc
       - jedi-fv3-env
       - jedi-mpas-env
       - jedi-neptune-env
diff --git a/spack b/spack
index 5cfbf8f8c..c7af00bb3 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 5cfbf8f8ceca6e9bfa0cdf3dd938aad98aef40e1
+Subproject commit c7af00bb3c6d78f18e3db1190e3d50662b49abcf