diff --git a/.github/workflows/erlang-pr.yml b/.github/workflows/erlang-pr.yml
index eee9e65..0650cbc 100644
--- a/.github/workflows/erlang-pr.yml
+++ b/.github/workflows/erlang-pr.yml
@@ -13,6 +13,8 @@ jobs:
       - uses: actions/checkout@v2
 
       - uses: valitydev/action-setup-thrift@v1
+        with:
+          thrift-version: "0.14.2.3"
 
       - uses: erlef/setup-beam@v1
         id: beam
diff --git a/proto/magista.thrift b/proto/magista.thrift
index f6ad56b..78d6d46 100644
--- a/proto/magista.thrift
+++ b/proto/magista.thrift
@@ -2,7 +2,7 @@ include "proto/base.thrift"
 include "proto/domain.thrift"
 
 namespace java dev.vality.magista
-namespace erlang magista
+namespace erlang magista.magista
 
 // See https://github.com/valitydev/payout-manager-proto/blob/063163dc/proto/payout_manager.thrift#L7
 typedef base.ID PayoutID
diff --git a/rebar.config b/rebar.config
index 9eb08ed..32d555f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,6 +1,5 @@
 %% Common project erlang options.
 {erl_opts, [
-
     % mandatory
     debug_info,
     warnings_as_errors,
@@ -26,10 +25,7 @@
 ]}.
 
 {deps, [
-    {damsel,
-        {git, "https://github.com/valitydev/damsel.git",
-        {branch, "master"}}
-    }
+    {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}}
 ]}.
 
 %% XRef checks
@@ -57,7 +53,7 @@
 
 {plugins, [
     {rebar3_thrift_compiler,
-        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
+        {git, "https://github.com/valitydev/rebar3-thrift-compiler.git", {tag, "0.4"}}}
 ]}.
 
 {provider_hooks, [
@@ -70,5 +66,5 @@
 {thrift_compiler_opts, [
     {in_dir, "proto"},
     {in_files, all},
-    {gen, "erlang:scoped_typenames,app_prefix=magista"}
+    {gen, "erlang:app_namespaces"}
 ]}.
diff --git a/rebar.lock b/rebar.lock
index d7aafaa..5d15125 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,4 +1,4 @@
 [{<<"damsel">>,
   {git,"https://github.com/valitydev/damsel.git",
-       {ref,"df1c52f2ebe175fabe1da4aec8ac889b2dd03a0b"}},
+       {ref,"dac2cb599499cc0701e60856f4092c9ab283eedf"}},
   0}].
diff --git a/src/magista_proto.app.src b/src/magista_proto.app.src
index eeb3b85..6f112f6 100644
--- a/src/magista_proto.app.src
+++ b/src/magista_proto.app.src
@@ -3,6 +3,7 @@
     {vsn, "0.1.0"},
     {applications, [
         kernel,
-        stdlib
+        stdlib,
+        damsel
     ]}
 ]}.