diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 1f4e0a07d..1f999c371 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -20,6 +20,8 @@ packages:
     require: '@1.84 ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden'
   bufr:
     require: '@12.1.0 +python'
+  bufr-query:
+    require: '@0.0.2 +python'
   cairo:
     require: '+pic'
   cdo:
@@ -37,7 +39,7 @@ packages:
   ecflow:
     require: '@5.11.4 +ui'
   eckit:
-    require: '@1.24.5 linalg=eigen,lapack compression=lz4,bzip2'
+    require: '@1.27.0 linalg=eigen,lapack compression=lz4,bzip2'
   ecmwf-atlas:
     require: '@0.38.1 +fckit +trans +tesselation +fftw'
   ectrans:
diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml
index 6f54311fb..7563ddcdc 100644
--- a/configs/containers/specs/jedi-ci.yaml
+++ b/configs/containers/specs/jedi-ci.yaml
@@ -1,7 +1,7 @@
   ### spack-stack-1.6.0 / skylab-7.x.y containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
   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.1.0, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5,
-    eckit@1.24.5, ecmwf-atlas@0.38.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw,
+    jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.1.0, bufr-query@0.0.2, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5,
+    eckit@1.27.0, ecmwf-atlas@0.38.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw,
     eigen@3.4.0, fckit@0.11.0, fms@2024.02, g2@3.5.1, g2tmpl@1.13.0,
     gsibec@1.2.1, hdf@4.2.15, hdf5@1.14.3, ip@5.0.0, jasper@2.0.32, jedi-cmake@1.4.0,
     libpng@1.6.37, nccmp@1.9.0.1, netcdf-c@4.9.2, netcdf-cxx4@4.3.1, netcdf-fortran@4.6.1,
diff --git a/spack b/spack
index cef497611..d8de455f3 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit cef497611df30f3cbf42c6b1c2a9196265f69edd
+Subproject commit d8de455f35c23ecbb2e53eacd661b7060145c122
diff --git a/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py b/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py
index a1f8726e9..9f09724b7 100644
--- a/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py
+++ b/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py
@@ -20,12 +20,14 @@ class JediBaseEnv(BundlePackage):
     # Need to find a free fftw provider for fftw-api ...
     variant("fftw", default=True, description="Build fftw")
     variant("hdf4", default=True, description="Build hdf4 library and python hdf module")
+    variant("bufrquery", default=True, description="Build bufr-query library")
 
     depends_on("base-env", type="run")
     depends_on("bison", type="run")
     depends_on("blas", type="run")
     depends_on("boost", type="run")
     depends_on("bufr", type="run")
+    depends_on("bufr-query", when="+bufrquery", type="run")
     # Force users to load manually
     # depends_on("crtm@v2.4.1-jedi", type="run")
     depends_on("ecbuild", type="run")