diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 7c7d3cc809..c08df71858 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -259,6 +259,14 @@ steps:
     - .expeditor/ha_chef_server.sh
   env:
     IS_AUTOMATE: true
+    DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
+    HAB_BLDR_CHANNEL: "stable"
+    #HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8"
+    #HAB_FALLBACK_CHANNEL: "stable"
+    HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
+    GOPROXY: "https://proxy.golang.org,direct"
+    GOSUMDB: "sum.golang.org"
+    PGGSSENCMODE: "disable"
   timeout_in_minutes: 35
   expeditor:
     secrets:
diff --git a/src/bookshelf/rebar.config b/src/bookshelf/rebar.config
index bbd193b19e..c76fd0acd1 100644
--- a/src/bookshelf/rebar.config
+++ b/src/bookshelf/rebar.config
@@ -27,7 +27,8 @@
     {iso8601, ".*",
          {git, "https://github.com/erlsci/iso8601",                 {tag, "1.2.3"}}},
     {meck, ".*",
-        {git, "https://github.com/eproxus/meck",                    {branch, "master"}}},
+    %% NOTE: Pinning version as main branch wants minimum_otp_vsn as 25 and we are currently at 24.
+        {git, "https://github.com/eproxus/meck",                    {ref, "5aaa24886db404f995c9a91b421367f6bfe6e566"}}},
     {mini_s3, ".*",
         {git, "https://github.com/chef/mini_s3",                    {branch, "main"}}},
     {mixer, ".*",
diff --git a/src/oc_erchef/rebar.config b/src/oc_erchef/rebar.config
index ff9336f9a0..f542390b86 100644
--- a/src/oc_erchef/rebar.config
+++ b/src/oc_erchef/rebar.config
@@ -114,9 +114,10 @@
 {profiles, [
     {test, [
         {deps, [
-            meck,
+            {meck, 
+                {git,"https://github.com/eproxus/meck", {ref,"e48641a20a605174e640ac91a528d443be11c9b9"}}},
             {automeck,
-                {git, "https://github.com/chef/automeck", {branch, "master"}}},
+                {git, "https://github.com/chef/automeck", {branch, "otp_24"}}},
             %% NOTE: PROPER IS GPL V3, IT MUST REMAIN A TEST ONLY DEP. (Unpin once we're on R19, as proper now requires a recent erlang)
             {proper, {git, "https://github.com/manopapad/proper", {ref, "cb73e68ad5b46ec11b0accc5c724647556a276a0"}}}
                ]},