diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index affa18c0b..635953335 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
diff --git a/configs/containers/README.md b/configs/containers/README.md
index 2f553f446..857528991 100644
--- a/configs/containers/README.md
+++ b/configs/containers/README.md
@@ -4,7 +4,7 @@ To avoid hardcoding specs in the generic container recipes, we keep the specs li
 
 ### 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.0, gftl-shared@1.5.0,
diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml
index 6c980c177..c81a79838 100644
--- a/configs/containers/docker-ubuntu-intel-impi.yaml
+++ b/configs/containers/docker-ubuntu-intel-impi.yaml
@@ -45,11 +45,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/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
index 775e1bcc0..f05b6cf4b 100644
--- a/doc/source/PreConfiguredSites.rst
+++ b/doc/source/PreConfiguredSites.rst
@@ -375,9 +375,7 @@ The following is required for building new spack environments and for using spac
    module purge
    # 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
-   module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra
-   module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles
+   module use /glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles
    module load ecflow/5.8.4
    module load mysql/8.0.33
 
diff --git a/spack b/spack
index 5b0e93a6e..f54fb0c4e 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 5b0e93a6e6d207aec6ee6ef2817d3036fd66e7e5
+Subproject commit f54fb0c4e725af51d5226c321e2b68f9598ad10c