diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index bacbe7699..eaca0aad3 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -54,7 +54,7 @@
       variants: +fckit +ectrans +tesselation +fftw
     ectrans:
       version: ['1.2.0']
-      variants: ~enable_mkl +fftw
+      variants: ~mkl +fftw
     eigen:
       version: ['3.4.0']
     # Attention - when updating the version also check the common modules.yaml
@@ -236,8 +236,8 @@
     py-numpy:
       version: ['1.22.3']
       variants: +blas +lapack
-    py-openpyxl:
-      version: ['3.0.3']
+    py-pandas:
+      variants: +excel
     # To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
     # versions of py-poetry-core when using external/homebrew Python as
     # we do at the moment in spack-stack.
diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml
index 2a6acb43d..abc283707 100644
--- a/configs/containers/docker-ubuntu-intel-impi.yaml
+++ b/configs/containers/docker-ubuntu-intel-impi.yaml
@@ -44,11 +44,12 @@ spack:
       externals:
       - spec: intel-oneapi-mpi@2021.6.0
         prefix: /opt/intel/oneapi
-    intel-oneapi-mkl:
-      buildable: false
-      externals:
-      - spec: intel-oneapi-mkl@2022.1.0
-        prefix: /opt/intel/oneapi
+    # Comment out for now so that fftw-api uses fftw and not mkl
+    #intel-oneapi-mkl:
+    #  buildable: false
+    #  externals:
+    #  - spec: intel-oneapi-mkl@2022.1.0
+    #    prefix: /opt/intel/oneapi
     gmake:
       buildable: false
       externals:
diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml
index 40766c824..4d3ca0239 100644
--- a/configs/containers/specs/jedi-ci.yaml
+++ b/configs/containers/specs/jedi-ci.yaml
@@ -1,5 +1,5 @@
   ### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
-  specs: [base-env@1.0.0, jedi-base-env@1.0.0 ~fftw, ewok-env@1.0.0, jedi-fv3-env@1.0.0,
+  specs: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0,
     jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.0, ecbuild@3.7.2, eccodes@2.27.0, ecflow@5,
     eckit@1.24.4, ecmwf-atlas@0.35.0 +fckit +ectrans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw,
     eigen@3.4.0, fckit@0.11.0, fms@release-jcsda, g2@3.4.5, g2tmpl@1.10.2, gftl-shared@1.5.0,
diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
index cd7b04df2..d2b117390 100644
--- a/doc/source/PreConfiguredSites.rst
+++ b/doc/source/PreConfiguredSites.rst
@@ -373,9 +373,9 @@ The following is required for building new spack environments and for using spac
 .. code-block:: console
 
    module purge
-   # ignore that the sticky module ncarenv/... is not unloaded
+   ignore that the sticky module ncarenv/... is not unloaded
    export LMOD_TMOD_FIND_FIRST=yes
-   # Temporary, until CISL created the module tree for the newest Intel compilers
+   Temporary, until CISL created the module tree for the newest Intel compilers
    module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra
    module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles
    module load ecflow/5.8.4
diff --git a/spack b/spack
index a0ddb033d..22ab925c3 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit a0ddb033df3a6d7e2ab802d01eeb5f3ec633c431
+Subproject commit 22ab925c31c558605b16e69e101852065aa3bf25