diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml
index 7c438842b..bad55bf6c 100644
--- a/configs/sites/tier1/hercules/packages.yaml
+++ b/configs/sites/tier1/hercules/packages.yaml
@@ -13,6 +13,13 @@ packages:
       prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g
       modules:
       - zlib/1.2.13
+
+  # https://github.com/JCSDA/spack-stack/issues/1892
+  openssl:
+    require:
+    - +shared
+    - '@3.0.16'
+
   autoconf:
     externals:
     - spec: autoconf@2.69
diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml
index 99675d2a4..6b179915b 100644
--- a/configs/sites/tier1/orion/packages.yaml
+++ b/configs/sites/tier1/orion/packages.yaml
@@ -13,6 +13,13 @@ packages:
       prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g
       modules:
       - zlib/1.2.13
+
+  # https://github.com/JCSDA/spack-stack/issues/1892
+  openssl:
+    require:
+    - +shared
+    - '@3.0.16'
+
   autoconf:
     externals:
     - spec: autoconf@2.69
diff --git a/repos/builtin b/repos/builtin
index 4a3312cc2..d59d700ca 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit 4a3312cc241c0da954ab450cbdd223122a62355f
+Subproject commit d59d700ca5a213ecbcad7f87d43ff4212f64a88d