diff --git a/rebar.config b/rebar.config
index 145456d..a181cd7 100644
--- a/rebar.config
+++ b/rebar.config
@@ -54,8 +54,8 @@
 
 {deps, [
     {genlib, {git, "https://github.com/valitydev/genlib", {branch, master}}},
-    {machinegun_core, {git, "https://github.com/valitydev/machinegun-core", {branch, master}}},
-    {machinegun_woody_api, {git, "https://github.com/valitydev/machinegun-woody-api", {branch, master}}},
+    {machinegun_core, {git, "https://github.com/valitydev/machinegun-core", {branch, "epic/fix_events"}}},
+    {machinegun_woody_api, {git, "https://github.com/valitydev/machinegun-woody-api", {branch, "epic/fix_events"}}},
     {erl_health, {git, "https://github.com/valitydev/erlang-health", {branch, "master"}}},
     {prometheus, "4.8.1"},
     {prometheus_cowboy, "0.1.8"},
@@ -128,9 +128,8 @@
 ]}.
 
 {erlfmt, [
-    write,
     {print_width, 120},
-    {files, ["{src,include,test,rel_scripts}/*.{hrl,erl,escript}", "rebar.config"]}
+    {files, ["{src,include,test}/*.{hrl,erl}", "rebar.config"]}
 ]}.
 
 %% NOTE
diff --git a/rebar.lock b/rebar.lock
index 996e3f7..6cd90ba 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -38,11 +38,11 @@
  {<<"kafka_protocol">>,{pkg,<<"kafka_protocol">>,<<"4.0.1">>},2},
  {<<"machinegun_core">>,
   {git,"https://github.com/valitydev/machinegun-core",
-       {ref,"fb527828bd91327f25f9a723dfb2d58db32402dc"}},
+       {ref,"b72fc8f041722e9cecf9abc8d01e14e3ac29ca52"}},
   0},
  {<<"machinegun_woody_api">>,
   {git,"https://github.com/valitydev/machinegun-woody-api",
-       {ref,"42263f7d80ab6ac7ca71cc0b2a4e946c1e42df95"}},
+       {ref,"d039da348d2497f45bdcae0a6de39ddfccee5ef6"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},3},
  {<<"mg_proto">>,