diff --git a/.gitmodules b/.gitmodules
index 11b809531..a69f3e4f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,7 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/jcsda/spack
-  #branch = spack-stack-dev
-  url = https://github.com/srherbener/spack
-  branch = feature/intro-bufr-query
+  url = https://github.com/jcsda/spack
+  branch = spack-stack-dev
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml
index c26b4d623..46a6f3037 100644
--- a/configs/templates/unified-dev/spack.yaml
+++ b/configs/templates/unified-dev/spack.yaml
@@ -37,9 +37,6 @@ spack:
     # MADIS for WCOSS2 decoders.
     - madis@4.5
 
-    # bufr_query for BUFR readers
-    #- bufr-query@0.0.2
-
   specs:
   - matrix:
     - [$packages]
diff --git a/spack b/spack
index 1a834c429..ebc66106f 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 1a834c4293c187197ccc1ca2b2e626f067b3b7a6
+Subproject commit ebc66106f141bdc9c7e91e44dcae85222ecbb9fc
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")