diff --git a/include/emqx_mqtt.hrl b/include/emqx_mqtt.hrl
index b1c974c44..3a138f393 100644
--- a/include/emqx_mqtt.hrl
+++ b/include/emqx_mqtt.hrl
@@ -204,7 +204,7 @@
 %%--------------------------------------------------------------------
 
 -define(DEFAULT_SUBOPTS, #{rh  => 0, %% Retain Handling
-                           rap => 1, %% Retain as Publish
+                           rap => 0, %% Retain as Publish
                            nl  => 0, %% No Local
                            qos => 0  %% QoS
                           }).
diff --git a/rebar.config b/rebar.config
index 65dcb2f0f..2a9e6225f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,8 +2,8 @@
     [{jsx, "2.9.0"}, % hex
      {cowboy, "2.6.1"}, % hex
      {gproc, "0.8.0"}, % hex
-     {esockd, "5.5.0"}, %hex
-     {ekka, "0.6.1"}, %hex
+     {esockd, {git, "https://github.com/emqx/esockd", {tag, "v5.5.1"}}},
+     {ekka, {git, "https://github.com/emqx/ekka", {tag, "v0.6.2"}}},
      {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.4.1"}}},
      {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.0.0"}}}
     ]}.