diff --git a/omnibus b/omnibus
index e96f0bd8e2..a549118931 160000
--- a/omnibus
+++ b/omnibus
@@ -1 +1 @@
-Subproject commit e96f0bd8e289ee09c699fa1b78c0ceb360271596
+Subproject commit a54911893159bcfff928476e170ac8ae434566dc
diff --git a/src/bookshelf/habitat/default.toml b/src/bookshelf/habitat/default.toml
index 3fb2fb8552..3b1780b771 100644
--- a/src/bookshelf/habitat/default.toml
+++ b/src/bookshelf/habitat/default.toml
@@ -1,5 +1,8 @@
 port=4321
 
+[log]
+rotation_type="wrap"
+
 [lager]
 lager_console_backend="info"
 
diff --git a/src/bookshelf/rebar.lock b/src/bookshelf/rebar.lock
index fbbaeaabe8..6e3bc230ce 100644
--- a/src/bookshelf/rebar.lock
+++ b/src/bookshelf/rebar.lock
@@ -88,7 +88,7 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"6495dd0f97f64f363db1c05504436834cc1136cd"}},
+       {branch,"main"}},
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler.git",
diff --git a/src/oc_bifrost/habitat/config/sys.config b/src/oc_bifrost/habitat/config/sys.config
index 9a9b3218d3..0e16ae56f6 100644
--- a/src/oc_bifrost/habitat/config/sys.config
+++ b/src/oc_bifrost/habitat/config/sys.config
@@ -87,9 +87,10 @@
  {webmachine, [
           {log_handlers, [
                {oc_wm_request_logger, [
-                       {file, "{{pkg.svc_var_path}}/logs/crash.log"},
+                       {file, "{{pkg.svc_var_path}}/logs/requests.log"},
                        {file_size, 100},  %% Size in MB
                        {files, 10},
+                       {log_rotation_type, {{cfg.log.rotation_type}}},
                          {annotations, [requestor_id, created_authz_id, perf_stats, msg]}
                        ]
                       }]}]
diff --git a/src/oc_bifrost/habitat/default.toml b/src/oc_bifrost/habitat/default.toml
index 75b9ff3c4d..c5351f2fd4 100644
--- a/src/oc_bifrost/habitat/default.toml
+++ b/src/oc_bifrost/habitat/default.toml
@@ -4,6 +4,9 @@ port=9463
 ip_mode="ipv4"
 fips_enabled=false
 
+[log]
+rotation_type="wrap"
+
 [bifrost]
 
 [lager]
diff --git a/src/oc_bifrost/rebar.lock b/src/oc_bifrost/rebar.lock
index bce9469dca..2b70bea8d0 100644
--- a/src/oc_bifrost/rebar.lock
+++ b/src/oc_bifrost/rebar.lock
@@ -52,7 +52,7 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"6495dd0f97f64f363db1c05504436834cc1136cd"}},
+       {branch,"main"}},
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler.git",
diff --git a/src/oc_erchef/habitat/config/sys.config b/src/oc_erchef/habitat/config/sys.config
index ce47422f9a..0bbf73e8f2 100644
--- a/src/oc_erchef/habitat/config/sys.config
+++ b/src/oc_erchef/habitat/config/sys.config
@@ -279,6 +279,7 @@
                 {file, "{{pkg.svc_var_path}}/logs/requests.log"},
                 {file_size, 100},  %% Size in MB
                 {files, 10},
+                {log_rotation_type, {{cfg.log.rotation_type}}},
                 {annotations, [req_id, org_name, msg, darklaunch, perf_stats, user, req_api_version]}
             ]}
         ]}
diff --git a/src/oc_erchef/habitat/default.toml b/src/oc_erchef/habitat/default.toml
index deb21b86bf..bbfc4bf48f 100644
--- a/src/oc_erchef/habitat/default.toml
+++ b/src/oc_erchef/habitat/default.toml
@@ -2,6 +2,9 @@
 ip_mode="ipv4"
 fips_enabled=false
 
+[log]
+rotation_type="wrap"
+
 [lager]
 lager_console_backend="info"
 error_logger_hwm=50
diff --git a/src/oc_erchef/rebar.lock b/src/oc_erchef/rebar.lock
index df0eec6970..3b4b090d80 100644
--- a/src/oc_erchef/rebar.lock
+++ b/src/oc_erchef/rebar.lock
@@ -128,7 +128,7 @@
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",
-       {ref,"6495dd0f97f64f363db1c05504436834cc1136cd"}},
+       {branch,"main"}},
   0},
  {<<"poolboy">>,
   {git,"https://github.com/devinus/poolboy",