diff --git a/src/bookshelf/rebar.config b/src/bookshelf/rebar.config
index 52cc79d3bc..8dee51c5d8 100644
--- a/src/bookshelf/rebar.config
+++ b/src/bookshelf/rebar.config
@@ -19,9 +19,9 @@
 %   {eper, ".*",
 %       {git, "https://github.com/massemanet/eper",                 {branch, "master"}}},
     {erlcloud, ".*",
-        {git, "https://github.com/chef/erlcloud",                   {branch, "lbaker/presigned-headers"}}},
+        {git, "https://github.com/chef/erlcloud",                   {branch, "CHEF-11677/CHEF-12498/lbaker"}}},
     {erlsom, ".*",
-        {git, "https://github.com/chef/erlsom",                     {branch, "integer_long_string_probs2"}}},
+        {git, "https://github.com/willemdj/erlsom",                 {branch, "master"}}},
     {erlware_commons, ".*",
         {git, "https://github.com/chef/erlware_commons",            {branch, "lbaker/fix_for_ftmap"}}},
     {iso8601, ".*",
diff --git a/src/bookshelf/rebar.lock b/src/bookshelf/rebar.lock
index 91cb8cb50e..7dfdc9cb5e 100644
--- a/src/bookshelf/rebar.lock
+++ b/src/bookshelf/rebar.lock
@@ -8,7 +8,7 @@
   0},
  {<<"chef_secrets">>,
   {git,"https://github.com/chef/chef_secrets",
-       {ref,"6fa36689fd599602e5985587a1497282df2d907a"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"eini">>,
   {git,"https://github.com/erlcloud/eini",
@@ -16,7 +16,7 @@
   1},
  {<<"ej">>,
   {git,"https://github.com/chef/ej",
-       {ref,"f843f4da1cb7d8d2414adccc37fe523e3f92d789"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"envy">>,
   {git,"https://github.com/markan/envy",
@@ -24,15 +24,15 @@
   0},
  {<<"epgsql">>,
   {git,"https://github.com/chef/epgsql-1.git",
-       {ref,"34b4182f0e21f9189ddd7b2e290f01a9e7d93bf1"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"erlcloud">>,
   {git,"https://github.com/chef/erlcloud",
-       {ref,"27724cc615bb71595e88665ffd3ea083bf51ecb3"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"erlsom">>,
-  {git,"https://github.com/chef/erlsom",
-       {ref,"131e660ee39254a58b75075e07dfd742f445bfce"}},
+  {git,"https://github.com/willemdj/erlsom",
+       {ref,"70cbbf794cec110503811827b035b6efbd90e9ec"}},
   0},
  {<<"erlware_commons">>,
   {git,"https://github.com/chef/erlware_commons",
@@ -63,8 +63,8 @@
        {ref,"a140ea935eae9149bb35234bb40f6acf1c69caa1"}},
   0},
  {<<"lhttpc">>,
-  {git,"https://github.com/erlcloud/lhttpc",
-       {ref,"8e34985a3cd0ac2a7fc2a88a041554c64d33e74b"}},
+  {git,"https://github.com/chef/lhttpc",
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"meck">>,
   {git,"https://github.com/eproxus/meck",
@@ -72,7 +72,7 @@
   0},
  {<<"mini_s3">>,
   {git,"https://github.com/chef/mini_s3",
-       {ref,"4dd584fce031d35bbe5c4b72a04660b75673ca21"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"mixer">>,
   {git,"https://github.com/inaka/mixer",
@@ -88,11 +88,11 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"5436cc600db462226a5d2f3ed585ab39eaf20ee5"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler.git",
-       {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"recon">>,
   {git,"https://github.com/ferd/recon/",
@@ -100,7 +100,7 @@
   1},
  {<<"sqerl">>,
   {git,"https://github.com/chef/sqerl",
-       {ref,"ebbe4c20ab5cd21041229d22dd60a6b38aa2930c"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"sync">>,
   {git,"https://github.com/rustyio/sync",
@@ -108,5 +108,5 @@
   0},
  {<<"webmachine">>,
   {git,"https://github.com/chef/webmachine",
-       {ref,"1389b01a9fbc25d36aad8956e08d2d0db242625f"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1}].
diff --git a/src/bookshelf/stest/rebar.config b/src/bookshelf/stest/rebar.config
index 9a368d7d03..200118e2af 100644
--- a/src/bookshelf/stest/rebar.config
+++ b/src/bookshelf/stest/rebar.config
@@ -10,7 +10,7 @@
   %% on a version of basho bench that doesn't build anymore.
   {mini_s3, ".*",
          {git, "https://github.com/chef/mini_s3",
-          {branch, "main"}}}
+          {branch, "CHEF-11677/CHEF-12498/lbaker"}}}
   ]}.
 
 %% Add dependencies that are only needed for development here. These
diff --git a/src/oc_bifrost/rebar.lock b/src/oc_bifrost/rebar.lock
index 21d65d0606..e31cb4653f 100644
--- a/src/oc_bifrost/rebar.lock
+++ b/src/oc_bifrost/rebar.lock
@@ -1,6 +1,6 @@
 [{<<"chef_secrets">>,
   {git,"https://github.com/chef/chef_secrets",
-       {ref,"6fa36689fd599602e5985587a1497282df2d907a"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"edown">>,
   {git,"https://github.com/uwiger/edown",
@@ -8,7 +8,7 @@
   0},
  {<<"ej">>,
   {git,"https://github.com/chef/ej",
-       {ref,"f843f4da1cb7d8d2414adccc37fe523e3f92d789"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"envy">>,
   {git,"https://github.com/manderson26/envy.git",
@@ -16,7 +16,7 @@
   1},
  {<<"epgsql">>,
   {git,"https://github.com/chef/epgsql-1.git",
-       {ref,"34b4182f0e21f9189ddd7b2e290f01a9e7d93bf1"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"fs">>,
   {git,"https://github.com/synrc/fs",
@@ -52,11 +52,11 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"5436cc600db462226a5d2f3ed585ab39eaf20ee5"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler.git",
-       {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"recon">>,
   {git,"https://github.com/ferd/recon/",
@@ -64,7 +64,7 @@
   1},
  {<<"sqerl">>,
   {git,"https://github.com/chef/sqerl",
-       {ref,"ebbe4c20ab5cd21041229d22dd60a6b38aa2930c"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"stats_hero">>,
   {git,"https://github.com/chef/stats_hero",
@@ -76,5 +76,5 @@
   0},
  {<<"webmachine">>,
   {git,"https://github.com/chef/webmachine",
-       {ref,"1389b01a9fbc25d36aad8956e08d2d0db242625f"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1}].
diff --git a/src/oc_erchef/apps/chef_objects/src/chef_depsolver_worker.erl b/src/oc_erchef/apps/chef_objects/src/chef_depsolver_worker.erl
index 128e8c82f2..b73da5e52c 100644
--- a/src/oc_erchef/apps/chef_objects/src/chef_depsolver_worker.erl
+++ b/src/oc_erchef/apps/chef_objects/src/chef_depsolver_worker.erl
@@ -42,10 +42,11 @@
 
 -record(state, {port, os_pid}).
 
--ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl"). %% TODO: remove
--endif.
--include("chef_types.hrl").
+%-ifdef(TEST).
+%-include_lib("eunit/include/eunit.hrl"). %% TODO: remove
+%-endif.
+%-include("chef_types.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/src/oc_erchef/apps/chef_objects/test/rebar.lock b/src/oc_erchef/apps/chef_objects/test/rebar.lock
new file mode 100644
index 0000000000..57afcca045
--- /dev/null
+++ b/src/oc_erchef/apps/chef_objects/test/rebar.lock
@@ -0,0 +1 @@
+[].
diff --git a/src/oc_erchef/apps/data_collector/rebar.config b/src/oc_erchef/apps/data_collector/rebar.config
index a84b5bc0c3..a3ca5f1d94 100644
--- a/src/oc_erchef/apps/data_collector/rebar.config
+++ b/src/oc_erchef/apps/data_collector/rebar.config
@@ -10,7 +10,7 @@
     {opscoderl_httpc, ".*",
         {git, "https://github.com/chef/opscoderl_httpc",              {branch, "main"}}},
     {pooler, ".*",
-        {git, "https://github.com/chef/pooler",                       {branch, "master"}}}
+        {git, "https://github.com/chef/pooler",                       {branch, "CHEF-11677/CHEF-12498/lbaker"}}}
     ]
 }.
 
diff --git a/src/oc_erchef/apps/data_collector/rebar.lock b/src/oc_erchef/apps/data_collector/rebar.lock
index cda48ad884..cab3c041cd 100644
--- a/src/oc_erchef/apps/data_collector/rebar.lock
+++ b/src/oc_erchef/apps/data_collector/rebar.lock
@@ -19,5 +19,5 @@
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler",
-       {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0}].
diff --git a/src/oc_erchef/rebar.config b/src/oc_erchef/rebar.config
index 7c1b954e0d..38b54e3729 100644
--- a/src/oc_erchef/rebar.config
+++ b/src/oc_erchef/rebar.config
@@ -29,7 +29,7 @@
 %    {eper, ".*",
 %        {git, "https://github.com/massemanet/eper",                 {branch, "master"}}},
     {erlcloud, ".*",
-        {git, "https://github.com/chef/erlcloud",                   {branch, "lbaker/presigned-headers"}}},
+        {git, "https://github.com/chef/erlcloud",                   {branch, "CHEF-11677/CHEF-12498/lbaker"}}},
     {erlware_commons, ".*",
         {git, "https://github.com/chef/erlware_commons",            {branch, "lbaker/fix_for_ftmap"}}},
     {folsom, ".*",
diff --git a/src/oc_erchef/rebar.lock b/src/oc_erchef/rebar.lock
index 4f252efc52..4696f14083 100644
--- a/src/oc_erchef/rebar.lock
+++ b/src/oc_erchef/rebar.lock
@@ -4,7 +4,7 @@
   1},
  {<<"bcrypt">>,
   {git,"https://github.com/erlangpack/bcrypt",
-       {ref,"826291ebd232ebfc4fb69f1c27d35706eecb8fc2"}},
+       {ref,"564b39e2f86a0e3d8ca08dcd1aae924acffe1408"}},
   0},
  {<<"bear">>,
   {git,"https://github.com/boundary/bear.git",
@@ -20,7 +20,7 @@
   0},
  {<<"chef_secrets">>,
   {git,"https://github.com/chef/chef_secrets",
-       {ref,"6fa36689fd599602e5985587a1497282df2d907a"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"darklaunch">>,
   {git,"https://github.com/chef/opscode-darklaunch-erlang",
@@ -40,7 +40,7 @@
   1},
  {<<"ej">>,
   {git,"https://github.com/chef/ej",
-       {ref,"f843f4da1cb7d8d2414adccc37fe523e3f92d789"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"envy">>,
   {git,"https://github.com/markan/envy",
@@ -48,11 +48,11 @@
   0},
  {<<"epgsql">>,
   {git,"https://github.com/chef/epgsql-1.git",
-       {ref,"34b4182f0e21f9189ddd7b2e290f01a9e7d93bf1"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"erlcloud">>,
   {git,"https://github.com/chef/erlcloud",
-       {ref,"27724cc615bb71595e88665ffd3ea083bf51ecb3"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"erlware_commons">>,
   {git,"https://github.com/chef/erlware_commons",
@@ -91,8 +91,8 @@
        {ref,"a140ea935eae9149bb35234bb40f6acf1c69caa1"}},
   0},
  {<<"lhttpc">>,
-  {git,"https://github.com/erlcloud/lhttpc",
-       {ref,"8e34985a3cd0ac2a7fc2a88a041554c64d33e74b"}},
+  {git,"https://github.com/chef/lhttpc",
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1},
  {<<"meck">>,
   {git,"https://github.com/eproxus/meck",
@@ -100,7 +100,7 @@
   1},
  {<<"mini_s3">>,
   {git,"https://github.com/chef/mini_s3",
-       {ref,"4dd584fce031d35bbe5c4b72a04660b75673ca21"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"mixer">>,
   {git,"https://github.com/inaka/mixer",
@@ -128,7 +128,7 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"5436cc600db462226a5d2f3ed585ab39eaf20ee5"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"poolboy">>,
   {git,"https://github.com/devinus/poolboy",
@@ -136,7 +136,7 @@
   1},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler",
-       {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"prometheus">>,
   {git,"https://github.com/deadtrickster/prometheus.erl",
@@ -152,7 +152,7 @@
   1},
  {<<"sqerl">>,
   {git,"https://github.com/chef/sqerl",
-       {ref,"ebbe4c20ab5cd21041229d22dd60a6b38aa2930c"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   0},
  {<<"stats_hero">>,
   {git,"https://github.com/chef/stats_hero",
@@ -168,5 +168,5 @@
   0},
  {<<"webmachine">>,
   {git,"https://github.com/chef/webmachine",
-       {ref,"1389b01a9fbc25d36aad8956e08d2d0db242625f"}},
+       {branch,"CHEF-11677/CHEF-12498/lbaker"}},
   1}].