diff --git a/.gitmodules b/.gitmodules
index 04514feb5..4cf9c4d5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "repos/builtin"]
   path = repos/builtin
   url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-2.1.0
+  branch = release/2.1
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 201956b09..c5bae8c79 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -52,7 +52,7 @@ packages:
       - visibility=hidden
     bufr:
       require:
-      - '@12.1.0'
+      - '@12.3.0'
       - +python
     bufr-query:
       require:
@@ -201,7 +201,7 @@ packages:
       - '@1.4.2'
     gsi-ncdiag:
       require:
-      - '@1.1.2'
+      - '@1.1.3'
     harfbuzz:
       # cmake-based harfbuzz fails during build
       require:
diff --git a/repos/builtin b/repos/builtin
index 8620f5f06..8e0d1ef36 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit 8620f5f0628f93750096109865a6c3e91e6940e7
+Subproject commit 8e0d1ef360ec5923d93e151ab64a98900d181cc9