diff --git a/CHANGELOG.md b/CHANGELOG.md
index 472144e..ffb12e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,27 @@
 # Change Log
 
+## [2.2.1](https://github.com/inaka/apns4erl/tree/2.2.1) (2018-07-04)
+[Full Changelog](https://github.com/inaka/apns4erl/compare/2.2.0...2.2.1)
+
+**Closed issues:**
+
+- Pseudo-header field ':method' found after regular header [\#211](https://github.com/inaka/apns4erl/issues/211)
+- Memory leaks may exist [\#206](https://github.com/inaka/apns4erl/issues/206)
+- chatterbox OPT20 gen\_fsm is deprecated and will be removed in a future release [\#184](https://github.com/inaka/apns4erl/issues/184)
+
+**Merged pull requests:**
+
+- send mandatory headers at top [\#212](https://github.com/inaka/apns4erl/pull/212) ([lazedo](https://github.com/lazedo))
+- Update from @andreabenini [\#210](https://github.com/inaka/apns4erl/pull/210) ([elbrujohalcon](https://github.com/elbrujohalcon))
+- Update README.md [\#204](https://github.com/inaka/apns4erl/pull/204) ([igaray](https://github.com/igaray))
+- add erlang 20 for test [\#200](https://github.com/inaka/apns4erl/pull/200) ([getong](https://github.com/getong))
+
 ## [2.2.0](https://github.com/inaka/apns4erl/tree/2.2.0) (2017-07-12)
 [Full Changelog](https://github.com/inaka/apns4erl/compare/2.1.1...2.2.0)
 
 **Closed issues:**
 
+- Version Bump to 2.2.0 [\#196](https://github.com/inaka/apns4erl/issues/196)
 - Add Travis [\#193](https://github.com/inaka/apns4erl/issues/193)
 - Write an example with a pool of connections [\#191](https://github.com/inaka/apns4erl/issues/191)
 - restrict calls to push\_notification and push\_notification\_token [\#188](https://github.com/inaka/apns4erl/issues/188)
@@ -14,6 +31,7 @@
 
 **Merged pull requests:**
 
+- \[\#196\] Version Bump to 2.2.0 [\#197](https://github.com/inaka/apns4erl/pull/197) ([ferigis](https://github.com/ferigis))
 - Allow binary cert/key in apns\_connection like v1 [\#195](https://github.com/inaka/apns4erl/pull/195) ([danielfinke](https://github.com/danielfinke))
 - \[\#193\] Setting Travis up [\#194](https://github.com/inaka/apns4erl/pull/194) ([ferigis](https://github.com/ferigis))
 - \[\#191\] Example with a pool of connections [\#192](https://github.com/inaka/apns4erl/pull/192) ([ferigis](https://github.com/ferigis))
diff --git a/rebar.config b/rebar.config
index 7442030..a92c190 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,8 +23,8 @@
 %% == Dependencies ==
 
 {deps, [
-  {chatterbox, "0.5.0"},
-  {jsx, "2.8.2"},
+  {chatterbox, "0.7.0"},
+  {jsx, "2.9.0"},
   {base64url, "0.0.1"}
 ]}.
 
@@ -33,10 +33,10 @@
 {profiles, [
   {test, [
     {deps, [
-      {katana_test, "0.1.1"},
+      {katana_test, "1.0.0"},
       {katana, "0.4.0"},
-      {mixer, "0.1.5", {pkg, inaka_mixer}},
-      {meck, "0.8.7"}
+      {mixer, "1.0.0", {pkg, inaka_mixer}},
+      {meck, "0.8.10"}
     ]}
   ]}
 ]}.
diff --git a/rebar.lock b/rebar.lock
index 13774ec..6e14a0a 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,16 +1,12 @@
 {"1.1.0",
 [{<<"base64url">>,{pkg,<<"base64url">>,<<"0.0.1">>},0},
- {<<"chatterbox">>,{pkg,<<"chatterbox">>,<<"0.5.0">>},0},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2},
+ {<<"chatterbox">>,{pkg,<<"chatterbox">>,<<"0.7.0">>},0},
  {<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},1},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.2">>},0},
- {<<"lager">>,{pkg,<<"lager">>,<<"3.2.4">>},1}]}.
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"base64url">>, <<"36A90125F5948E3AFD7BE97662A1504B934DD5DAC78451CA6E9ABF85A10286BE">>},
- {<<"chatterbox">>, <<"69F5A1F36F905472B7662A301E67309DD3CAE7D0CA1B2E52C14D43EE7DF4C3A3">>},
- {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
+ {<<"chatterbox">>, <<"8036197E00C42B3AC401DABDA722FD211071B27CBD59A7CEA471185F5D1F573A">>},
  {<<"hpack">>, <<"17670F83FF984AE6CD74B1C456EDDE906D27FF013740EE4D9EFAA4F1BF999633">>},
- {<<"jsx">>, <<"7ACC7D785B5ABE8A6E9ADBDE926A24E481F29956DD8B4DF49E3E4E7BCC92A018">>},
- {<<"lager">>, <<"A6DEB74DAE7927F46BD13255268308EF03EB206EC784A94EAF7C1C0F3B811615">>}]}
+ {<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>}]}
 ].
diff --git a/src/apns.app.src b/src/apns.app.src
index 0c3efec..43e82a9 100644
--- a/src/apns.app.src
+++ b/src/apns.app.src
@@ -1,6 +1,6 @@
 {application, apns, [
   {description, "APNs provider for Apple Push Notification services (APNs) in Erlang. It supports the HTTP2 API."},
-  {vsn, "2.2.0"},
+  {vsn, "2.2.1"},
   {id, "apns4erl"},
   {pkg_name, apns4erl},
   {registered, []},
diff --git a/test/apns_meta_SUITE.erl b/test/apns_meta_SUITE.erl
index 70983cd..6f72829 100644
--- a/test/apns_meta_SUITE.erl
+++ b/test/apns_meta_SUITE.erl
@@ -14,7 +14,13 @@
 -type config() :: [{atom(), term()}].
 
 -spec init_per_suite(config()) -> config().
-init_per_suite(Config) -> [{application, apns} | Config].
+init_per_suite(Config) ->
+  [ {application, apns}
+  %% Until the next version of katana-test fixes the missing test deps in plt
+  %% issue, we can't use the default warnings that include 'unknown' here.
+  , {dialyzer_warnings, [error_handling, race_conditions, unmatched_returns]}
+  | Config
+  ].
 
 -spec end_per_suite(config()) -> config().
 end_per_suite(Config) -> Config.